[SCM] rosegarden/master: Imported Upstream version 15.10.1
stuart at users.alioth.debian.org
stuart at users.alioth.debian.org
Tue Nov 3 13:20:39 UTC 2015
The following commit has been merged in the master branch:
commit b3a28df5179bffb6556e23fefd39a5f05fd7e990
Author: Stuart Prescott <stuart at debian.org>
Date: Sun Oct 25 23:31:23 2015 +1100
Imported Upstream version 15.10.1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea3bd7a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+dependencies
+dependencies.bak
+Makefile
+rosegarden
+.cproject
+.project
+.settings
+.svn
+*.moc
+*.o
+*.qm
+src/gui/dialogs/RosegardenTransportUi.h
+src/gui/studio/DeviceManagerDialogUi.h
+data/data.cpp
+
diff --git a/Makefile.in b/Makefile.in
index cc86fd3..9e72548 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,7 +23,6 @@ LRELEASE := @LRELEASE@
CXXFLAGS := @CXXFLAGS@ \
@HAVES@ \
@QT_CXXFLAGS@ \
- @JACK_CFLAGS@ \
@ALSA_CFLAGS@ \
@liblo_CFLAGS@ \
@lrdf_CFLAGS@ \
@@ -46,7 +45,6 @@ RCCFLAGS := -threshold 0 -compress 9
MOCFLAGS := @HAVES@ @ENDIANNESS@
LIBS := @QT_LIBS@ \
- @JACK_LIBS@ \
@ALSA_LIBS@ \
@liblo_LIBS@ \
@lrdf_LIBS@ \
@@ -168,18 +166,18 @@ install:
$(MKDIR_P) -m 755 $(INSTMIME16DIR)
$(MKDIR_P) -m 755 $(INSTMIME32DIR)
$(MKDIR_P) -m 755 $(INSTMIME64DIR)
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi16-rosegarden.png $(INSTMIME16DIR)/audio-x-rosegarden-composition.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi32-rosegarden.png $(INSTMIME32DIR)/audio-x-rosegarden-composition.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi64-rosegarden.png $(INSTMIME64DIR)/audio-x-rosegarden-composition.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi16-rosegarden-rgd.png $(INSTMIME16DIR)/audio-x-rosegarden-device.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi32-rosegarden-rgd.png $(INSTMIME32DIR)/audio-x-rosegarden-device.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi64-rosegarden-rgd.png $(INSTMIME64DIR)/audio-x-rosegarden-device.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi16-rosegarden-rgp.png $(INSTMIME16DIR)/audio-x-rosegarden-project.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi32-rosegarden-rgp.png $(INSTMIME32DIR)/audio-x-rosegarden-project.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi64-rosegarden-rgp.png $(INSTMIME64DIR)/audio-x-rosegarden-project.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi16-rosegarden-rgt.png $(INSTMIME16DIR)/audio-x-rosegarden-template.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi32-rosegarden-rgt.png $(INSTMIME32DIR)/audio-x-rosegarden-template.png
- $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi64-rosegarden-rgt.png $(INSTMIME64DIR)/audio-x-rosegarden-template.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi16-rosegarden.png $(INSTMIME16DIR)/application-x-rosegarden-composition.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi32-rosegarden.png $(INSTMIME32DIR)/application-x-rosegarden-composition.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi64-rosegarden.png $(INSTMIME64DIR)/application-x-rosegarden-composition.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi16-rosegarden-rgd.png $(INSTMIME16DIR)/application-x-rosegarden-device.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi32-rosegarden-rgd.png $(INSTMIME32DIR)/application-x-rosegarden-device.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi64-rosegarden-rgd.png $(INSTMIME64DIR)/application-x-rosegarden-device.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi16-rosegarden-rgp.png $(INSTMIME16DIR)/application-x-rosegarden-project.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi32-rosegarden-rgp.png $(INSTMIME32DIR)/application-x-rosegarden-project.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi64-rosegarden-rgp.png $(INSTMIME64DIR)/application-x-rosegarden-project.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi16-rosegarden-rgt.png $(INSTMIME16DIR)/application-x-rosegarden-template.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi32-rosegarden-rgt.png $(INSTMIME32DIR)/application-x-rosegarden-template.png
+ $(INSTALL) -m 644 data/pixmaps/icons/mm-mime-hi64-rosegarden-rgt.png $(INSTMIME64DIR)/application-x-rosegarden-template.png
$(MKDIR_P) -m 755 $(INSTMIMEXMLDIR)
$(INSTALL) -m 644 data/mime/rosegarden.xml $(INSTMIMEXMLDIR)
$(MKDIR_P) -m 755 $(INSTDESKTOPDIR)
@@ -196,9 +194,9 @@ install:
uninstall:
rm -f $(INSTBINDIR)/rosegarden
- rm -f $(INSTMIME16DIR)/audio-x-rosegarden*
- rm -f $(INSTMIME32DIR)/audio-x-rosegarden*
- rm -f $(INSTMIME64DIR)/audio-x-rosegarden*
+ rm -f $(INSTMIME16DIR)/application-x-rosegarden*
+ rm -f $(INSTMIME32DIR)/application-x-rosegarden*
+ rm -f $(INSTMIME64DIR)/application-x-rosegarden*
rm -f $(INSTMIMEXMLDIR)/rosegarden.xml
rm -f $(INSTDESKTOPDIR)/rosegarden.desktop
rm -f $(INSTICONDIR)/rosegarden.png
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index 2e5cfb3..44e4e31 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for Rosegarden 14.12.
+@%:@ Generated by GNU Autoconf 2.69 for Rosegarden 15.10.1.
@%:@
@%:@ Report bugs to <rosegarden-devel at lists.sourceforge.net>.
@%:@
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Rosegarden'
PACKAGE_TARNAME='rosegarden'
-PACKAGE_VERSION='14.12'
-PACKAGE_STRING='Rosegarden 14.12'
+PACKAGE_VERSION='15.10.1'
+PACKAGE_STRING='Rosegarden 15.10.1'
PACKAGE_BUGREPORT='rosegarden-devel at lists.sourceforge.net'
PACKAGE_URL=''
@@ -646,8 +646,6 @@ liblo_CFLAGS
ENDIANNESS
ALSA_LIBS
ALSA_CFLAGS
-JACK_LIBS
-JACK_CFLAGS
QT_LIBS
QT_CXXFLAGS
LRELEASE
@@ -738,8 +736,6 @@ CXXCPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-JACK_CFLAGS
-JACK_LIBS
ALSA_CFLAGS
ALSA_LIBS
liblo_CFLAGS
@@ -1292,7 +1288,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Rosegarden 14.12 to adapt to many kinds of systems.
+\`configure' configures Rosegarden 15.10.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1353,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Rosegarden 14.12:";;
+ short | recursive ) echo "Configuration of Rosegarden 15.10.1:";;
esac
cat <<\_ACEOF
@@ -1391,8 +1387,6 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
- JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
- JACK_LIBS linker flags for JACK, overriding pkg-config
ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
ALSA_LIBS linker flags for ALSA, overriding pkg-config
liblo_CFLAGS
@@ -1478,7 +1472,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Rosegarden configure 14.12
+Rosegarden configure 15.10.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1818,7 +1812,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Rosegarden $as_me 14.12, which was
+It was created by Rosegarden $as_me 15.10.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2167,9 +2161,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CODENAME="Magic Carpet"
-#CODENAME="Nostalgia"
-#CODENAME="Oranges and Lemons"
+CODENAME="Oranges and Lemons"
#CODENAME="Peace"
#CODENAME="Querida"
#CODENAME="Rhapsody in Blue"
@@ -5014,82 +5006,51 @@ else
fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
-$as_echo_n "checking for JACK... " >&6; }
-
-if test -n "$JACK_CFLAGS"; then
- pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.100\""; } >&5
- ($PKG_CONFIG --exists --print-errors "jack >= 0.100") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.100" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+JACK_FOUND="0"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jack_client_open in -ljack" >&5
+$as_echo_n "checking for jack_client_open in -ljack... " >&6; }
+if ${ac_cv_lib_jack_jack_client_open+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$JACK_LIBS"; then
- pkg_cv_JACK_LIBS="$JACK_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.100\""; } >&5
- ($PKG_CONFIG --exists --print-errors "jack >= 0.100") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.100" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljack $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jack_client_open ();
+int
+main ()
+{
+return jack_client_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_jack_jack_client_open=yes
else
- pkg_failed=yes
+ ac_cv_lib_jack_jack_client_open=no
fi
- else
- pkg_failed=untried
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jack_jack_client_open" >&5
+$as_echo "$ac_cv_lib_jack_jack_client_open" >&6; }
+if test "x$ac_cv_lib_jack_jack_client_open" = xyes; then :
+ LIBS="$LIBS -ljack" HAVES="$HAVES -DHAVE_LIBJACK" JACK_FOUND="1"
else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.100" 2>&1`
- else
- JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.100" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$JACK_PKG_ERRORS" >&5
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No JACK library found: audio will be unavailable!" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No JACK library found: audio will be unavailable!" >&5
$as_echo "$as_me: WARNING: No JACK library found: audio will be unavailable!" >&2;}
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No JACK library found: audio will be unavailable!" >&5
-$as_echo "$as_me: WARNING: No JACK library found: audio will be unavailable!" >&2;}
-else
- JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
- JACK_LIBS=$pkg_cv_JACK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- HAVES="$HAVES -DHAVE_LIBJACK"
fi
+
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
@@ -6261,7 +6222,7 @@ fi
CXXFLAGS="$CXXFLAGS_BUILD $RG_DEFINES_BUILD"
-if test -z "$JACK_CFLAGS" ; then
+if test "$JACK_FOUND" = "0" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Required JACK library not found, building with no audio!" >&5
$as_echo "$as_me: WARNING: Required JACK library not found, building with no audio!" >&2;}
fi
@@ -6832,7 +6793,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Rosegarden $as_me 14.12, which was
+This file was extended by Rosegarden $as_me 15.10.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6885,7 +6846,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Rosegarden config.status 14.12
+Rosegarden config.status 15.10.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index 2e5cfb3..44e4e31 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for Rosegarden 14.12.
+@%:@ Generated by GNU Autoconf 2.69 for Rosegarden 15.10.1.
@%:@
@%:@ Report bugs to <rosegarden-devel at lists.sourceforge.net>.
@%:@
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Rosegarden'
PACKAGE_TARNAME='rosegarden'
-PACKAGE_VERSION='14.12'
-PACKAGE_STRING='Rosegarden 14.12'
+PACKAGE_VERSION='15.10.1'
+PACKAGE_STRING='Rosegarden 15.10.1'
PACKAGE_BUGREPORT='rosegarden-devel at lists.sourceforge.net'
PACKAGE_URL=''
@@ -646,8 +646,6 @@ liblo_CFLAGS
ENDIANNESS
ALSA_LIBS
ALSA_CFLAGS
-JACK_LIBS
-JACK_CFLAGS
QT_LIBS
QT_CXXFLAGS
LRELEASE
@@ -738,8 +736,6 @@ CXXCPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-JACK_CFLAGS
-JACK_LIBS
ALSA_CFLAGS
ALSA_LIBS
liblo_CFLAGS
@@ -1292,7 +1288,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Rosegarden 14.12 to adapt to many kinds of systems.
+\`configure' configures Rosegarden 15.10.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1353,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Rosegarden 14.12:";;
+ short | recursive ) echo "Configuration of Rosegarden 15.10.1:";;
esac
cat <<\_ACEOF
@@ -1391,8 +1387,6 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
- JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
- JACK_LIBS linker flags for JACK, overriding pkg-config
ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
ALSA_LIBS linker flags for ALSA, overriding pkg-config
liblo_CFLAGS
@@ -1478,7 +1472,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Rosegarden configure 14.12
+Rosegarden configure 15.10.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1818,7 +1812,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Rosegarden $as_me 14.12, which was
+It was created by Rosegarden $as_me 15.10.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2167,9 +2161,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CODENAME="Magic Carpet"
-#CODENAME="Nostalgia"
-#CODENAME="Oranges and Lemons"
+CODENAME="Oranges and Lemons"
#CODENAME="Peace"
#CODENAME="Querida"
#CODENAME="Rhapsody in Blue"
@@ -5014,82 +5006,51 @@ else
fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
-$as_echo_n "checking for JACK... " >&6; }
-
-if test -n "$JACK_CFLAGS"; then
- pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.100\""; } >&5
- ($PKG_CONFIG --exists --print-errors "jack >= 0.100") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.100" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+JACK_FOUND="0"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jack_client_open in -ljack" >&5
+$as_echo_n "checking for jack_client_open in -ljack... " >&6; }
+if ${ac_cv_lib_jack_jack_client_open+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$JACK_LIBS"; then
- pkg_cv_JACK_LIBS="$JACK_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.100\""; } >&5
- ($PKG_CONFIG --exists --print-errors "jack >= 0.100") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.100" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljack $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jack_client_open ();
+int
+main ()
+{
+return jack_client_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_jack_jack_client_open=yes
else
- pkg_failed=yes
+ ac_cv_lib_jack_jack_client_open=no
fi
- else
- pkg_failed=untried
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jack_jack_client_open" >&5
+$as_echo "$ac_cv_lib_jack_jack_client_open" >&6; }
+if test "x$ac_cv_lib_jack_jack_client_open" = xyes; then :
+ LIBS="$LIBS -ljack" HAVES="$HAVES -DHAVE_LIBJACK" JACK_FOUND="1"
else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.100" 2>&1`
- else
- JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.100" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$JACK_PKG_ERRORS" >&5
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No JACK library found: audio will be unavailable!" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No JACK library found: audio will be unavailable!" >&5
$as_echo "$as_me: WARNING: No JACK library found: audio will be unavailable!" >&2;}
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No JACK library found: audio will be unavailable!" >&5
-$as_echo "$as_me: WARNING: No JACK library found: audio will be unavailable!" >&2;}
-else
- JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
- JACK_LIBS=$pkg_cv_JACK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- HAVES="$HAVES -DHAVE_LIBJACK"
fi
+
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
@@ -6261,7 +6222,7 @@ fi
CXXFLAGS="$CXXFLAGS_BUILD $RG_DEFINES_BUILD"
-if test -z "$JACK_CFLAGS" ; then
+if test "$JACK_FOUND" = "0" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Required JACK library not found, building with no audio!" >&5
$as_echo "$as_me: WARNING: Required JACK library not found, building with no audio!" >&2;}
fi
@@ -6832,7 +6793,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Rosegarden $as_me 14.12, which was
+This file was extended by Rosegarden $as_me 15.10.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6885,7 +6846,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Rosegarden config.status 14.12
+Rosegarden config.status 15.10.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 2e74c80..1c9e40f 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -18,23 +18,23 @@
'configure.ac'
],
{
- 'AC_DEFUN_ONCE' => 1,
+ 'include' => 1,
+ 'AC_DEFUN' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
'RG_CHECK_QT' => 1,
- 'm4_pattern_allow' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'm4_include' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'AU_DEFUN' => 1,
- 'AC_DEFUN' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
'PKG_CHECK_EXISTS' => 1,
- 'include' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'_m4_warn' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
'PKG_CHECK_MODULES' => 1,
- 'm4_pattern_forbid' => 1
+ 'm4_include' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ 'AU_DEFUN' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'm4_pattern_allow' => 1,
+ '_AM_AUTOCONF_VERSION' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -49,63 +49,63 @@
'configure.ac'
],
{
- 'AM_MAINTAINER_MODE' => 1,
+ 'AM_PATH_GUILE' => 1,
+ 'AM_PROG_AR' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_INIT' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_CANONICAL_HOST' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
'include' => 1,
- 'AM_NLS' => 1,
- '_AM_MAKEFILE_INCLUDE' => 1,
- 'sinclude' => 1,
+ 'm4_sinclude' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AC_FC_FREEFORM' => 1,
'AM_ENABLE_MULTILIB' => 1,
+ 'AC_FC_PP_SRCEXT' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
'AM_CONDITIONAL' => 1,
- 'AM_PROG_F77_C_O' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AM_PROG_MOC' => 1,
- 'AM_PROG_CXX_C_O' => 1,
- 'AM_PROG_AR' => 1,
- 'AC_CONFIG_LINKS' => 1,
+ 'AH_OUTPUT' => 1,
+ 'sinclude' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
- 'LT_INIT' => 1,
- 'm4_pattern_allow' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
- 'AC_FC_SRCEXT' => 1,
'AM_XGETTEXT_OPTION' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'LT_SUPPORTED_TAG' => 1,
+ 'm4_include' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_CONFIG_LINKS' => 1,
+ '_AM_COND_IF' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
+ 'AM_PROG_MOC' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AM_NLS' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'LT_INIT' => 1,
+ 'AC_CANONICAL_HOST' => 1,
'AC_CONFIG_AUX_DIR' => 1,
- '_m4_warn' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_FC_PP_SRCEXT' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
'_AM_COND_ENDIF' => 1,
- 'AM_PATH_GUILE' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
+ 'AM_PROG_F77_C_O' => 1,
+ 'AM_PROG_FC_C_O' => 1,
'AC_FC_PP_DEFINE' => 1,
- 'm4_pattern_forbid' => 1,
+ 'AC_SUBST_TRACE' => 1,
+ '_AM_COND_ELSE' => 1,
+ '_m4_warn' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AC_LIBSOURCE' => 1,
'AM_POT_TOOLS' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- 'AC_INIT' => 1,
- 'AC_SUBST_TRACE' => 1,
- 'm4_sinclude' => 1,
- 'AM_SILENT_RULES' => 1,
- 'AC_CONFIG_FILES' => 1,
'AC_SUBST' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AC_FC_FREEFORM' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
- 'AC_CANONICAL_TARGET' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- '_AM_COND_ELSE' => 1,
- 'AM_PROG_FC_C_O' => 1,
- 'AC_CANONICAL_BUILD' => 1,
- 'AH_OUTPUT' => 1,
- '_AM_COND_IF' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'm4_include' => 1
+ 'AC_PROG_LIBTOOL' => 1,
+ '_AM_MAKEFILE_INCLUDE' => 1
}
], 'Autom4te::Request' )
);
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
index 05c8c9e..6423888 100644
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -332,151 +332,142 @@ m4trace:configure.ac:2: -1- m4_pattern_allow([^LIBS$])
m4trace:configure.ac:2: -1- m4_pattern_allow([^build_alias$])
m4trace:configure.ac:2: -1- m4_pattern_allow([^host_alias$])
m4trace:configure.ac:2: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:31: -1- _m4_warn([obsolete], [The macro `AC_LANG_CPLUSPLUS' is obsolete.
+m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_LANG_CPLUSPLUS' is obsolete.
You should run autoupdate.], [../../lib/autoconf/c.m4:252: AC_LANG_CPLUSPLUS is expanded from...
-configure.ac:31: the top level])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:36: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^XMKMF$])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:46: -1- PKG_PROG_PKG_CONFIG
-m4trace:configure.ac:46: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:48: -1- RG_CHECK_QT
-m4trace:configure.ac:48: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LUPDATE$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LUPDATE$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LUPDATE$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LRELEASE$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LRELEASE$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LRELEASE$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^QT_CXXFLAGS$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^QT_LIBS$])
-m4trace:configure.ac:54: -1- PKG_CHECK_MODULES([JACK], [jack >= 0.100], [HAVES="$HAVES -DHAVE_LIBJACK"], [
-AC_MSG_WARN(No JACK library found: audio will be unavailable!)])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^JACK_CFLAGS$])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^JACK_LIBS$])
-m4trace:configure.ac:54: -1- PKG_CHECK_EXISTS([jack >= 0.100], [pkg_cv_[]JACK_CFLAGS=`$PKG_CONFIG --[]cflags "jack >= 0.100" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:54: -1- PKG_CHECK_EXISTS([jack >= 0.100], [pkg_cv_[]JACK_LIBS=`$PKG_CONFIG --[]libs "jack >= 0.100" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:54: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:63: -1- PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [HAVES="$HAVES -DHAVE_ALSA"], [
+configure.ac:29: the top level])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.ac:36: -1- m4_pattern_allow([^XMKMF$])
+m4trace:configure.ac:36: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:36: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:36: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:37: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:37: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:37: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:44: -1- PKG_PROG_PKG_CONFIG
+m4trace:configure.ac:44: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:46: -1- RG_CHECK_QT
+m4trace:configure.ac:46: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LUPDATE$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LUPDATE$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LUPDATE$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LRELEASE$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LRELEASE$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LRELEASE$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^QT_CXXFLAGS$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^QT_LIBS$])
+m4trace:configure.ac:64: -1- PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [HAVES="$HAVES -DHAVE_ALSA"], [
AC_MSG_WARN(No ALSA library found: MIDI will be unavailable!)
AC_MSG_NOTICE(Using compatibility code for DSSI event types)
DSSI_LOCALFLAGS="-Isrc/sound/dssi-compatibility"
CXXFLAGS="$CXXFLAGS $DSSI_LOCALFLAGS"
])
-m4trace:configure.ac:63: -1- m4_pattern_allow([^ALSA_CFLAGS$])
-m4trace:configure.ac:63: -1- m4_pattern_allow([^ALSA_LIBS$])
-m4trace:configure.ac:63: -1- PKG_CHECK_EXISTS([alsa >= 0.9], [pkg_cv_[]ALSA_CFLAGS=`$PKG_CONFIG --[]cflags "alsa >= 0.9" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:63: -1- PKG_CHECK_EXISTS([alsa >= 0.9], [pkg_cv_[]ALSA_LIBS=`$PKG_CONFIG --[]libs "alsa >= 0.9" 2>/dev/null`
+m4trace:configure.ac:64: -1- m4_pattern_allow([^ALSA_CFLAGS$])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^ALSA_LIBS$])
+m4trace:configure.ac:64: -1- PKG_CHECK_EXISTS([alsa >= 0.9], [pkg_cv_[]ALSA_CFLAGS=`$PKG_CONFIG --[]cflags "alsa >= 0.9" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:63: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:73: -1- m4_pattern_allow([^ENDIANNESS$])
-m4trace:configure.ac:73: -1- m4_pattern_allow([^ENDIANNESS$])
-m4trace:configure.ac:73: -1- m4_pattern_allow([^AC_APPLE_UNIVERSAL_BUILD$])
-m4trace:configure.ac:75: -1- PKG_CHECK_MODULES([liblo], [liblo >= 0.7], [], [])
-m4trace:configure.ac:75: -1- m4_pattern_allow([^liblo_CFLAGS$])
-m4trace:configure.ac:75: -1- m4_pattern_allow([^liblo_LIBS$])
-m4trace:configure.ac:75: -1- PKG_CHECK_EXISTS([liblo >= 0.7], [pkg_cv_[]liblo_CFLAGS=`$PKG_CONFIG --[]cflags "liblo >= 0.7" 2>/dev/null`
+m4trace:configure.ac:64: -1- PKG_CHECK_EXISTS([alsa >= 0.9], [pkg_cv_[]ALSA_LIBS=`$PKG_CONFIG --[]libs "alsa >= 0.9" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:75: -1- PKG_CHECK_EXISTS([liblo >= 0.7], [pkg_cv_[]liblo_LIBS=`$PKG_CONFIG --[]libs "liblo >= 0.7" 2>/dev/null`
+m4trace:configure.ac:64: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:74: -1- m4_pattern_allow([^ENDIANNESS$])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^ENDIANNESS$])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^AC_APPLE_UNIVERSAL_BUILD$])
+m4trace:configure.ac:76: -1- PKG_CHECK_MODULES([liblo], [liblo >= 0.7], [], [])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^liblo_CFLAGS$])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^liblo_LIBS$])
+m4trace:configure.ac:76: -1- PKG_CHECK_EXISTS([liblo >= 0.7], [pkg_cv_[]liblo_CFLAGS=`$PKG_CONFIG --[]cflags "liblo >= 0.7" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:75: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:76: -1- PKG_CHECK_MODULES([lrdf], [lrdf >= 0.2], [], [])
-m4trace:configure.ac:76: -1- m4_pattern_allow([^lrdf_CFLAGS$])
-m4trace:configure.ac:76: -1- m4_pattern_allow([^lrdf_LIBS$])
-m4trace:configure.ac:76: -1- PKG_CHECK_EXISTS([lrdf >= 0.2], [pkg_cv_[]lrdf_CFLAGS=`$PKG_CONFIG --[]cflags "lrdf >= 0.2" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:76: -1- PKG_CHECK_EXISTS([lrdf >= 0.2], [pkg_cv_[]lrdf_LIBS=`$PKG_CONFIG --[]libs "lrdf >= 0.2" 2>/dev/null`
+m4trace:configure.ac:76: -1- PKG_CHECK_EXISTS([liblo >= 0.7], [pkg_cv_[]liblo_LIBS=`$PKG_CONFIG --[]libs "liblo >= 0.7" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
m4trace:configure.ac:76: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:77: -1- PKG_CHECK_MODULES([fftw3f], [fftw3f >= 3.0.0], [], [])
-m4trace:configure.ac:77: -1- m4_pattern_allow([^fftw3f_CFLAGS$])
-m4trace:configure.ac:77: -1- m4_pattern_allow([^fftw3f_LIBS$])
-m4trace:configure.ac:77: -1- PKG_CHECK_EXISTS([fftw3f >= 3.0.0], [pkg_cv_[]fftw3f_CFLAGS=`$PKG_CONFIG --[]cflags "fftw3f >= 3.0.0" 2>/dev/null`
+m4trace:configure.ac:77: -1- PKG_CHECK_MODULES([lrdf], [lrdf >= 0.2], [], [])
+m4trace:configure.ac:77: -1- m4_pattern_allow([^lrdf_CFLAGS$])
+m4trace:configure.ac:77: -1- m4_pattern_allow([^lrdf_LIBS$])
+m4trace:configure.ac:77: -1- PKG_CHECK_EXISTS([lrdf >= 0.2], [pkg_cv_[]lrdf_CFLAGS=`$PKG_CONFIG --[]cflags "lrdf >= 0.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:77: -1- PKG_CHECK_EXISTS([fftw3f >= 3.0.0], [pkg_cv_[]fftw3f_LIBS=`$PKG_CONFIG --[]libs "fftw3f >= 3.0.0" 2>/dev/null`
+m4trace:configure.ac:77: -1- PKG_CHECK_EXISTS([lrdf >= 0.2], [pkg_cv_[]lrdf_LIBS=`$PKG_CONFIG --[]libs "lrdf >= 0.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
m4trace:configure.ac:77: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:78: -1- PKG_CHECK_MODULES([sndfile], [sndfile >= 1.0.16], [HAVES="$HAVES -DHAVE_LIBSNDFILE"], [])
-m4trace:configure.ac:78: -1- m4_pattern_allow([^sndfile_CFLAGS$])
-m4trace:configure.ac:78: -1- m4_pattern_allow([^sndfile_LIBS$])
-m4trace:configure.ac:78: -1- PKG_CHECK_EXISTS([sndfile >= 1.0.16], [pkg_cv_[]sndfile_CFLAGS=`$PKG_CONFIG --[]cflags "sndfile >= 1.0.16" 2>/dev/null`
+m4trace:configure.ac:78: -1- PKG_CHECK_MODULES([fftw3f], [fftw3f >= 3.0.0], [], [])
+m4trace:configure.ac:78: -1- m4_pattern_allow([^fftw3f_CFLAGS$])
+m4trace:configure.ac:78: -1- m4_pattern_allow([^fftw3f_LIBS$])
+m4trace:configure.ac:78: -1- PKG_CHECK_EXISTS([fftw3f >= 3.0.0], [pkg_cv_[]fftw3f_CFLAGS=`$PKG_CONFIG --[]cflags "fftw3f >= 3.0.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:78: -1- PKG_CHECK_EXISTS([sndfile >= 1.0.16], [pkg_cv_[]sndfile_LIBS=`$PKG_CONFIG --[]libs "sndfile >= 1.0.16" 2>/dev/null`
+m4trace:configure.ac:78: -1- PKG_CHECK_EXISTS([fftw3f >= 3.0.0], [pkg_cv_[]fftw3f_LIBS=`$PKG_CONFIG --[]libs "fftw3f >= 3.0.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
m4trace:configure.ac:78: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:79: -1- PKG_CHECK_MODULES([samplerate], [samplerate >= 0.1.2], [], [])
-m4trace:configure.ac:79: -1- m4_pattern_allow([^samplerate_CFLAGS$])
-m4trace:configure.ac:79: -1- m4_pattern_allow([^samplerate_LIBS$])
-m4trace:configure.ac:79: -1- PKG_CHECK_EXISTS([samplerate >= 0.1.2], [pkg_cv_[]samplerate_CFLAGS=`$PKG_CONFIG --[]cflags "samplerate >= 0.1.2" 2>/dev/null`
+m4trace:configure.ac:79: -1- PKG_CHECK_MODULES([sndfile], [sndfile >= 1.0.16], [HAVES="$HAVES -DHAVE_LIBSNDFILE"], [])
+m4trace:configure.ac:79: -1- m4_pattern_allow([^sndfile_CFLAGS$])
+m4trace:configure.ac:79: -1- m4_pattern_allow([^sndfile_LIBS$])
+m4trace:configure.ac:79: -1- PKG_CHECK_EXISTS([sndfile >= 1.0.16], [pkg_cv_[]sndfile_CFLAGS=`$PKG_CONFIG --[]cflags "sndfile >= 1.0.16" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:79: -1- PKG_CHECK_EXISTS([samplerate >= 0.1.2], [pkg_cv_[]samplerate_LIBS=`$PKG_CONFIG --[]libs "samplerate >= 0.1.2" 2>/dev/null`
+m4trace:configure.ac:79: -1- PKG_CHECK_EXISTS([sndfile >= 1.0.16], [pkg_cv_[]sndfile_LIBS=`$PKG_CONFIG --[]libs "sndfile >= 1.0.16" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
m4trace:configure.ac:79: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:81: -1- m4_pattern_allow([^PERL$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^XARGS$])
-m4trace:configure.ac:91: -1- m4_pattern_allow([^MAKEDEPEND$])
-m4trace:configure.ac:96: -1- m4_pattern_allow([^SHA1SUM$])
+m4trace:configure.ac:80: -1- PKG_CHECK_MODULES([samplerate], [samplerate >= 0.1.2], [], [])
+m4trace:configure.ac:80: -1- m4_pattern_allow([^samplerate_CFLAGS$])
+m4trace:configure.ac:80: -1- m4_pattern_allow([^samplerate_LIBS$])
+m4trace:configure.ac:80: -1- PKG_CHECK_EXISTS([samplerate >= 0.1.2], [pkg_cv_[]samplerate_CFLAGS=`$PKG_CONFIG --[]cflags "samplerate >= 0.1.2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:80: -1- PKG_CHECK_EXISTS([samplerate >= 0.1.2], [pkg_cv_[]samplerate_LIBS=`$PKG_CONFIG --[]libs "samplerate >= 0.1.2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+m4trace:configure.ac:80: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:82: -1- m4_pattern_allow([^PERL$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^XARGS$])
+m4trace:configure.ac:92: -1- m4_pattern_allow([^MAKEDEPEND$])
m4trace:configure.ac:97: -1- m4_pattern_allow([^SHA1SUM$])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^CUT$])
-m4trace:configure.ac:154: -1- m4_pattern_allow([^PERL$])
-m4trace:configure.ac:155: -1- m4_pattern_allow([^XARGS$])
-m4trace:configure.ac:156: -1- m4_pattern_allow([^MAKEDEPEND$])
-m4trace:configure.ac:157: -1- m4_pattern_allow([^SHA1SUM$])
-m4trace:configure.ac:158: -1- m4_pattern_allow([^CUT$])
-m4trace:configure.ac:160: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:161: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:162: -1- m4_pattern_allow([^CXXFLAGS_MINIMAL$])
-m4trace:configure.ac:163: -1- m4_pattern_allow([^HAVES$])
-m4trace:configure.ac:164: -1- m4_pattern_allow([^DSSI_LOCALFLAGS$])
-m4trace:configure.ac:166: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:167: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:169: -1- m4_pattern_allow([^CODENAME$])
-m4trace:configure.ac:171: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.ac:98: -1- m4_pattern_allow([^SHA1SUM$])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^CUT$])
+m4trace:configure.ac:155: -1- m4_pattern_allow([^PERL$])
+m4trace:configure.ac:156: -1- m4_pattern_allow([^XARGS$])
+m4trace:configure.ac:157: -1- m4_pattern_allow([^MAKEDEPEND$])
+m4trace:configure.ac:158: -1- m4_pattern_allow([^SHA1SUM$])
+m4trace:configure.ac:159: -1- m4_pattern_allow([^CUT$])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:162: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:163: -1- m4_pattern_allow([^CXXFLAGS_MINIMAL$])
+m4trace:configure.ac:164: -1- m4_pattern_allow([^HAVES$])
+m4trace:configure.ac:165: -1- m4_pattern_allow([^DSSI_LOCALFLAGS$])
+m4trace:configure.ac:167: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:168: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:170: -1- m4_pattern_allow([^CODENAME$])
+m4trace:configure.ac:172: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
You should run autoupdate.], [])
-m4trace:configure.ac:171: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-m4trace:configure.ac:171: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:171: -1- _m4_warn([obsolete], [AC_C_BIGENDIAN should be used with AC_CONFIG_HEADERS], [])
+m4trace:configure.ac:172: -1- m4_pattern_allow([^LIB@&t at OBJS$])
+m4trace:configure.ac:172: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:172: -1- _m4_warn([obsolete], [AC_C_BIGENDIAN should be used with AC_CONFIG_HEADERS], [])
diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1
index 99afced..338dc44 100644
--- a/autom4te.cache/traces.1
+++ b/autom4te.cache/traces.1
@@ -1,5 +1,5 @@
m4trace:aclocal.m4:175: -1- m4_include([acinclude.m4])
-m4trace:configure.ac:2: -1- AC_INIT([Rosegarden], [14.12], [rosegarden-devel at lists.sourceforge.net])
+m4trace:configure.ac:2: -1- AC_INIT([Rosegarden], [15.10.1], [rosegarden-devel at lists.sourceforge.net])
m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -147,199 +147,193 @@ m4trace:configure.ac:2: -1- m4_pattern_allow([^host_alias$])
m4trace:configure.ac:2: -1- AC_SUBST([target_alias])
m4trace:configure.ac:2: -1- AC_SUBST_TRACE([target_alias])
m4trace:configure.ac:2: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:31: -1- _m4_warn([obsolete], [The macro `AC_LANG_CPLUSPLUS' is obsolete.
+m4trace:configure.ac:29: -1- _m4_warn([obsolete], [The macro `AC_LANG_CPLUSPLUS' is obsolete.
You should run autoupdate.], [../../lib/autoconf/c.m4:252: AC_LANG_CPLUSPLUS is expanded from...
-configure.ac:31: the top level])
-m4trace:configure.ac:33: -1- AC_SUBST([CC])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- AC_SUBST([CFLAGS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CFLAGS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:33: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:33: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:33: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:33: -1- AC_SUBST([CC])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- AC_SUBST([CC])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- AC_SUBST([CC])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- AC_SUBST([CC])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:33: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([ac_ct_CC])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:33: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([EXEEXT])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:33: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([OBJEXT])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:34: -1- AC_SUBST([CXX])
-m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:34: -1- AC_SUBST([CXXFLAGS])
-m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CXXFLAGS])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:34: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:34: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:34: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:34: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:34: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:34: -1- AC_SUBST([CXX])
-m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:34: -1- AC_SUBST([ac_ct_CXX])
-m4trace:configure.ac:34: -1- AC_SUBST_TRACE([ac_ct_CXX])
-m4trace:configure.ac:34: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:35: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:35: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.ac:35: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:35: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.ac:35: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:35: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.ac:35: -1- AC_SUBST_TRACE([INSTALL_DATA])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:36: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:36: -1- AC_SUBST([MKDIR_P])
-m4trace:configure.ac:36: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:36: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:38: -1- AC_SUBST([XMKMF])
-m4trace:configure.ac:38: -1- AC_SUBST_TRACE([XMKMF])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^XMKMF$])
-m4trace:configure.ac:38: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:38: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:38: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:38: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:38: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:38: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:39: -1- AC_SUBST([GREP])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([GREP])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:39: -1- AC_SUBST([EGREP])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([EGREP])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:39: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:39: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+configure.ac:29: the top level])
+m4trace:configure.ac:31: -1- AC_SUBST([CC])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:31: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:31: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:31: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:31: -1- AC_SUBST([CC])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- AC_SUBST([CC])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- AC_SUBST([CC])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- AC_SUBST([CC])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:31: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([ac_ct_CC])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:31: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([EXEEXT])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:31: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+m4trace:configure.ac:31: -1- AC_SUBST_TRACE([OBJEXT])
+m4trace:configure.ac:31: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:32: -1- AC_SUBST([CXX])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:32: -1- AC_SUBST([CXXFLAGS])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([CXXFLAGS])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:32: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:32: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:32: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:32: -1- AC_SUBST([CXX])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:32: -1- AC_SUBST([ac_ct_CXX])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([ac_ct_CXX])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:33: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:33: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:33: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:33: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([INSTALL_DATA])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:34: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:34: -1- AC_SUBST([MKDIR_P])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.ac:36: -1- AC_SUBST([XMKMF])
+m4trace:configure.ac:36: -1- AC_SUBST_TRACE([XMKMF])
+m4trace:configure.ac:36: -1- m4_pattern_allow([^XMKMF$])
+m4trace:configure.ac:36: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:36: -1- AC_SUBST_TRACE([CXXCPP])
+m4trace:configure.ac:36: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:36: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:36: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:36: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:36: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:36: -1- AC_SUBST_TRACE([CXXCPP])
+m4trace:configure.ac:36: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:37: -1- AC_SUBST([GREP])
+m4trace:configure.ac:37: -1- AC_SUBST_TRACE([GREP])
+m4trace:configure.ac:37: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:37: -1- AC_SUBST([EGREP])
+m4trace:configure.ac:37: -1- AC_SUBST_TRACE([EGREP])
+m4trace:configure.ac:37: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:37: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:37: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:37: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
@%:@undef STDC_HEADERS])
-m4trace:configure.ac:46: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-m4trace:configure.ac:46: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:46: -1- AC_SUBST_TRACE([PKG_CONFIG])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:46: -1- AC_SUBST([PKG_CONFIG_PATH])
-m4trace:configure.ac:46: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
-m4trace:configure.ac:46: -1- AC_SUBST([PKG_CONFIG_LIBDIR])
-m4trace:configure.ac:46: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
-m4trace:configure.ac:46: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:46: -1- AC_SUBST_TRACE([PKG_CONFIG])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:48: -1- AC_SUBST([MOC])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([MOC])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:48: -1- AC_SUBST([MOC])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([MOC])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:48: -1- AC_SUBST([MOC])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([MOC])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:48: -1- AC_SUBST([UIC])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([UIC])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:48: -1- AC_SUBST([UIC])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([UIC])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:48: -1- AC_SUBST([UIC])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([UIC])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:48: -1- AC_SUBST([RCC])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([RCC])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:48: -1- AC_SUBST([RCC])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([RCC])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:48: -1- AC_SUBST([RCC])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([RCC])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:48: -1- AC_SUBST([LUPDATE])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([LUPDATE])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LUPDATE$])
-m4trace:configure.ac:48: -1- AC_SUBST([LUPDATE])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([LUPDATE])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LUPDATE$])
-m4trace:configure.ac:48: -1- AC_SUBST([LUPDATE])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([LUPDATE])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LUPDATE$])
-m4trace:configure.ac:48: -1- AC_SUBST([LRELEASE])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([LRELEASE])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LRELEASE$])
-m4trace:configure.ac:48: -1- AC_SUBST([LRELEASE])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([LRELEASE])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LRELEASE$])
-m4trace:configure.ac:48: -1- AC_SUBST([LRELEASE])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([LRELEASE])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^LRELEASE$])
-m4trace:configure.ac:48: -1- AC_SUBST([QT_CXXFLAGS])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([QT_CXXFLAGS])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^QT_CXXFLAGS$])
-m4trace:configure.ac:48: -1- AC_SUBST([QT_LIBS])
-m4trace:configure.ac:48: -1- AC_SUBST_TRACE([QT_LIBS])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^QT_LIBS$])
-m4trace:configure.ac:54: -1- AC_SUBST([JACK_CFLAGS])
-m4trace:configure.ac:54: -1- AC_SUBST_TRACE([JACK_CFLAGS])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^JACK_CFLAGS$])
-m4trace:configure.ac:54: -1- AC_SUBST([JACK_LIBS])
-m4trace:configure.ac:54: -1- AC_SUBST_TRACE([JACK_LIBS])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^JACK_LIBS$])
-m4trace:configure.ac:57: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:44: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4trace:configure.ac:44: -1- AC_SUBST([PKG_CONFIG])
+m4trace:configure.ac:44: -1- AC_SUBST_TRACE([PKG_CONFIG])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:44: -1- AC_SUBST([PKG_CONFIG_PATH])
+m4trace:configure.ac:44: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
+m4trace:configure.ac:44: -1- AC_SUBST([PKG_CONFIG_LIBDIR])
+m4trace:configure.ac:44: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+m4trace:configure.ac:44: -1- AC_SUBST([PKG_CONFIG])
+m4trace:configure.ac:44: -1- AC_SUBST_TRACE([PKG_CONFIG])
+m4trace:configure.ac:44: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:46: -1- AC_SUBST([MOC])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([MOC])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:46: -1- AC_SUBST([MOC])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([MOC])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:46: -1- AC_SUBST([MOC])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([MOC])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:46: -1- AC_SUBST([UIC])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([UIC])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:46: -1- AC_SUBST([UIC])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([UIC])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:46: -1- AC_SUBST([UIC])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([UIC])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:46: -1- AC_SUBST([RCC])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([RCC])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:46: -1- AC_SUBST([RCC])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([RCC])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:46: -1- AC_SUBST([RCC])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([RCC])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:46: -1- AC_SUBST([LUPDATE])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LUPDATE])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LUPDATE$])
+m4trace:configure.ac:46: -1- AC_SUBST([LUPDATE])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LUPDATE])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LUPDATE$])
+m4trace:configure.ac:46: -1- AC_SUBST([LUPDATE])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LUPDATE])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LUPDATE$])
+m4trace:configure.ac:46: -1- AC_SUBST([LRELEASE])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LRELEASE])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LRELEASE$])
+m4trace:configure.ac:46: -1- AC_SUBST([LRELEASE])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LRELEASE])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LRELEASE$])
+m4trace:configure.ac:46: -1- AC_SUBST([LRELEASE])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LRELEASE])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LRELEASE$])
+m4trace:configure.ac:46: -1- AC_SUBST([QT_CXXFLAGS])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([QT_CXXFLAGS])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^QT_CXXFLAGS$])
+m4trace:configure.ac:46: -1- AC_SUBST([QT_LIBS])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([QT_LIBS])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^QT_LIBS$])
+m4trace:configure.ac:58: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
@%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:57: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
+m4trace:configure.ac:58: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
@%:@undef HAVE_SYS_STAT_H])
-m4trace:configure.ac:57: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+m4trace:configure.ac:58: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
@%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:57: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+m4trace:configure.ac:58: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
@%:@undef HAVE_STRING_H])
-m4trace:configure.ac:57: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+m4trace:configure.ac:58: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
@%:@undef HAVE_MEMORY_H])
-m4trace:configure.ac:57: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+m4trace:configure.ac:58: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
@%:@undef HAVE_STRINGS_H])
-m4trace:configure.ac:57: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:58: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
@%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:57: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:58: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
@%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:57: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+m4trace:configure.ac:58: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
@%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:63: -1- AC_SUBST([ALSA_CFLAGS])
-m4trace:configure.ac:63: -1- AC_SUBST_TRACE([ALSA_CFLAGS])
-m4trace:configure.ac:63: -1- m4_pattern_allow([^ALSA_CFLAGS$])
-m4trace:configure.ac:63: -1- AC_SUBST([ALSA_LIBS])
-m4trace:configure.ac:63: -1- AC_SUBST_TRACE([ALSA_LIBS])
-m4trace:configure.ac:63: -1- m4_pattern_allow([^ALSA_LIBS$])
-m4trace:configure.ac:73: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+m4trace:configure.ac:64: -1- AC_SUBST([ALSA_CFLAGS])
+m4trace:configure.ac:64: -1- AC_SUBST_TRACE([ALSA_CFLAGS])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^ALSA_CFLAGS$])
+m4trace:configure.ac:64: -1- AC_SUBST([ALSA_LIBS])
+m4trace:configure.ac:64: -1- AC_SUBST_TRACE([ALSA_LIBS])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^ALSA_LIBS$])
+m4trace:configure.ac:74: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
@@ -350,121 +344,121 @@ m4trace:configure.ac:73: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define WORDS_BIGEN
# undef WORDS_BIGENDIAN
# endif
#endif])
-m4trace:configure.ac:73: -1- AC_SUBST([ENDIANNESS], ["-DBIG_ENDIAN=1"])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([ENDIANNESS])
-m4trace:configure.ac:73: -1- m4_pattern_allow([^ENDIANNESS$])
-m4trace:configure.ac:73: -1- AC_SUBST([ENDIANNESS], ["-DLITTLE_ENDIAN=1"])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([ENDIANNESS])
-m4trace:configure.ac:73: -1- m4_pattern_allow([^ENDIANNESS$])
-m4trace:configure.ac:73: -1- AC_DEFINE_TRACE_LITERAL([AC_APPLE_UNIVERSAL_BUILD])
-m4trace:configure.ac:73: -1- m4_pattern_allow([^AC_APPLE_UNIVERSAL_BUILD$])
-m4trace:configure.ac:73: -1- AH_OUTPUT([AC_APPLE_UNIVERSAL_BUILD], [/* Define if building universal (internal helper macro) */
+m4trace:configure.ac:74: -1- AC_SUBST([ENDIANNESS], ["-DBIG_ENDIAN=1"])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([ENDIANNESS])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^ENDIANNESS$])
+m4trace:configure.ac:74: -1- AC_SUBST([ENDIANNESS], ["-DLITTLE_ENDIAN=1"])
+m4trace:configure.ac:74: -1- AC_SUBST_TRACE([ENDIANNESS])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^ENDIANNESS$])
+m4trace:configure.ac:74: -1- AC_DEFINE_TRACE_LITERAL([AC_APPLE_UNIVERSAL_BUILD])
+m4trace:configure.ac:74: -1- m4_pattern_allow([^AC_APPLE_UNIVERSAL_BUILD$])
+m4trace:configure.ac:74: -1- AH_OUTPUT([AC_APPLE_UNIVERSAL_BUILD], [/* Define if building universal (internal helper macro) */
@%:@undef AC_APPLE_UNIVERSAL_BUILD])
-m4trace:configure.ac:75: -1- AC_SUBST([liblo_CFLAGS])
-m4trace:configure.ac:75: -1- AC_SUBST_TRACE([liblo_CFLAGS])
-m4trace:configure.ac:75: -1- m4_pattern_allow([^liblo_CFLAGS$])
-m4trace:configure.ac:75: -1- AC_SUBST([liblo_LIBS])
-m4trace:configure.ac:75: -1- AC_SUBST_TRACE([liblo_LIBS])
-m4trace:configure.ac:75: -1- m4_pattern_allow([^liblo_LIBS$])
-m4trace:configure.ac:76: -1- AC_SUBST([lrdf_CFLAGS])
-m4trace:configure.ac:76: -1- AC_SUBST_TRACE([lrdf_CFLAGS])
-m4trace:configure.ac:76: -1- m4_pattern_allow([^lrdf_CFLAGS$])
-m4trace:configure.ac:76: -1- AC_SUBST([lrdf_LIBS])
-m4trace:configure.ac:76: -1- AC_SUBST_TRACE([lrdf_LIBS])
-m4trace:configure.ac:76: -1- m4_pattern_allow([^lrdf_LIBS$])
-m4trace:configure.ac:77: -1- AC_SUBST([fftw3f_CFLAGS])
-m4trace:configure.ac:77: -1- AC_SUBST_TRACE([fftw3f_CFLAGS])
-m4trace:configure.ac:77: -1- m4_pattern_allow([^fftw3f_CFLAGS$])
-m4trace:configure.ac:77: -1- AC_SUBST([fftw3f_LIBS])
-m4trace:configure.ac:77: -1- AC_SUBST_TRACE([fftw3f_LIBS])
-m4trace:configure.ac:77: -1- m4_pattern_allow([^fftw3f_LIBS$])
-m4trace:configure.ac:78: -1- AC_SUBST([sndfile_CFLAGS])
-m4trace:configure.ac:78: -1- AC_SUBST_TRACE([sndfile_CFLAGS])
-m4trace:configure.ac:78: -1- m4_pattern_allow([^sndfile_CFLAGS$])
-m4trace:configure.ac:78: -1- AC_SUBST([sndfile_LIBS])
-m4trace:configure.ac:78: -1- AC_SUBST_TRACE([sndfile_LIBS])
-m4trace:configure.ac:78: -1- m4_pattern_allow([^sndfile_LIBS$])
-m4trace:configure.ac:79: -1- AC_SUBST([samplerate_CFLAGS])
-m4trace:configure.ac:79: -1- AC_SUBST_TRACE([samplerate_CFLAGS])
-m4trace:configure.ac:79: -1- m4_pattern_allow([^samplerate_CFLAGS$])
-m4trace:configure.ac:79: -1- AC_SUBST([samplerate_LIBS])
-m4trace:configure.ac:79: -1- AC_SUBST_TRACE([samplerate_LIBS])
-m4trace:configure.ac:79: -1- m4_pattern_allow([^samplerate_LIBS$])
-m4trace:configure.ac:81: -1- AC_SUBST([PERL])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([PERL])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^PERL$])
-m4trace:configure.ac:86: -1- AC_SUBST([XARGS])
-m4trace:configure.ac:86: -1- AC_SUBST_TRACE([XARGS])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^XARGS$])
-m4trace:configure.ac:91: -1- AC_SUBST([MAKEDEPEND])
-m4trace:configure.ac:91: -1- AC_SUBST_TRACE([MAKEDEPEND])
-m4trace:configure.ac:91: -1- m4_pattern_allow([^MAKEDEPEND$])
-m4trace:configure.ac:96: -1- AC_SUBST([SHA1SUM])
-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([SHA1SUM])
-m4trace:configure.ac:96: -1- m4_pattern_allow([^SHA1SUM$])
+m4trace:configure.ac:76: -1- AC_SUBST([liblo_CFLAGS])
+m4trace:configure.ac:76: -1- AC_SUBST_TRACE([liblo_CFLAGS])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^liblo_CFLAGS$])
+m4trace:configure.ac:76: -1- AC_SUBST([liblo_LIBS])
+m4trace:configure.ac:76: -1- AC_SUBST_TRACE([liblo_LIBS])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^liblo_LIBS$])
+m4trace:configure.ac:77: -1- AC_SUBST([lrdf_CFLAGS])
+m4trace:configure.ac:77: -1- AC_SUBST_TRACE([lrdf_CFLAGS])
+m4trace:configure.ac:77: -1- m4_pattern_allow([^lrdf_CFLAGS$])
+m4trace:configure.ac:77: -1- AC_SUBST([lrdf_LIBS])
+m4trace:configure.ac:77: -1- AC_SUBST_TRACE([lrdf_LIBS])
+m4trace:configure.ac:77: -1- m4_pattern_allow([^lrdf_LIBS$])
+m4trace:configure.ac:78: -1- AC_SUBST([fftw3f_CFLAGS])
+m4trace:configure.ac:78: -1- AC_SUBST_TRACE([fftw3f_CFLAGS])
+m4trace:configure.ac:78: -1- m4_pattern_allow([^fftw3f_CFLAGS$])
+m4trace:configure.ac:78: -1- AC_SUBST([fftw3f_LIBS])
+m4trace:configure.ac:78: -1- AC_SUBST_TRACE([fftw3f_LIBS])
+m4trace:configure.ac:78: -1- m4_pattern_allow([^fftw3f_LIBS$])
+m4trace:configure.ac:79: -1- AC_SUBST([sndfile_CFLAGS])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([sndfile_CFLAGS])
+m4trace:configure.ac:79: -1- m4_pattern_allow([^sndfile_CFLAGS$])
+m4trace:configure.ac:79: -1- AC_SUBST([sndfile_LIBS])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([sndfile_LIBS])
+m4trace:configure.ac:79: -1- m4_pattern_allow([^sndfile_LIBS$])
+m4trace:configure.ac:80: -1- AC_SUBST([samplerate_CFLAGS])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([samplerate_CFLAGS])
+m4trace:configure.ac:80: -1- m4_pattern_allow([^samplerate_CFLAGS$])
+m4trace:configure.ac:80: -1- AC_SUBST([samplerate_LIBS])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([samplerate_LIBS])
+m4trace:configure.ac:80: -1- m4_pattern_allow([^samplerate_LIBS$])
+m4trace:configure.ac:82: -1- AC_SUBST([PERL])
+m4trace:configure.ac:82: -1- AC_SUBST_TRACE([PERL])
+m4trace:configure.ac:82: -1- m4_pattern_allow([^PERL$])
+m4trace:configure.ac:87: -1- AC_SUBST([XARGS])
+m4trace:configure.ac:87: -1- AC_SUBST_TRACE([XARGS])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^XARGS$])
+m4trace:configure.ac:92: -1- AC_SUBST([MAKEDEPEND])
+m4trace:configure.ac:92: -1- AC_SUBST_TRACE([MAKEDEPEND])
+m4trace:configure.ac:92: -1- m4_pattern_allow([^MAKEDEPEND$])
m4trace:configure.ac:97: -1- AC_SUBST([SHA1SUM])
m4trace:configure.ac:97: -1- AC_SUBST_TRACE([SHA1SUM])
m4trace:configure.ac:97: -1- m4_pattern_allow([^SHA1SUM$])
-m4trace:configure.ac:102: -1- AC_SUBST([CUT])
-m4trace:configure.ac:102: -1- AC_SUBST_TRACE([CUT])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^CUT$])
-m4trace:configure.ac:154: -1- AC_SUBST([PERL])
-m4trace:configure.ac:154: -1- AC_SUBST_TRACE([PERL])
-m4trace:configure.ac:154: -1- m4_pattern_allow([^PERL$])
-m4trace:configure.ac:155: -1- AC_SUBST([XARGS])
-m4trace:configure.ac:155: -1- AC_SUBST_TRACE([XARGS])
-m4trace:configure.ac:155: -1- m4_pattern_allow([^XARGS$])
-m4trace:configure.ac:156: -1- AC_SUBST([MAKEDEPEND])
-m4trace:configure.ac:156: -1- AC_SUBST_TRACE([MAKEDEPEND])
-m4trace:configure.ac:156: -1- m4_pattern_allow([^MAKEDEPEND$])
-m4trace:configure.ac:157: -1- AC_SUBST([SHA1SUM])
-m4trace:configure.ac:157: -1- AC_SUBST_TRACE([SHA1SUM])
-m4trace:configure.ac:157: -1- m4_pattern_allow([^SHA1SUM$])
-m4trace:configure.ac:158: -1- AC_SUBST([CUT])
-m4trace:configure.ac:158: -1- AC_SUBST_TRACE([CUT])
-m4trace:configure.ac:158: -1- m4_pattern_allow([^CUT$])
-m4trace:configure.ac:160: -1- AC_SUBST([CFLAGS])
-m4trace:configure.ac:160: -1- AC_SUBST_TRACE([CFLAGS])
-m4trace:configure.ac:160: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:161: -1- AC_SUBST([CXXFLAGS])
-m4trace:configure.ac:161: -1- AC_SUBST_TRACE([CXXFLAGS])
-m4trace:configure.ac:161: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:162: -1- AC_SUBST([CXXFLAGS_MINIMAL])
-m4trace:configure.ac:162: -1- AC_SUBST_TRACE([CXXFLAGS_MINIMAL])
-m4trace:configure.ac:162: -1- m4_pattern_allow([^CXXFLAGS_MINIMAL$])
-m4trace:configure.ac:163: -1- AC_SUBST([HAVES])
-m4trace:configure.ac:163: -1- AC_SUBST_TRACE([HAVES])
-m4trace:configure.ac:163: -1- m4_pattern_allow([^HAVES$])
-m4trace:configure.ac:164: -1- AC_SUBST([DSSI_LOCALFLAGS])
-m4trace:configure.ac:164: -1- AC_SUBST_TRACE([DSSI_LOCALFLAGS])
-m4trace:configure.ac:164: -1- m4_pattern_allow([^DSSI_LOCALFLAGS$])
-m4trace:configure.ac:166: -1- AC_SUBST([CC])
-m4trace:configure.ac:166: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:166: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:167: -1- AC_SUBST([CXX])
-m4trace:configure.ac:167: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:167: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:169: -1- AC_SUBST([CODENAME])
-m4trace:configure.ac:169: -1- AC_SUBST_TRACE([CODENAME])
-m4trace:configure.ac:169: -1- m4_pattern_allow([^CODENAME$])
-m4trace:configure.ac:171: -1- AC_CONFIG_FILES([Makefile])
-m4trace:configure.ac:171: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.ac:98: -1- AC_SUBST([SHA1SUM])
+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([SHA1SUM])
+m4trace:configure.ac:98: -1- m4_pattern_allow([^SHA1SUM$])
+m4trace:configure.ac:103: -1- AC_SUBST([CUT])
+m4trace:configure.ac:103: -1- AC_SUBST_TRACE([CUT])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^CUT$])
+m4trace:configure.ac:155: -1- AC_SUBST([PERL])
+m4trace:configure.ac:155: -1- AC_SUBST_TRACE([PERL])
+m4trace:configure.ac:155: -1- m4_pattern_allow([^PERL$])
+m4trace:configure.ac:156: -1- AC_SUBST([XARGS])
+m4trace:configure.ac:156: -1- AC_SUBST_TRACE([XARGS])
+m4trace:configure.ac:156: -1- m4_pattern_allow([^XARGS$])
+m4trace:configure.ac:157: -1- AC_SUBST([MAKEDEPEND])
+m4trace:configure.ac:157: -1- AC_SUBST_TRACE([MAKEDEPEND])
+m4trace:configure.ac:157: -1- m4_pattern_allow([^MAKEDEPEND$])
+m4trace:configure.ac:158: -1- AC_SUBST([SHA1SUM])
+m4trace:configure.ac:158: -1- AC_SUBST_TRACE([SHA1SUM])
+m4trace:configure.ac:158: -1- m4_pattern_allow([^SHA1SUM$])
+m4trace:configure.ac:159: -1- AC_SUBST([CUT])
+m4trace:configure.ac:159: -1- AC_SUBST_TRACE([CUT])
+m4trace:configure.ac:159: -1- m4_pattern_allow([^CUT$])
+m4trace:configure.ac:161: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:162: -1- AC_SUBST([CXXFLAGS])
+m4trace:configure.ac:162: -1- AC_SUBST_TRACE([CXXFLAGS])
+m4trace:configure.ac:162: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:163: -1- AC_SUBST([CXXFLAGS_MINIMAL])
+m4trace:configure.ac:163: -1- AC_SUBST_TRACE([CXXFLAGS_MINIMAL])
+m4trace:configure.ac:163: -1- m4_pattern_allow([^CXXFLAGS_MINIMAL$])
+m4trace:configure.ac:164: -1- AC_SUBST([HAVES])
+m4trace:configure.ac:164: -1- AC_SUBST_TRACE([HAVES])
+m4trace:configure.ac:164: -1- m4_pattern_allow([^HAVES$])
+m4trace:configure.ac:165: -1- AC_SUBST([DSSI_LOCALFLAGS])
+m4trace:configure.ac:165: -1- AC_SUBST_TRACE([DSSI_LOCALFLAGS])
+m4trace:configure.ac:165: -1- m4_pattern_allow([^DSSI_LOCALFLAGS$])
+m4trace:configure.ac:167: -1- AC_SUBST([CC])
+m4trace:configure.ac:167: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:167: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:168: -1- AC_SUBST([CXX])
+m4trace:configure.ac:168: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:168: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:170: -1- AC_SUBST([CODENAME])
+m4trace:configure.ac:170: -1- AC_SUBST_TRACE([CODENAME])
+m4trace:configure.ac:170: -1- m4_pattern_allow([^CODENAME$])
+m4trace:configure.ac:172: -1- AC_CONFIG_FILES([Makefile])
+m4trace:configure.ac:172: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
You should run autoupdate.], [])
-m4trace:configure.ac:171: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-m4trace:configure.ac:171: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-m4trace:configure.ac:171: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:171: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:171: -1- _m4_warn([obsolete], [AC_C_BIGENDIAN should be used with AC_CONFIG_HEADERS], [])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:171: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:172: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
+m4trace:configure.ac:172: -1- m4_pattern_allow([^LIB@&t at OBJS$])
+m4trace:configure.ac:172: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:172: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:172: -1- _m4_warn([obsolete], [AC_C_BIGENDIAN should be used with AC_CONFIG_HEADERS], [])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:172: -1- AC_SUBST_TRACE([MKDIR_P])
diff --git a/configure b/configure
index 519cf1e..f003bb5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Rosegarden 14.12.
+# Generated by GNU Autoconf 2.69 for Rosegarden 15.10.1.
#
# Report bugs to <rosegarden-devel at lists.sourceforge.net>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Rosegarden'
PACKAGE_TARNAME='rosegarden'
-PACKAGE_VERSION='14.12'
-PACKAGE_STRING='Rosegarden 14.12'
+PACKAGE_VERSION='15.10.1'
+PACKAGE_STRING='Rosegarden 15.10.1'
PACKAGE_BUGREPORT='rosegarden-devel at lists.sourceforge.net'
PACKAGE_URL=''
@@ -646,8 +646,6 @@ liblo_CFLAGS
ENDIANNESS
ALSA_LIBS
ALSA_CFLAGS
-JACK_LIBS
-JACK_CFLAGS
QT_LIBS
QT_CXXFLAGS
LRELEASE
@@ -738,8 +736,6 @@ CXXCPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-JACK_CFLAGS
-JACK_LIBS
ALSA_CFLAGS
ALSA_LIBS
liblo_CFLAGS
@@ -1292,7 +1288,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Rosegarden 14.12 to adapt to many kinds of systems.
+\`configure' configures Rosegarden 15.10.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1353,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Rosegarden 14.12:";;
+ short | recursive ) echo "Configuration of Rosegarden 15.10.1:";;
esac
cat <<\_ACEOF
@@ -1391,8 +1387,6 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
- JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
- JACK_LIBS linker flags for JACK, overriding pkg-config
ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
ALSA_LIBS linker flags for ALSA, overriding pkg-config
liblo_CFLAGS
@@ -1478,7 +1472,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Rosegarden configure 14.12
+Rosegarden configure 15.10.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1818,7 +1812,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Rosegarden $as_me 14.12, which was
+It was created by Rosegarden $as_me 15.10.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2167,9 +2161,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CODENAME="Magic Carpet"
-#CODENAME="Nostalgia"
-#CODENAME="Oranges and Lemons"
+CODENAME="Oranges and Lemons"
#CODENAME="Peace"
#CODENAME="Querida"
#CODENAME="Rhapsody in Blue"
@@ -5014,82 +5006,51 @@ else
fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
-$as_echo_n "checking for JACK... " >&6; }
-
-if test -n "$JACK_CFLAGS"; then
- pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.100\""; } >&5
- ($PKG_CONFIG --exists --print-errors "jack >= 0.100") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.100" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+JACK_FOUND="0"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jack_client_open in -ljack" >&5
+$as_echo_n "checking for jack_client_open in -ljack... " >&6; }
+if ${ac_cv_lib_jack_jack_client_open+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$JACK_LIBS"; then
- pkg_cv_JACK_LIBS="$JACK_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.100\""; } >&5
- ($PKG_CONFIG --exists --print-errors "jack >= 0.100") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.100" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljack $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jack_client_open ();
+int
+main ()
+{
+return jack_client_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_jack_jack_client_open=yes
else
- pkg_failed=yes
+ ac_cv_lib_jack_jack_client_open=no
fi
- else
- pkg_failed=untried
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jack_jack_client_open" >&5
+$as_echo "$ac_cv_lib_jack_jack_client_open" >&6; }
+if test "x$ac_cv_lib_jack_jack_client_open" = xyes; then :
+ LIBS="$LIBS -ljack" HAVES="$HAVES -DHAVE_LIBJACK" JACK_FOUND="1"
else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.100" 2>&1`
- else
- JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.100" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$JACK_PKG_ERRORS" >&5
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No JACK library found: audio will be unavailable!" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No JACK library found: audio will be unavailable!" >&5
$as_echo "$as_me: WARNING: No JACK library found: audio will be unavailable!" >&2;}
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No JACK library found: audio will be unavailable!" >&5
-$as_echo "$as_me: WARNING: No JACK library found: audio will be unavailable!" >&2;}
-else
- JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
- JACK_LIBS=$pkg_cv_JACK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- HAVES="$HAVES -DHAVE_LIBJACK"
fi
+
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
@@ -6261,7 +6222,7 @@ fi
CXXFLAGS="$CXXFLAGS_BUILD $RG_DEFINES_BUILD"
-if test -z "$JACK_CFLAGS" ; then
+if test "$JACK_FOUND" = "0" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Required JACK library not found, building with no audio!" >&5
$as_echo "$as_me: WARNING: Required JACK library not found, building with no audio!" >&2;}
fi
@@ -6832,7 +6793,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Rosegarden $as_me 14.12, which was
+This file was extended by Rosegarden $as_me 15.10.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6885,7 +6846,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Rosegarden config.status 14.12
+Rosegarden config.status 15.10.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 15a6eb2..7d79712 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,9 @@
-AC_INIT(Rosegarden, 14.12, rosegarden-devel at lists.sourceforge.net)
+AC_INIT(Rosegarden, 15.10.1, rosegarden-devel at lists.sourceforge.net)
dnl Each release will need the proper version (e.g. 09.10) in the line above
dnl and the proper codename (e.g. Abraham Darby) in the following line
-CODENAME="Magic Carpet"
-#CODENAME="Nostalgia"
-#CODENAME="Oranges and Lemons"
+CODENAME="Oranges and Lemons"
#CODENAME="Peace"
#CODENAME="Querida"
#CODENAME="Rhapsody in Blue"
@@ -51,8 +49,11 @@ AC_CHECK_LIB([X11],[XSetErrorHandler],[LIBS="$LIBS -lX11"],[AC_MSG_ERROR(Failed
AC_CHECK_LIB([z],[gzopen],[LIBS="$LIBS -lz"],[AC_MSG_ERROR(Failed to find required libz library)])
AC_CHECK_LIB([dl],[dlopen],[LIBS="$LIBS -ldl"],[AC_MSG_ERROR(Failed to find required dl library)])
-PKG_CHECK_MODULES([JACK],[jack >= 0.100],[HAVES="$HAVES -DHAVE_LIBJACK"],[
-AC_MSG_WARN(No JACK library found: audio will be unavailable!)])
+JACK_FOUND="0"
+AC_CHECK_LIB(
+ [jack],[jack_client_open],
+ [LIBS="$LIBS -ljack" HAVES="$HAVES -DHAVE_LIBJACK" JACK_FOUND="1"],
+ [AC_MSG_WARN(No JACK library found: audio will be unavailable!)])
AC_CHECK_HEADER([ladspa.h],[],[AC_MSG_ERROR(Failed to find required LADSPA header ladspa.h)])
@@ -144,7 +145,7 @@ fi
CXXFLAGS="$CXXFLAGS_BUILD $RG_DEFINES_BUILD"
-if test -z "$JACK_CFLAGS" ; then
+if test "$JACK_FOUND" = "0" ; then
AC_MSG_WARN([Required JACK library not found, building with no audio!])
fi
if test -z "$ALSA_CFLAGS" ; then
diff --git a/data/data.qrc b/data/data.qrc
index b0cacac..395f8b7 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -505,6 +505,7 @@ DO NOT EDIT THIS FILE BY HAND! All changes will be LOST!
<file>./library/GS.rgd</file>
<file>./library/Hammond-XM1.rgd</file>
<file>./library/Juno-G.rgd</file>
+<file>./library/Kawai-CA95-CS10-MT1.rgd</file>
<file>./library/Kawai-CA9-MT1.rgd</file>
<file>./library/Kawai-CA9-MT2.rgd</file>
<file>./library/Kawai-ES-3.rgd</file>
@@ -643,6 +644,7 @@ DO NOT EDIT THIS FILE BY HAND! All changes will be LOST!
<file>./library/Yamaha-Motif-ES.rgd</file>
<file>./library/Yamaha-Motif-Rack.rgd</file>
<file>./library/Yamaha-Motif-XS.rgd</file>
+<file>./library/Yamaha-MOXF.rgd</file>
<file>./library/Yamaha-MU15.rgd</file>
<file>./library/Yamaha-MU50.rgd</file>
<file>./library/Yamaha-MU90R.rgd</file>
@@ -671,7 +673,8 @@ DO NOT EDIT THIS FILE BY HAND! All changes will be LOST!
<file>./library/Yamaha-VL70-m.rgd</file>
<file>./library/Zoom-RT-234.rgd</file>
<file>./library/Zoom-RT-323.rgd</file>
-<file>./templates/SATB.rgt</file>
+<file>./templates/SATB_2_Staves.rgt</file>
+<file>./templates/SATB_4_Staves.rgt</file>
<file>./templates/Trumpet_Solo_with_Piano.rgt</file>
<file>./appdata/rosegarden.appdata.xml</file>
<file>./chords/chords.xml</file>
diff --git a/data/desktop/rosegarden.desktop b/data/desktop/rosegarden.desktop
index aab5c55..ce45773 100644
--- a/data/desktop/rosegarden.desktop
+++ b/data/desktop/rosegarden.desktop
@@ -13,5 +13,8 @@ Comment[fr]=Séquenceur MIDI/audio et éditeur de partitions
Comment[ru]=MIDI-ÑеквенÑер и нотный редактор
Terminal=false
Name=Rosegarden
-GenericName=Digital audio workstation
-GenericName[de]=Digital Audio Workstation
+GenericName=Sequencer and Notation Editor
+GenericName[de]=Sequencer und Notensatzprogramm
+GenericName[es]=Secuenciador y editor de partitura
+GenericName[fr]=Séquenceur et éditeur de partitions
+GenericName[ru]=ÑеквенÑер и нотный редактор
diff --git a/data/library/Kawai-CA95-CS10-MT1.rgd b/data/library/Kawai-CA95-CS10-MT1.rgd
new file mode 100644
index 0000000..ff3c50f
Binary files /dev/null and b/data/library/Kawai-CA95-CS10-MT1.rgd differ
diff --git a/data/library/Yamaha-MOXF.rgd b/data/library/Yamaha-MOXF.rgd
new file mode 100644
index 0000000..0cc63d0
Binary files /dev/null and b/data/library/Yamaha-MOXF.rgd differ
diff --git a/data/locale/ca.ts b/data/locale/ca.ts
index 19e3680..db90e40 100644
--- a/data/locale/ca.ts
+++ b/data/locale/ca.ts
@@ -2,13 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
- <name></name>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
<name>:</name>
<message>
<source></source>
@@ -338,23 +331,23 @@
<translation type="unfinished">No s'ha pogut obrir el fitxer de tipus de lletra %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation type="unfinished">&Afegeix un fitxer d'Ã udio...</translation>
</message>
@@ -364,54 +357,54 @@
<translation type="unfinished">&Exporta un fitxer d'Ã udio...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation type="unfinished">Descarrega &un fitxer d'Ã udio</translation>
</message>
@@ -436,356 +429,356 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4708"/>
+ <location line="-2600"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-1680"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation type="unfinished">Guia per enviar &bugs descoberts</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4722"/>
+ <location line="-2617"/>
<source>&Action</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-512"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation type="unfinished">Barra d'eines general</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation type="unfinished">Agafa l'eina de seleccionar</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation type="unfinished">Agafa l'eina per a afegir notes</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation type="unfinished">Agafa l'eina d'esborrar</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation type="unfinished">&Afegeix un esdeveniment</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation type="unfinished">&Suprimeix l'esdeveniment</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation type="unfinished">&Edita l'esdeveniment</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation type="unfinished">Editor &avançat d'esdeveniments</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation type="unfinished">Re&talla</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation type="unfinished">&Filtra la selecció</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation type="unfinished"></translation>
</message>
@@ -795,75 +788,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation type="unfinished">Temps &musical</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation type="unfinished">Temps &reals</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation type="unfinished">Temps t&otal</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation type="unfinished">Fra&gment</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation type="unfinished">Edita &amb</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation type="unfinished">Obre a l'editor de matri&us</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation type="unfinished">Obre a l'editor de &partitures</translation>
</message>
<message>
- <location line="-3934"/>
+ <location line="-2016"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -874,13 +867,13 @@
</message>
<message>
<location line="+1054"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2104"/>
+ <location line="-1224"/>
<source>Mark Selection as Auto-Generated</source>
<translation type="unfinished"></translation>
</message>
@@ -925,7 +918,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation type="unfinished"></translation>
</message>
@@ -945,12 +938,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -960,7 +953,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+73"/>
+ <location line="-2670"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -1035,47 +1028,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -1145,7 +1138,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1155,39 +1148,39 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation type="unfinished">Barra d'accions</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation type="unfinished">Barra del temps</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
- <source>Transport Toolbar</source>
- <translation type="unfinished">Barra de transport</translation>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
+ <source>Transport Toolbar</source>
+ <translation type="unfinished">Barra de transport</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation type="unfinished">Barra de zoom</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1237,7 +1230,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation type="unfinished">Afegeix un silenci</translation>
</message>
@@ -1257,117 +1250,117 @@
<translation type="unfinished">Edita el marcador</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation type="unfinished">Agafa l'eina de moure</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation type="unfinished">Agafa l'eina de dibuixar</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation type="unfinished">Agafa l'eina de redimensionar</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation type="unfinished">&Graella</translation>
</message>
@@ -1383,13 +1376,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation type="unfinished"></translation>
</message>
@@ -1400,13 +1393,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation type="unfinished"></translation>
</message>
@@ -1417,13 +1410,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation type="unfinished"></translation>
</message>
@@ -1434,13 +1427,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation type="unfinished"></translation>
</message>
@@ -1451,13 +1444,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation type="unfinished"></translation>
</message>
@@ -1468,177 +1461,173 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation type="unfinished">&Quadra amb pulsació</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">%1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation type="unfinished">Desplaça al &compà s</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A5</translation>
</message>
<message>
- <location line="-2205"/>
- <location line="+1302"/>
+ <location line="-3401"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1282"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2477"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation type="unfinished">&Composició</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation type="unfinished">Afegeix un ca&nvi de tempo...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation type="unfinished">&Canvia d'indicació de compà s...</translation>
</message>
<message>
- <source>&Segment</source>
- <translation type="obsolete">&Fragment</translation>
- </message>
- <message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation type="unfinished">Obre a l'editor de la llista d'&esdeveniments</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -1651,701 +1640,701 @@
</message>
<message>
<location line="+6"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1712"/>
- <location line="+1724"/>
+ <location line="-2908"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A4</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">Id</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2588"/>
+ <location line="+43"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2377,7 +2366,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+17"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -2494,14 +2488,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2519,8 +2513,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2538,27 +2532,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation type="unfinished">A&justa</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation type="unfinished">&Quantifica</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation type="unfinished">Quanti&fica...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation type="unfinished"></translation>
</message>
@@ -2569,36 +2563,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation type="unfinished">Redueix les notes d&e la mateixa altura</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation type="unfinished">Mou a l'&esquerra</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation type="unfinished">&Incrementa la velocitat</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation type="unfinished">&Redueix la velocitat</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -2614,363 +2608,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation type="unfinished">Durada</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation type="unfinished">Doble bemoll</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation type="unfinished">Estira o encon&geix...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation type="unfinished">Trans&posa</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation type="unfinished">Ap&uja un semitò</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation type="unfinished">A&baixa un semitò</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation type="unfinished">Apuja una &octava</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation type="unfinished">Abaixa una octa&va</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation type="unfinished">S'està transposant un semitò cap amunt...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation type="unfinished">&Transposa...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation type="unfinished">&Afegeix una nota</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation type="unfinished">En®istra</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation type="unfinished">Activa el &fragment activable...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation type="unfinished">S&elecciona fins el final</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation type="unfinished">&Dibuixa</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation type="unfinished">&Esborra</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation type="unfinished">&Mou</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation type="unfinished">Redimensi&ona</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation type="unfinished">&Velocitat</translation>
</message>
<message>
- <source>Local &Cursor</source>
- <translation type="obsolete">&Cursor local</translation>
- </message>
- <message>
- <source>Cursor &Back</source>
- <translation type="obsolete">Cursor &enrera</translation>
- </message>
- <message>
- <source>Cursor &Forward</source>
- <translation type="obsolete">Cursor en&davant</translation>
- </message>
- <message>
- <source>Cursor For&ward Bar</source>
- <translation type="obsolete">Cursor al &compàs següent</translation>
- </message>
- <message>
- <source>Cursor to St&art</source>
- <translation type="obsolete">Cursor &al començament</translation>
- </message>
- <message>
- <source>Cursor to &End</source>
- <translation type="obsolete">Cursor al &final</translation>
- </message>
- <message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation type="unfinished">Avança el cursor i &selecciona</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation type="unfinished">Neteja la &repetició</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation type="unfinished">T&ransport</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation type="unfinished">&Reprodueix</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation type="unfinished">&Atura</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation type="unfinished">Re&bobina</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation type="unfinished">Avanç &rà pid</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation type="unfinished">Re&bobina fins al començament</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation type="unfinished">Avanç rà &pid al final</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation type="unfinished">&Segueix el punt de reproducció</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation type="unfinished">Octava s&uperior</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation type="unfinished">Mode d'afegit d'&acords</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation type="unfinished">Enregistrament &pas a pas</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation type="unfinished">B&arra d'eines</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation type="unfinished">&Regles</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation type="unfinished">M&ostra el regle de noms d'acord</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation type="unfinished">Mostra el regle del &tempo</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation type="unfinished">Barra d'eines</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation type="unfinished">En®istra</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation type="unfinished"></translation>
</message>
@@ -3055,7 +3001,7 @@
<translation type="unfinished">Mostra els reguladors de corredora n&o assignats</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation type="unfinished"></translation>
</message>
@@ -3065,13 +3011,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation type="unfinished"></translation>
</message>
@@ -3136,10 +3082,6 @@
<translation type="unfinished">Espa&iat</translation>
</message>
<message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Factor de du&ració</translation>
- </message>
- <message>
<location line="+1"/>
<source>&Layout Mode</source>
<translation type="unfinished">&Format</translation>
@@ -3165,36 +3107,32 @@
<translation type="unfinished">Obre l'editor de la &lÃrica</translation>
</message>
<message>
- <source>Add Event Ruler</source>
- <translation type="obsolete">Afegeix un regle d'esdeveniments</translation>
- </message>
- <message>
<location line="+23"/>
<source>Show &Track Headers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation type="unfinished">Obre en l'editor matriu de percussió</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation type="unfinished">Afegeix el ca&nvi de clau...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation type="unfinished">Afegeix el canvi de &to...</translation>
</message>
<message>
- <location line="-1125"/>
- <location line="+1724"/>
+ <location line="-2321"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation type="unfinished"></translation>
</message>
@@ -3209,13 +3147,13 @@
<translation type="unfinished">Afegeix el pedal lliu&re</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2110"/>
+ <location line="+1"/>
<source>Add &Layer</source>
<translation type="unfinished"></translation>
</message>
@@ -3231,7 +3169,7 @@
<translation type="unfinished">N&otes</translation>
</message>
<message>
- <location line="-1344"/>
+ <location line="-2540"/>
<source>Show A&ctions Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -3242,31 +3180,31 @@
</message>
<message>
<location line="+25"/>
- <location line="+1550"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1379"/>
- <location line="+1723"/>
+ <location line="-2575"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-810"/>
+ <location line="-1645"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -3291,7 +3229,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+116"/>
+ <location line="+950"/>
<source>&Move to Staff Above...</source>
<translation type="unfinished"></translation>
</message>
@@ -3316,14 +3254,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2441"/>
+ <location line="+21"/>
<source>Mar&ks</source>
<translation type="unfinished">Mar&ques</translation>
</message>
@@ -3605,8 +3543,8 @@
<translation type="unfinished">&Restaura la direcció calculada de les vÃrgules</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation type="unfinished">&Esborra</translation>
</message>
@@ -3682,14 +3620,14 @@
<translation type="unfinished">Lligat a&vall</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation type="unfinished">&Deslliga les notes</translation>
</message>
@@ -3779,14 +3717,14 @@
<translation type="unfinished">&Normalitza els silencis</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation type="unfinished">&Redueix els silencis</translation>
</message>
@@ -3796,8 +3734,8 @@
<translation type="unfinished">&Notes</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4075,13 +4013,13 @@
<translation type="unfinished">Te&mps precÃs</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation type="unfinished">Mou a la d&reta</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation type="unfinished">&Visibilitat</translation>
</message>
@@ -4128,26 +4066,26 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation type="unfinished"></translation>
</message>
@@ -4292,26 +4230,14 @@
<translation type="unfinished">editor d'acords de guitarra</translation>
</message>
<message>
- <source>Cursor &Up Staff</source>
- <translation type="obsolete">Apuja el c&ursor un pentagrama</translation>
- </message>
- <message>
- <source>Cursor &Down Staff</source>
- <translation type="obsolete">Abaixa el cursor un &pentagrama</translation>
- </message>
- <message>
- <source>Cursor Ne&xt Segment</source>
- <translation type="obsolete">Crea un fragment</translation>
- </message>
- <message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation type="unfinished">&Afegeix una nota</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation type="unfinished">Octava &inferior</translation>
</message>
@@ -4331,13 +4257,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation type="unfinished">M&ostra la barra d'eines de les eines</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation type="unfinished">Mostra la barra d'eines d'&accidents</translation>
</message>
@@ -4357,18 +4283,18 @@
<translation type="unfinished">Mostra la barra d'eines del &grup</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation type="unfinished">Mostra la barra d'eines de les &tecles de reproducció</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation type="unfinished">Mostra la barra d'eines del &format</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4381,13 +4307,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4398,7 +4324,7 @@
<translation type="unfinished">M&ostra el regle dels acords</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation type="unfinished">Mostra el ®le de la nota crua</translation>
</message>
@@ -4413,7 +4339,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation type="unfinished">Barra de claus</translation>
</message>
@@ -4433,7 +4359,7 @@
<translation type="unfinished">Barra de mà rques</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation type="unfinished"></translation>
</message>
@@ -4453,12 +4379,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rewind</source>
- <translation type="obsolete">Rebobina</translation>
- </message>
- <message>
<location line="+293"/>
- <location line="+1754"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation type="unfinished"></translation>
</message>
@@ -4468,13 +4390,13 @@
<translation type="unfinished">Reprodueix</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2671"/>
+ <location line="-1844"/>
<source>Insert into Selected Audio Track</source>
<translation type="unfinished"></translation>
</message>
@@ -4484,7 +4406,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2640"/>
+ <location line="+1813"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
@@ -4550,21 +4472,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1154"/>
+ <location line="+36"/>
<source>Double Whole Note (5)</source>
<translation type="unfinished"></translation>
</message>
@@ -4714,86 +4636,54 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2132"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3328"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>0</source>
- <translation type="obsolete">0</translation>
- </message>
- <message>
- <source>3</source>
- <translation type="obsolete">A3</translation>
- </message>
- <message>
- <source>6</source>
- <translation type="obsolete">A6</translation>
- </message>
- <message>
- <source>4</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
- <source>2</source>
- <translation type="obsolete">A2</translation>
- </message>
- <message>
- <source>1</source>
- <translation type="obsolete">%1</translation>
- </message>
- <message>
- <source>5</source>
- <translation type="obsolete">A5</translation>
- </message>
- <message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1509"/>
+ <location line="+1510"/>
<source>Tuplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
@@ -4814,7 +4704,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation type="unfinished">Agafa l'eina per a afegir</translation>
</message>
@@ -4869,7 +4759,7 @@
<translation type="unfinished">Fes visible</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation type="unfinished">Posa les barres d'agrupació automà ticament on sigui apropiat</translation>
</message>
@@ -4909,7 +4799,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation type="unfinished"></translation>
</message>
@@ -4919,14 +4809,6 @@
<translation type="unfinished">&Importa</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Importa el fitxer de &projecte Rosegarden...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Importa el fitxer &MIDI...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation type="unfinished">Importa el fitxer &Hydrogen...</translation>
@@ -4942,10 +4824,6 @@
<translation type="unfinished">&Fusiona el fitxer...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Fusiona el fitxer &MIDI...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation type="unfinished">Fusiona el fitxer &Hydrogen...</translation>
@@ -4956,26 +4834,6 @@
<translation type="unfinished">&Exporta</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Exporta el fitxer de &projecte Rosegarden...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Exporta el fitxer &MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Exporta el fitxer &Csound score...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Exporta el fitxer M&up...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Exporta el fitxer Music&XML...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation type="unfinished"></translation>
@@ -5102,13 +4960,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation type="unfinished">E&studi</translation>
</message>
@@ -5163,58 +5021,54 @@
<translation type="unfinished">&Desa el document actual com a estudi per defecte</translation>
</message>
<message>
- <source>Se&gments</source>
- <translation type="obsolete">Fra&gments</translation>
- </message>
- <message>
<location line="+2"/>
<source>Toggle Repeat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation type="unfinished">&Divideix</translation>
</message>
@@ -5329,26 +5183,26 @@
<translation type="unfinished">&Assignació dels instruments....</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation type="unfinished">&Redimensiona</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation type="unfinished">Activa gra&vació</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation type="unfinished">Mostra la barra de &pistes</translation>
</message>
@@ -5363,15 +5217,15 @@
<translation type="unfinished">M&ostra la barra de zoom</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation type="unfinished">Mostra el regle del &puntejat</translation>
</message>
@@ -5432,26 +5286,26 @@
<translation type="unfinished">Barra d'editors</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+221"/>
+ <location line="-1791"/>
<source>Insert Tempo Change</source>
<translation type="unfinished">Afegeix el canvi de tempo</translation>
</message>
@@ -5491,7 +5345,7 @@
<translation type="unfinished">Obre en l'editor del tempo i de l'indicador del compà s</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation type="unfinished">&Edita</translation>
</message>
@@ -5511,24 +5365,11 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation type="unfinished">Enganxa com un nou fragment activable</translation>
</message>
<message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">El tipus d'enganxat restringit requereix que hi hagi un espai
- buit suficient (espai en silenci) per
-fer-hi quebre tots els esdeveniments que es volen posar.
-Però no hi ha prou espai.
-Si, de totes maneres, voleu enganxar-ho, teniu
-tipus d'enganxat en l'opció "Enganxa"
-del menú Edita. Per altra banda també podeu canviar
- el tipus d'enganxatper defecte per un altre de diferent.</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NoteFont.cpp" line="+58"/>
<source>No sizes listed for font "%1"</source>
<translation type="unfinished"></translation>
@@ -5549,7 +5390,7 @@ del menú Edita. Per altra banda també podeu canviar
<translation type="unfinished">Baix</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2626"/>
+ <location filename="../QMenuStrings.cpp" line="+345"/>
<location filename="../InstrumentStrings.cpp" line="-74"/>
<source>Triangle</source>
<translation type="unfinished">Triangle</translation>
@@ -7329,26 +7170,6 @@ del menú Edita. Per altra banda també podeu canviar
<translation type="unfinished"></translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">Do#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">Id</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">Fa#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">Sol#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../AutoloadStrings.cpp" line="-24"/>
<source>General MIDI Device</source>
<translation type="unfinished"></translation>
@@ -8534,16 +8355,16 @@ del menú Edita. Per altra banda també podeu canviar
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation type="unfinished">Àudio</translation>
@@ -10684,20 +10505,15 @@ del menú Edita. Per altra banda també podeu canviar
<translation type="unfinished">Desconegut/da</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation type="unfinished">[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation type="unfinished">%1</translation>
</message>
@@ -10712,10 +10528,10 @@ del menú Edita. Per altra banda també podeu canviar
<translation type="unfinished">%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation type="unfinished">%1 controlador %2 %3</translation>
</message>
@@ -10730,7 +10546,7 @@ del menú Edita. Per altra banda també podeu canviar
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
@@ -10838,45 +10654,53 @@ del menú Edita. Per altra banda també podeu canviar
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation type="unfinished"></translation>
</message>
@@ -10976,7 +10800,7 @@ del menú Edita. Per altra banda també podeu canviar
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
@@ -11073,6 +10897,58 @@ del menú Edita. Per altra banda també podeu canviar
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Lilypond no permet espais o barres invertides en els noms de fitxers.
+
+Voleu fer servir
+
+ %1
+
+en comptes seu ?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">No s'ha pogut exportar. El fitxer no s'ha pogut obrir per escriure'l.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">atenció: compà s massa llarg, truncat aquÃ</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">atenció: compàs massa curt, completat amb silencis</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11088,7 +10964,7 @@ del menú Edita. Per altra banda també podeu canviar
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -11150,12 +11026,12 @@ del menú Edita. Per altra banda també podeu canviar
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation type="unfinished">Afegeix el &lligat</translation>
</message>
@@ -11650,14 +11526,6 @@ del menú Edita. Per altra banda també podeu canviar
<translation type="unfinished">S'està exportant el fitxer d'à udio...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">S'està exportant el fitxer d'à udio...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">S'està exportant el fitxer d'à udio...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation type="unfinished">S'està exportant el fitxer d'à udio...</translation>
@@ -11671,24 +11539,24 @@ del menú Edita. Per altra banda també podeu canviar
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation type="unfinished"><sense sintetitzador></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation type="unfinished"><sense connector></translation>
</message>
@@ -11741,10 +11609,6 @@ del menú Edita. Per altra banda també podeu canviar
<translation type="unfinished"></translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><cap fitxer d'Ã udio></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation type="unfinished"></translation>
@@ -11870,10 +11734,6 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<translation type="unfinished">Introduïu una nova etiqueta</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">S'està exportant el fitxer d'à udio...</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation type="unfinished"></translation>
@@ -11908,7 +11768,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation type="unfinished">Mesclador d'Ã udio</translation>
</message>
@@ -11924,53 +11784,45 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation type="unfinished">Balanç</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation type="unfinished">Nivell d'Ã udio</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation type="unfinished">Mono o estéreo</translation>
</message>
<message>
- <source>Mute</source>
- <translation type="obsolete">Silencia</translation>
- </message>
- <message>
- <source>Solo</source>
- <translation type="obsolete">Solo</translation>
- </message>
- <message>
<location line="+8"/>
<source>Arm recording</source>
<translation type="unfinished">Arma l'enregistrament</translation>
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation type="unfinished"><cap></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
@@ -11990,7 +11842,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation type="unfinished">Sub %1</translation>
</message>
@@ -12006,14 +11858,14 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<translation type="unfinished">Master</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation type="unfinished"><sense connector></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -12455,10 +12307,6 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<translation type="unfinished">Gestiona els bancs i els programes MIDI</translation>
</message>
<message>
- <source>Reset</source>
- <translation type="obsolete">Reinicia</translation>
- </message>
- <message>
<location line="+23"/>
<source>Device and Banks</source>
<translation type="unfinished"></translation>
@@ -12596,7 +12444,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<translation type="unfinished">Confirmeu l'eliminació d'aquest banc?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation type="unfinished">Voleu suprimir aquest banc?</translation>
</message>
@@ -12671,10 +12519,6 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<source>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>Unsaved Changes</source>
- <translation type="obsolete">Canvis sense desar</translation>
- </message>
</context>
<context>
<name>Rosegarden::BeamCommand</name>
@@ -12784,6 +12628,120 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -13107,7 +13065,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -13115,10 +13073,6 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<context>
<name>Rosegarden::ConfigureDialog</name>
<message>
- <source>Configure Rosegarden</source>
- <translation type="obsolete">Configuració del Rosegarden</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/ConfigureDialog.cpp" line="+48"/>
<source>Rosegarden - Preferences</source>
<translation type="unfinished"></translation>
@@ -13336,7 +13290,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -13352,7 +13306,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation type="unfinished">Tipus d'esdeveniment desconegut</translation>
</message>
@@ -13367,12 +13321,13 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<translation type="unfinished">Controlador d'esdeveniments</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation type="unfinished">Número de controlador d'esdeveniments</translation>
</message>
@@ -13380,7 +13335,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
@@ -13390,7 +13345,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<translation type="unfinished">(extracte)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation type="unfinished">(copiat)</translation>
</message>
@@ -13460,7 +13415,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation type="unfinished">Re&talla</translation>
</message>
@@ -13536,7 +13491,7 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation type="unfinished"></translation>
</message>
@@ -13544,14 +13499,6 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
<context>
<name>Rosegarden::DiatonicPitchChooser</name>
<message>
- <source>D</source>
- <translation type="obsolete">Id</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/DiatonicPitchChooser.cpp" line="+59"/>
<source>C</source>
<comment>note name</comment>
@@ -13827,137 +13774,6 @@ Seleccioneu els que voleu esborrar permanentment del disc dur.
</message>
</context>
<context>
- <name>Rosegarden::EditView</name>
- <message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 controlador %2 %3</translation>
- </message>
- <message>
- <source>Pitch Bend</source>
- <translation type="obsolete">Inflexió de to</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Tipus d'esdeveniment desconegut</translation>
- </message>
- <message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <source>VIII</source>
- <translation type="obsolete">VIII</translation>
- </message>
- <message>
- <source>%1 flat</source>
- <translation type="obsolete">%1 bemoll</translation>
- </message>
- <message>
- <source>%1 sharp</source>
- <translation type="obsolete">%1 diesi</translation>
- </message>
- <message>
- <source>&Insert Note</source>
- <translation type="obsolete">&Afegeix una nota</translation>
- </message>
- <message>
- <source>&Upper Octave</source>
- <translation type="obsolete">Octava s&uperior</translation>
- </message>
- <message>
- <source>&Lower Octave</source>
- <translation type="obsolete">Octava &inferior</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Es mostra la indicació de compàs estimada</translation>
- </message>
- <message>
- <source>Halving durations...</source>
- <translation type="obsolete">S'està definint la durada de les notes...</translation>
- </message>
- <message>
- <source>Doubling durations...</source>
- <translation type="obsolete">S'està definint la durada de les notes...</translation>
- </message>
- <message>
- <source>Rescaling...</source>
- <translation type="obsolete">S'està canviant la mida...</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Transposa</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Introdueix el número de semitons a transposar:</translation>
- </message>
- <message>
- <source>Transposing...</source>
- <translation type="obsolete">S'està transposant...</translation>
- </message>
- <message>
- <source>Transposing up one semitone...</source>
- <translation type="obsolete">S'està transposant un semitò cap amunt...</translation>
- </message>
- <message>
- <source>Transposing up one octave...</source>
- <translation type="obsolete">S'està transposant una octava cap amunt...</translation>
- </message>
- <message>
- <source>Transposing down one semitone...</source>
- <translation type="obsolete">S'està transposant un semitò cap avall...</translation>
- </message>
- <message>
- <source>Transposing down one octave...</source>
- <translation type="obsolete">S'està transposant una octava cap avall...</translation>
- </message>
- <message>
- <source>Inverting...</source>
- <translation type="obsolete">S'està iniciant...</translation>
- </message>
- <message>
- <source>Retrograding...</source>
- <translation type="obsolete">S'està enregistrant...</translation>
- </message>
- <message>
- <source>Retrograde inverting...</source>
- <translation type="obsolete">S'està enregistrant...</translation>
- </message>
- <message>
- <source>Jogging left...</source>
- <translation type="obsolete">Mou a l'esquerra...</translation>
- </message>
- <message>
- <source>Jogging right...</source>
- <translation type="obsolete">Mou a la dreta...</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::EditViewBase</name>
<message>
<location filename="../../src/gui/general/EditViewBase.cpp" line="+222"/>
@@ -14296,46 +14112,10 @@ Això pot causar problemes si, més endavant, se substitueix per un valor calcul
<translation type="unfinished">Patró</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Bemoll - defineix %1 al valor</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Alternant - defineix %1 al mà xim i mÃnim en els esdeveniments alternats</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo - defineix %1 creixent des del mÃnim fins al mà xim</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo - defineix %1 descendent des del mà xim fins al mÃnim</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Repic - defineix %1 alternant des del mà xim fins al mÃnim amb ambdós caient cap a zero</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation type="unfinished">Valor</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Primer valor</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Segon valor</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Valor baix</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Primer alt</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14595,18 +14375,6 @@ Això pot causar problemes si, més endavant, se substitueix per un valor calcul
<source>http://rosegardenmusic.com/wiki/doc:eventView-en</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>%1 - Triggered Segment: %2</source>
- <translation type="obsolete">%1 - Fragment activable: %2</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - Event List</source>
- <translation type="obsolete">%1 - Fragment de la pista #%2 - Llista d'esdeveniments</translation>
- </message>
- <message>
- <source>%1 - %2 Segments - Event List</source>
- <translation type="obsolete">%1 - %2 Fragments - Llista d'esdeveniments</translation>
- </message>
</context>
<context>
<name>Rosegarden::ExpandFigurationCommand</name>
@@ -15004,10 +14772,6 @@ Voleu intentar buscar i localitzar-lo o voleu ometre'l?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Normal</source>
- <translation type="obsolete">Normal</translation>
- </message>
- <message>
<location line="+6"/>
<source>Safe</source>
<translation type="unfinished"></translation>
@@ -15038,10 +14802,6 @@ Voleu intentar buscar i localitzar-lo o voleu ometre'l?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Matrix</source>
- <translation type="obsolete">Matriu</translation>
- </message>
- <message>
<location line="+4"/>
<source>Notation</source>
<translation type="unfinished">Partitura</translation>
@@ -15367,24 +15127,6 @@ Voleu intentar buscar i localitzar-lo o voleu ometre'l?</translation>
<context>
<name>Rosegarden::IdentifyTextCodecDialog</name>
<message>
- <source>Choose Text Encoding</source>
- <translation type="obsolete">Selecciona la codificació del text</translation>
- </message>
- <message>
- <source>
-This file contains text in an unknown language encoding.
-
-Please select one of the following estimated text encodings
-for use with the text in this file:
-</source>
- <translation type="obsolete">
-Aquest fitxer conté text en un codificació desconeguda.
-
-Seleccioneu un de les següents codificacions possibles
-per utilitzar-la amb aquest fitxer:
-</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/IdentifyTextCodecDialog.cpp" line="+69"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
@@ -15686,7 +15428,7 @@ Exemple del text del fitxer:</translation>
<translation type="unfinished">Parà metres de l'instrument</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation type="unfinished">Pista</translation>
</message>
@@ -15694,7 +15436,7 @@ Exemple del text del fitxer:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -16077,52 +15819,8 @@ Exemple del text del fitxer:</translation>
</message>
</context>
<context>
- <name>Rosegarden::LatencyConfigurationPage</name>
- <message>
- <source>Latency</source>
- <translation type="obsolete">Latència</translation>
- </message>
- <message>
- <source>Sequencer Latency</source>
- <translation type="obsolete">Latència del seqüenciador</translation>
- </message>
- <message>
- <source>JACK latency</source>
- <translation type="obsolete">Latència del JACK</translation>
- </message>
- <message>
- <source>Use the "Fetch JACK latencies" button to discover the latency values set at
-the sequencer. It's recommended that you use the returned values but it's also
-possible to override them manually using the sliders. Note that if you change
-your JACK server parameters you should always fetch the latency values again.
-The latency values will be stored by Rosegarden for use next time.</source>
- <translation type="obsolete">Fes servir el botó "Comprova les latències del JACK" per veure quines
-latències fa servir el seqüenciador. Es recomana que utilitzeu aquests
-valors, tot i que podeu modificar-los. Si canvieu els valors, haureu de tornar
-a comprovar les latències del JACK de nou. Els valors de latències les desa
-el Rosegarden per utilitzar-les la propera vegada.</translation>
- </message>
- <message>
- <source>JACK playback latency (in ms)</source>
- <translation type="obsolete">Latència de reproducció del JACK (en ms)</translation>
- </message>
- <message>
- <source>JACK record latency (in ms)</source>
- <translation type="obsolete">Latència de gravació del JACK (en ms)</translation>
- </message>
- <message>
- <source>Fetch JACK latencies</source>
- <translation type="obsolete">Comprova les latències del JACK</translation>
- </message>
- <message>
- <source>JACK Latency</source>
- <translation type="obsolete">Latència del JACK</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -16130,7 +15828,7 @@ Would you like to use
%1
instead?</source>
- <translation type="unfinished">Lilypond no permet espais o barres invertides en els noms de fitxers.
+ <translation type="obsolete">Lilypond no permet espais o barres invertides en els noms de fitxers.
Voleu fer servir
@@ -16139,39 +15837,16 @@ Voleu fer servir
en comptes seu ?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">No s'ha pogut exportar. El fitxer no s'ha pogut obrir per escriure'l.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">No s'ha pogut exportar. El fitxer no s'ha pogut obrir per escriure'l.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation type="unfinished">atenció: compà s massa llarg, truncat aquÃ</translation>
+ <translation type="obsolete">atenció: compà s massa llarg, truncat aquÃ</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation type="unfinished">atenció: compàs massa curt, completat amb silencis</translation>
+ <translation type="obsolete">atenció: compàs massa curt, completat amb silencis</translation>
</message>
</context>
<context>
@@ -16880,7 +16555,7 @@ això pot provocar un retard degut al volum de dades a transferir als dispositiu
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -16920,10 +16595,6 @@ això pot provocar un retard degut al volum de dades a transferir als dispositiu
<translation type="unfinished">Programa</translation>
</message>
<message>
- <source>Channel out</source>
- <translation type="obsolete">Canal</translation>
- </message>
- <message>
<location line="-46"/>
<source>Percussion</source>
<translation type="unfinished">Percussió</translation>
@@ -16969,12 +16640,7 @@ això pot provocar un retard degut al volum de dades a transferir als dispositiu
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation type="unfinished">[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation type="unfinished">Sense connexió</translation>
</message>
@@ -17112,10 +16778,6 @@ això pot provocar un retard degut al volum de dades a transferir als dispositiu
<translation type="unfinished"></translation>
</message>
<message>
- <source>Bars, beats, and divisions</source>
- <translation type="obsolete">Compassos, pulsacions i divisions</translation>
- </message>
- <message>
<location line="+4"/>
<source>Bar velocity</source>
<translation type="unfinished">Velocitat del compà s</translation>
@@ -17196,16 +16858,21 @@ això pot provocar un retard degut al volum de dades a transferir als dispositiu
<translation type="unfinished">S'està enregistrant</translation>
</message>
<message>
- <source>Synth plugin </source>
- <translation type="obsolete">Connectors de sintetitzadors</translation>
- </message>
- <message>
<location line="+124"/>
<source>%1 (%2)</source>
<translation type="unfinished">%1 (%2)</translation>
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17409,12 +17076,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation type="unfinished">Mou l'esdeveniment</translation>
</message>
@@ -17573,7 +17240,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Velocitat:</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation type="unfinished">Fes clic per seleccionar un tipus de lletra</translation>
</message>
@@ -17586,80 +17253,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <source>Instrument Parameters</source>
- <translation type="obsolete">Parà metres de l'instrument</translation>
- </message>
- <message>
- <source>Couldn't apply piano roll layout</source>
- <translation type="obsolete">No s'ha pogut aplicar el format de rotlle de pianola</translation>
- </message>
- <message>
- <source> No selection </source>
- <translation type="obsolete"> No hi ha cap selecció </translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">S'està quantificant...</translation>
- </message>
- <message>
- <source>Collapsing notes...</source>
- <translation type="obsolete">S'està eliminant notes...</translation>
- </message>
- <message>
- <source>Making legato...</source>
- <translation type="obsolete">S'està fent el legato...</translation>
- </message>
- <message>
- <source>Note: %1 (%2.%3s)</source>
- <translation type="obsolete">Temps: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>%1 (%2)</source>
- <translation type="obsolete">%1 (%2)</translation>
- </message>
- <message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Temps: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">S'està tallant la selecció al porta-retalls...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">S'està copiant la selecció al porta-retalls...</translation>
- </message>
- <message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">El porta-retalls està buit</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">S'està afegint el contingut del porta-retalls...</translation>
- </message>
- <message>
- <source>Couldn't paste at this point</source>
- <translation type="obsolete">No s'ha pogut enganxar en aquest punt</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">S'està eliminant la selecció...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished">Acció d'afegir una nota, desconeguda: %1</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">S'està afegint una nota</translation>
- </message>
- <message>
- <source>Unquantizing...</source>
- <translation type="obsolete">S'està desquantificant...</translation>
- </message>
- <message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation type="unfinished"><sense nom></translation>
</message>
@@ -17682,21 +17281,9 @@ Double-click to open the marker editor.</source>
</translation>
</message>
<message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 controlador %2 %3</translation>
- </message>
- <message>
- <source>Pitch Bend</source>
- <translation type="obsolete">Inflexió de to</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Tipus d'esdeveniment desconegut</translation>
- </message>
- <message>
- <location line="+254"/>
- <source> Grid: </source>
- <translation type="unfinished"> Graella: </translation>
+ <location line="+254"/>
+ <source> Grid: </source>
+ <translation type="unfinished"> Graella: </translation>
</message>
<message>
<location line="+16"/>
@@ -17734,7 +17321,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation type="unfinished"></translation>
</message>
@@ -17750,8 +17337,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -17761,15 +17347,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Mostra la clau recomanada</translation>
</message>
<message>
- <source> Zoom: </source>
- <translation type="obsolete"> Zoom: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation type="unfinished">Es mostra la indicació de compàs estimada</translation>
</message>
@@ -17784,22 +17362,6 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Introdueix el número de semitons a transposar:</translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">S'està apujant les velocitats...</translation>
- </message>
- <message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">S'està abaixant les velocitats...</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Defineix les velocitats dels esdeveniments</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">S'està definint les velocitats...</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation type="unfinished">Fragment activable</translation>
@@ -17810,36 +17372,15 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Suprimeix els activadors</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation type="unfinished">Matriu</translation>
</message>
- <message>
- <source>Percussion</source>
- <translation type="obsolete">Percussió</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - %3</source>
- <translation type="obsolete">%1 - Fragment de pista #%2 - %3</translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">%1 - Tots els fragments - %2</translation>
- </message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="unfinished">No s'ha pogut afegir una nota: No hi ha seleccionada una durada de graella.</translation>
- </message>
- <message>
- <source> Chord </source>
- <translation type="obsolete"> Acord</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation type="unfinished"></translation>
</message>
@@ -17859,7 +17400,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -17966,13 +17507,6 @@ Double-click to open the marker editor.</source>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">Dreceres</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="+53"/>
@@ -17989,7 +17523,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation type="unfinished">Mesclador de MIDI</translation>
</message>
@@ -18004,7 +17538,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Instrument</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -18142,438 +17676,152 @@ Double-click to open the marker editor.</source>
</message>
</context>
<context>
- <name>Rosegarden::MultiKeyInsertionCommand</name>
- <message>
- <location filename="../../src/commands/notation/MultiKeyInsertionCommand.h" line="+58"/>
- <source>Change all to &Key %1...</source>
- <translation type="unfinished">Canvia-ho tot al &to %1...</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Add &Key Change...</source>
- <translation type="unfinished">Afegeix el canvi de &to...</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::MusicXMLOptionsDialog</name>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="+60"/>
- <source>MusicXML Export</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Layout</source>
- <translation type="unfinished">Format</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Headers</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Basic options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Export content</source>
- <translation type="unfinished">Exporta els dispositius</translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Choose which tracks or segments to export</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>All tracks</source>
- <translation type="unfinished">Afegeix và ries pistes</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Non-muted tracks</source>
- <translation type="unfinished">Posa la pista en silenci</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Selected track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Selected segments</source>
- <translation type="unfinished">Selecciona &tots els fragments</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Export track staff brackets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Track staff brackets are found in the <b>Track Parameters</b> box, and may be used to group staffs in various ways</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Advanced/Experimental options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Compatibility level</source>
- <translation type="unfinished">Nivell de compatibilitat amb el Lilypond</translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Set the MusicXML version you want export</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source><qt><p>Choose the format of the MusicXML file.</p><p>The "partwise" format contains "part" elements that contain "measure" elements. The "timewise" format reverses this ordering.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export grand staff instrument</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source><qt>Choose which bracket will create a grand staff system</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-29"/>
- <source>MusicXML type</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>None</source>
- <translation type="unfinished">Cap</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Don't export percussion tracks</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Use "<octave-shift>" for transposing instruments</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+45"/>
- <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NameSetEditor</name>
- <message>
- <source>Librarian</source>
- <translation type="obsolete">Bibliotecari</translation>
- </message>
- <message>
- <source>Name</source>
- <translation type="obsolete">Nom</translation>
- </message>
- <message>
- <source>Email</source>
- <translation type="obsolete">Correu electrònic</translation>
- </message>
- <message>
- <source>The librarian maintains the Rosegarden device data for this device.
-If you've made modifications to suit your own device, it might be worth
-liaising with the librarian in order to publish your information for the benefit
-of others.</source>
- <translation type="obsolete">El bibliotecari manté la informació la informació del dispositiu.
-Si heu fet modificacions per adequar-la al vostre propi dispositiu,
-pot ser interessant comunicar-ho al bibliotecari per a benefici d'altres.</translation>
- </message>
- <message>
- <location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
- <source>Provided by</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewMatrixView</name>
- <message>
- <source>Matrix</source>
- <translation type="obsolete">Matriu</translation>
- </message>
- <message>
- <source><untitled></source>
- <translation type="obsolete"><sense nom></translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">%1 - Tots els fragments - %2</translation>
- </message>
- <message>
- <source> Grid: </source>
- <translation type="obsolete"> Graella: </translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Cap</translation>
- </message>
- <message>
- <source>Unit</source>
- <translation type="obsolete">Unitat</translation>
- </message>
- <message>
- <source>Beat</source>
- <translation type="obsolete">Pulsació</translation>
- </message>
- <message>
- <source>Bar</source>
- <translation type="obsolete">Compà s</translation>
- </message>
- <message>
- <source> Velocity: </source>
- <translation type="obsolete">Velocitat:</translation>
- </message>
- <message>
- <source> Quantize: </source>
- <translation type="obsolete"> Quantificació: </translation>
- </message>
- <message>
- <source> Zoom: </source>
- <translation type="obsolete"> Zoom: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Defineix les velocitats dels esdeveniments</translation>
- </message>
- <message>
- <source>Trigger Segment</source>
- <translation type="obsolete">Fragment activable</translation>
- </message>
- <message>
- <source>Remove Triggers</source>
- <translation type="obsolete">Suprimeix els activadors</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Es mostra la indicació de compàs estimada</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Transposa</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Introdueix el número de semitons a transposar:</translation>
- </message>
- <message>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="obsolete">No s'ha pogut afegir una nota: No hi ha seleccionada una durada de graella.</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewNotationView</name>
- <message>
- <source>Note &Font</source>
- <translation type="obsolete">&Font de notes</translation>
- </message>
- <message>
- <source>Si&ze</source>
- <translation type="obsolete">&Mida</translation>
- </message>
- <message>
- <source>S&pacing</source>
- <translation type="obsolete">Espa&iat</translation>
- </message>
- <message>
- <source> Font: </source>
- <translation type="obsolete"> Font: </translation>
- </message>
- <message>
- <source>Unknown font "%1", using default</source>
- <translation type="obsolete">No s'ha trobat la font "%1" i es farà servir la predeterminada</translation>
- </message>
- <message>
- <source> Size: </source>
- <translation type="obsolete"> Mida: </translation>
- </message>
- <message>
- <source> Spacing: </source>
- <translation type="obsolete"> Espaiat: </translation>
- </message>
- <message>
- <source>LilyPond Preview Options</source>
- <translation type="obsolete">Opcions Lilypond de la mostra prèvia </translation>
- </message>
- <message>
- <source>LilyPond preview options</source>
- <translation type="obsolete">Opcions Lilypond de la mostra prèvia </translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">No s'ha pogut exportar. El fitxer no s'ha pogut obrir per escriure'l.</translation>
- </message>
- <message>
- <source>Unknown font action %1</source>
- <translation type="obsolete">Es desconeix l'acció %1</translation>
- </message>
- <message>
- <source>Unknown font size action %1</source>
- <translation type="obsolete">Es desconeix l'acció de canvi de mida %1</translation>
- </message>
- <message>
- <source>Unknown spacing action %1</source>
- <translation type="obsolete">Es desconeix l'acció d'espaiat %1</translation>
- </message>
- <message>
- <source>Can't paste multiple Segments into one</source>
- <translation type="obsolete">No s'han pogut enganxar múltiples fragments en un de sol</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
+ <name>Rosegarden::MultiKeyInsertionCommand</name>
<message>
- <source>Couldn't paste at this point.</source>
- <translation type="obsolete">No s'ha pogut enganxar en aquest punt.</translation>
+ <location filename="../../src/commands/notation/MultiKeyInsertionCommand.h" line="+58"/>
+ <source>Change all to &Key %1...</source>
+ <translation type="unfinished">Canvia-ho tot al &to %1...</translation>
</message>
<message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">El tipus d'enganxat restringit requereix que hi hagi un espai
- buit suficient (espai en silenci) per
-fer-hi quebre tots els esdeveniments que es volen posar.
-Però no hi ha prou espai.
-Si, de totes maneres, voleu enganxar-ho, teniu
-tipus d'enganxat en l'opció "Enganxa"
-del menú Edita. Per altra banda també podeu canviar
- el tipus d'enganxatper defecte per un altre de diferent.</translation>
+ <location line="+2"/>
+ <source>Add &Key Change...</source>
+ <translation type="unfinished">Afegeix el canvi de &to...</translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::MusicXMLOptionsDialog</name>
<message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">El porta-retalls està buit</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="+60"/>
+ <source>MusicXML Export</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">S'està afegint el contingut del porta-retalls...</translation>
+ <location line="+16"/>
+ <source>Layout</source>
+ <translation type="unfinished">Format</translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">S'està apujant les velocitats...</translation>
+ <location line="+7"/>
+ <source>Headers</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">S'està abaixant les velocitats...</translation>
+ <location line="+6"/>
+ <source>Basic options</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Defineix les velocitats dels esdeveniments</translation>
+ <location line="+12"/>
+ <source>Export content</source>
+ <translation type="unfinished">Exporta els dispositius</translation>
</message>
<message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">S'està definint les velocitats...</translation>
+ <location line="+2"/>
+ <source><qt>Choose which tracks or segments to export</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Unknown note insert action %1</source>
- <translation type="obsolete">Acció d'afegir una nota, desconeguda: %1</translation>
+ <location line="+1"/>
+ <source>All tracks</source>
+ <translation type="unfinished">Afegeix và ries pistes</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">S'està afegint una nota</translation>
+ <location line="+1"/>
+ <source>Non-muted tracks</source>
+ <translation type="unfinished">Posa la pista en silenci</translation>
</message>
<message>
- <source>Ornament track %1 bar %2</source>
- <translation type="obsolete">Ornament a la pista %1 compàs %2</translation>
+ <location line="+1"/>
+ <source>Selected track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Ornament bar %1</source>
- <translation type="obsolete">Ornament al compàs %1</translation>
+ <location line="+1"/>
+ <source>Selected segments</source>
+ <translation type="unfinished">Selecciona &tots els fragments</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Crea l'ornamentació</translation>
+ <location line="+3"/>
+ <source>Export track staff brackets</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Use Ornament</source>
- <translation type="obsolete">Fes servir l'ornamentació</translation>
+ <location line="+2"/>
+ <source><qt>Track staff brackets are found in the <b>Track Parameters</b> box, and may be used to group staffs in various ways</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Remove Ornaments</source>
- <translation type="obsolete">Suprimeix els ornaments</translation>
+ <location line="+6"/>
+ <source>Advanced/Experimental options</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Estimated key signature shown</source>
- <translation type="obsolete">Mostra la clau recomanada</translation>
+ <location line="+11"/>
+ <source>Compatibility level</source>
+ <translation type="unfinished">Nivell de compatibilitat amb el Lilypond</translation>
</message>
<message>
- <source>Sustain</source>
- <translation type="obsolete">Sosté</translation>
+ <location line="+2"/>
+ <source><qt>Set the MusicXML version you want export</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>There is no sustain controller defined for this device.
-Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
- <translation type="obsolete">No hi ha cap controlador definit per aquest dispositiu.
-Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</translation>
+ <location line="+9"/>
+ <source><qt><p>Choose the format of the MusicXML file.</p><p>The "partwise" format contains "part" elements that contain "measure" elements. The "timewise" format reverses this ordering.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Es mostra la indicació de compàs estimada</translation>
+ <location line="+6"/>
+ <source>Export grand staff instrument</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Can't insert note: No note duration selected</source>
- <translation type="obsolete">No s'ha pogut afegir una nota: No hi ha seleccionada s'ha seleccionat cap durada</translation>
+ <location line="+6"/>
+ <source><qt>Choose which bracket will create a grand staff system</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Temps: %1 (%2.%3s)</translation>
+ <location line="+9"/>
+ <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 - Segment Track #%2 - Notation</source>
- <translation type="obsolete">%1 - Fragment de la pista #%2 - Partitura</translation>
+ <location line="+6"/>
+ <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">%1 - Tots els fragments - Partitura</translation>
+ <location line="-29"/>
+ <source>MusicXML type</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Treset</translation>
+ <location line="+10"/>
+ <source>None</source>
+ <translation type="unfinished">Cap</translation>
</message>
<message>
- <source>Chord</source>
- <translation type="obsolete">Acord</translation>
+ <location line="+7"/>
+ <source>Don't export percussion tracks</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Grace</source>
- <translation type="obsolete">Grec</translation>
+ <location line="+8"/>
+ <source>Use "<octave-shift>" for transposing instruments</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Transpose</source>
- <translation type="obsolete">Transposa</translation>
+ <location line="+45"/>
+ <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::NameSetEditor</name>
<message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Introdueix el número de semitons a transposar:</translation>
+ <location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
+ <source>Provided by</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -18587,13 +17835,13 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation type="unfinished">Partitura</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation type="unfinished">Format per defecte</translation>
</message>
@@ -18623,18 +17871,6 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<translation type="unfinished">Normal</translation>
</message>
<message>
- <source>Default duration factor</source>
- <translation type="obsolete">Factor de durada per defecte</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Cap</translation>
- </message>
- <message>
- <source>Full</source>
- <translation type="obsolete">Ple</translation>
- </message>
- <message>
<location line="+12"/>
<source>Show track headers (linear layout only)</source>
<translation type="unfinished"></translation>
@@ -18846,10 +18082,6 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<translation type="unfinished">Mida de lletra quan hi hagi và ries vistes</translation>
</message>
<message>
- <source>Font size for printing (pt)</source>
- <translation type="obsolete">Mida de lletra per a imprimir (pt)</translation>
- </message>
- <message>
<location line="+18"/>
<source>Text font</source>
<translation type="unfinished">Tipus de lletra</translation>
@@ -19160,18 +18392,6 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<context>
<name>Rosegarden::NotationView</name>
<message>
- <source>Close track headers</source>
- <translation type="obsolete">Canvia el nom de la pista</translation>
- </message>
- <message>
- <source>Starting...</source>
- <translation type="obsolete">S'està iniciant...</translation>
- </message>
- <message>
- <source>Preparing to print...</source>
- <translation type="obsolete">S'està preparant per imprimir...</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NotationView.cpp" line="+121"/>
<source>Note &Font</source>
<translation type="unfinished">&Font de notes</translation>
@@ -19186,14 +18406,6 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<source>S&pacing</source>
<translation type="unfinished">Espa&iat</translation>
</message>
- <message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Factor de du&ració</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Cap</translation>
- </message>
<message numerus="yes">
<location line="-8"/>
<source>%n pixel(s)</source>
@@ -19203,7 +18415,7 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation type="unfinished"> Font: </translation>
</message>
@@ -19223,52 +18435,12 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<translation type="unfinished"> Espaiat: </translation>
</message>
<message>
- <source> Ready.</source>
- <translation type="obsolete"> A punt.</translation>
- </message>
- <message>
- <source>Laying out score...</source>
- <translation type="obsolete">S'està donant format a la partitura...</translation>
- </message>
- <message>
- <source>Laying out staff %1...</source>
- <translation type="obsolete">S'està donant format al pentagrama %1...</translation>
- </message>
- <message>
- <source>Reconciling staffs...</source>
- <translation type="obsolete">S'està reconciliant els pentagrames...</translation>
- </message>
- <message>
- <location line="-115"/>
+ <location line="-117"/>
<source> No selection </source>
<translation type="unfinished"> No hi ha cap selecció </translation>
</message>
<message>
- <source>Sizing and allocating canvas...</source>
- <translation type="obsolete">S'està ubicant i dimensionant el full...</translation>
- </message>
- <message>
- <source>note</source>
- <translation type="obsolete">nota</translation>
- </message>
- <message>
- <source>rest</source>
- <translation type="obsolete">silenci</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - Notation</source>
- <translation type="obsolete">%1 - Fragment de la pista #%2 - Partitura</translation>
- </message>
- <message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">%1 - Tots els fragments - Partitura</translation>
- </message>
- <message>
- <source>Triplet</source>
- <translation type="obsolete">Treset</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation type="unfinished">Acord</translation>
</message>
@@ -19285,53 +18457,21 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<translation type="unfinished">%1 (%2)</translation>
</message>
<message>
- <source>Hidden annotations</source>
- <translation type="obsolete">Anotacions ocultes</translation>
- </message>
- <message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation type="unfinished">Es desconeix l'acció d'espaiat %1</translation>
</message>
<message>
- <source>Unknown proportion action %1</source>
- <translation type="obsolete">Es desconeix l'acció de proporcionalitat %1</translation>
- </message>
- <message>
<location line="-51"/>
<source>Unknown font action %1</source>
<translation type="unfinished">Es desconeix l'acció %1</translation>
</message>
<message>
- <source>Unknown font size %1</source>
- <translation type="obsolete">No s'ha trobat la mida %1 per aquesta font</translation>
- </message>
- <message>
<location line="+26"/>
<source>Unknown font size action %1</source>
<translation type="unfinished">Es desconeix l'acció de canvi de mida %1</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">S'està imprimint...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Visualització prèvia...</translation>
- </message>
- <message>
- <source>Printing LilyPond file...</source>
- <translation type="obsolete">S'està visualitzant el fitxer Lilypond...</translation>
- </message>
- <message>
- <source>Failed to open a temporary file for LilyPond export.</source>
- <translation type="obsolete">No s'ha pogut obrir un fitxer temportal per exportar com a Lilypond.</translation>
- </message>
- <message>
- <source>Previewing LilyPond file...</source>
- <translation type="obsolete">S'està visualitzant el fitxer Lilypond...</translation>
- </message>
- <message>
<location line="-147"/>
<source>LilyPond Preview Options</source>
<translation type="unfinished">Opcions Lilypond de la mostra prèvia </translation>
@@ -19342,37 +18482,17 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<translation type="unfinished">Opcions Lilypond de la mostra prèvia </translation>
</message>
<message>
- <source>Exporting LilyPond file...</source>
- <translation type="obsolete">S'està exportant el fitxer Lilypond...</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">No s'ha pogut exportar. El fitxer no s'ha pogut obrir per escriure'l.</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">S'està tallant la selecció al porta-retalls...</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">S'està eliminant la selecció...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">S'està copiant la selecció al porta-retalls...</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation type="unfinished">El porta-retalls està buit</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation type="unfinished">No s'han pogut enganxar múltiples fragments en un de sol</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -19385,23 +18505,22 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+88"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation type="unfinished"></translation>
</message>
@@ -19416,29 +18535,29 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation type="unfinished">S'està afegint el contingut del porta-retalls...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation type="unfinished">No s'ha pogut enganxar en aquest punt.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation type="unfinished">&Mou els esdeveniments a un altre fragment</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation type="unfinished">S'està apujant les velocitats...</translation>
</message>
@@ -19448,15 +18567,7 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<translation type="unfinished">S'està abaixant les velocitats...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Defineix les velocitats dels esdeveniments</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">S'està definint les velocitats...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation type="unfinished"></translation>
</message>
@@ -19471,11 +18582,7 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<translation type="unfinished">S'està eliminant notes...</translation>
</message>
<message>
- <source>No note duration selected</source>
- <translation type="obsolete">No s'ha seleccionat cap durada de nota</translation>
- </message>
- <message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished">Acció d'afegir una nota, desconeguda: %1</translation>
</message>
@@ -19485,29 +18592,13 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<translation type="unfinished">S'està afegint una nota</translation>
</message>
<message>
- <source>No rest duration selected</source>
- <translation type="obsolete">No s'ha seleccionat cap durada de silenci</translation>
- </message>
- <message>
- <source>No note or rest duration selected</source>
- <translation type="obsolete">No s'ha seleccionat cap durada ni de nota ni de silenci</translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">S'està quantificant...</translation>
- </message>
- <message>
- <source>Interpreting selection...</source>
- <translation type="obsolete">S'està interpretant la selecció...</translation>
- </message>
- <message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation type="unfinished">S'està afegeix un punt...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation type="unfinished">Ornament a la pista %1 compàs %2</translation>
</message>
@@ -19517,10 +18608,6 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<translation type="unfinished">Ornament al compàs %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Crea l'ornamentació</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation type="unfinished">Fes servir l'ornamentació</translation>
@@ -19556,7 +18643,7 @@ Això és un bug del programa (el programa es pot haver penjat)</translation>
<translation type="unfinished">Sosté</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation type="unfinished">No hi ha cap controlador definit per aquest dispositiu.
@@ -19568,7 +18655,7 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<translation type="unfinished">Es mostra la indicació de compàs estimada</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation type="unfinished">%1 - Fragment de la pista #%2 - Partitura {1%2 ?} {3 ?}</translation>
</message>
@@ -19601,7 +18688,7 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<translation type="unfinished">Introdueix el número de semitons a transposar:</translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation type="unfinished">Temps: %1 (%2.%3s)</translation>
</message>
@@ -19650,16 +18737,11 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<source>Cycling slashes...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation type="unfinished">No s'ha pogut afegir una nota: No hi ha seleccionada s'ha seleccionat cap durada</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation type="unfinished"></translation>
</message>
@@ -19684,7 +18766,7 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<translation type="unfinished">Canvia el nom de la pista</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
@@ -20498,10 +19580,6 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<context>
<name>Rosegarden::ProgressDialog</name>
<message>
- <source>Processing...</source>
- <translation type="obsolete">S'està processant...</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/ProgressDialog.cpp" line="+65"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
@@ -20698,23 +19776,12 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">controlador %1</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
<source>Quantize</source>
<translation type="unfinished">Quantificació</translation>
</message>
- <message>
- <source>Advanced</source>
- <translation type="obsolete">Avançat</translation>
- </message>
</context>
<context>
<name>Rosegarden::QuantizeParameters</name>
@@ -20796,12 +19863,12 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation type="unfinished">Cap</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation type="unfinished">2 en el temps de 3</translation>
</message>
@@ -20846,10 +19913,6 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<translation type="unfinished">Després de quantificar</translation>
</message>
<message>
- <source>Show advanced options</source>
- <translation type="obsolete">Mostra les opcions avançades</translation>
- </message>
- <message>
<location line="+6"/>
<source>Re-beam</source>
<translation type="unfinished">Torna a posar les barres d'agrupació</translation>
@@ -20870,18 +19933,10 @@ Mireu si el dispositiu està ben configurat en el gestor de dispositius MIDI</tr
<translation type="unfinished">Divideix-i-lliga els acords encavalcats</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation type="unfinished">Quantificació total</translation>
</message>
- <message>
- <source>Show Advanced Options</source>
- <translation type="obsolete">Mostra les opcions avançades</translation>
- </message>
- <message>
- <source>Hide Advanced Options</source>
- <translation type="obsolete">Oculta les opcions avançades</translation>
- </message>
</context>
<context>
<name>Rosegarden::RawNoteRuler</name>
@@ -21195,12 +20250,6 @@ Poden haver-hi algunes incompatibilitats amb el format del fitxer.</translation>
<context>
<name>Rosegarden::RosegardenDocument</name>
<message>
- <source>The current file has been modified.
-Do you want to save it?</source>
- <translation type="obsolete">El fitxer actual s'ha modificat.
-Voleu desar-lo?</translation>
- </message>
- <message>
<location filename="../../src/document/RosegardenDocument.cpp" line="+345"/>
<source>Rosegarden - Warning</source>
<translation type="unfinished"></translation>
@@ -21223,8 +20272,8 @@ Voleu desar-lo?</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -21236,7 +20285,7 @@ Voleu desar-lo?</translation>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation type="unfinished"></translation>
</message>
@@ -21314,7 +20363,12 @@ Seleccioneu de la llista els fitxers que voleu esborrar del disc dur.
<translation type="unfinished">Fusiona</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation type="unfinished"></translation>
</message>
@@ -21329,7 +20383,7 @@ Seleccioneu de la llista els fitxers que voleu esborrar del disc dur.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
@@ -21343,11 +20397,7 @@ Seleccioneu una ubicació correcta, en les propietats del document abans de grav
Voleu configurar-ho ara?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Desa el fitxer...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation type="unfinished"></translation>
</message>
@@ -21428,11 +20478,7 @@ Es recomana que ho torneu desar amb aquesta versió del Rosegarden per aixà est
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <source>No non-audio segments in composition</source>
- <translation type="obsolete">No hi han fragments de no-à udio en la composició</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation type="unfinished">La selecció només pot tenir fragments d'à udio o de no-à udio</translation>
</message>
@@ -21443,7 +20489,7 @@ Es recomana que ho torneu desar amb aquesta versió del Rosegarden per aixà est
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -21452,7 +20498,7 @@ Es recomana que ho torneu desar amb aquesta versió del Rosegarden per aixà est
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -21461,28 +20507,18 @@ Es recomana que ho torneu desar amb aquesta versió del Rosegarden per aixà est
<translation type="unfinished">No s'ha seleccionat cap fragment de no-Ã udio</translation>
</message>
<message>
- <source>You've not yet defined an audio editor for Rosegarden to use.
-See Settings -> Configure Rosegarden -> Audio.</source>
- <translation type="obsolete">Encara no heu definit un editor d'Ã udio per utilitzar-lo amb el Rosegarden.
-Mireu Configuració -> Configuració del Rosegarden -> General -> Editors externs.</translation>
- </message>
- <message>
<location line="+78"/>
<source>You've not yet defined an audio editor for Rosegarden to use.
See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">S'està exportant el fitxer d'à udio...</translation>
- </message>
- <message>
<location line="-439"/>
<source>Pitch Tracker can only contain 1 segment.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1203"/>
+ <location line="+1196"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -21551,14 +20587,14 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished">S'està iniciant...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation type="unfinished"> Zoom: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation type="unfinished">%1 (%2)</translation>
@@ -21587,12 +20623,12 @@ document. El voleu obrir en lloc d'aquest document ?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -21631,12 +20667,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -21656,33 +20692,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation type="unfinished">Tots els fitxers</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation type="unfinished">Obre el fitxer</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation type="unfinished"></translation>
</message>
@@ -21692,16 +20728,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation type="unfinished">No s'ha pogut obrir el fitxer %1</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation type="unfinished">Desa el fitxer...</translation>
</message>
@@ -21741,14 +20777,6 @@ Error was : %2</source>
<translation type="unfinished">S'està tancant el fitxer...</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">S'està imprimint...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Visualització prèvia...</translation>
- </message>
- <message>
<location line="+13"/>
<source>Exiting...</source>
<translation type="unfinished">S'està sortint...</translation>
@@ -21806,12 +20834,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21867,12 +20895,12 @@ Voleu configurar-ho ara?</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation type="unfinished">Defineix el tempo global</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation type="unfinished">Commuta la barra d'eines...</translation>
</message>
@@ -21940,12 +20968,12 @@ Voleu configurar-ho ara?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -21955,13 +20983,13 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21985,8 +21013,8 @@ Voleu configurar-ho ara?</translation>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21996,7 +21024,7 @@ Voleu configurar-ho ara?</translation>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -22014,8 +21042,8 @@ Voleu configurar-ho ara?</translation>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -22024,12 +21052,12 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation type="unfinished"></translation>
</message>
@@ -22039,7 +21067,7 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation type="unfinished">Obre el fitxer MIDI</translation>
</message>
@@ -22049,12 +21077,12 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished">Fusiona el fitxer MIDI</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation type="unfinished">S'està important el fitxer MIDI...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation type="unfinished">S'estan calculant els compassos...</translation>
</message>
@@ -22086,64 +21114,24 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Obre el fitxer Hydrogen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">S'està important el fitxer Hydrogen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">No es pot carregar el fitxer Hydrogen. Sembla que està malament.</translation>
- </message>
- <message>
- <source>Export and import of Rosegarden Project files</source>
- <translation type="obsolete">S'està exportant el fitxer de projecte Rosegarden...</translation>
- </message>
- <message>
- <source>The Rosegarden Project Packager helper script</source>
- <translation type="obsolete">Fitxers de projecte Rosegarden</translation>
- </message>
- <message>
- <source>Notation previews through LilyPond</source>
- <translation type="obsolete">S'està visualitzant el fitxer Lilypond...</translation>
- </message>
- <message>
- <source>%1 - for LilyPond preview support</source>
- <translation type="obsolete">Opcions Lilypond de la mostra prèvia </translation>
- </message>
- <message>
- <source>%1 - for audio file import</source>
- <translation type="obsolete">Selecciona una ubicació per al fitxer</translation>
- </message>
- <message>
- <source><ul></source>
- <translation type="obsolete"><per defecte></translation>
- </message>
- <message>
- <source><li>%1</li></source>
- <translation type="obsolete">-- %1 (des de %2)</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation type="unfinished">El procés seqüenciador del Rosegarden ha acabat de forma sobtada. El so i l'enregistrament han deixat de funcionar per aquesta sessió.
Heu de sortir i tornar a iniciar el Rosegarden per restaurar el sistema de so.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation type="unfinished"></translation>
@@ -22190,7 +21178,7 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation type="unfinished">El seqüenciador del Rosegarden no s'ha pogut engegar, per tant el so i l'enregistrament
@@ -22204,7 +21192,7 @@ no funcionaran. Si necessiteu ajuda en la configuració del so aneu a http://ros
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -22212,7 +21200,7 @@ no funcionaran. Si necessiteu ajuda en la configuració del so aneu a http://ros
<translation type="unfinished">Exporta com...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation type="unfinished">No s'ha pogut desar el fitxer Rosegarden al paquet: %1</translation>
</message>
@@ -22228,7 +21216,7 @@ no funcionaran. Si necessiteu ajuda en la configuració del so aneu a http://ros
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -22295,14 +21283,14 @@ no funcionaran. Si necessiteu ajuda en la configuració del so aneu a http://ros
<translation type="unfinished">S'està exportant el fitxer MusicXML...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation type="unfinished">Fitxers XML</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-936"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation type="unfinished"></translation>
@@ -22319,7 +21307,7 @@ no funcionaran. Si necessiteu ajuda en la configuració del so aneu a http://ros
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1008"/>
+ <location line="+1003"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -22407,7 +21395,7 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished">Introduïu una nova etiqueta</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation type="unfinished">Llista de peces</translation>
</message>
@@ -22417,7 +21405,7 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished">http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation type="unfinished">S'estan encuant els esdeveniments de pà nic MIDI per la transmissió...</translation>
</message>
@@ -22496,7 +21484,7 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation type="unfinished">Seleccioneu un nou valor</translation>
</message>
@@ -22548,7 +21536,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation type="unfinished">Canvia el color del fragment...</translation>
</message>
@@ -22591,7 +21579,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation type="unfinished"></translation>
</message>
@@ -22624,7 +21612,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">&Ajunta</translation>
</message>
@@ -22632,7 +21620,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation type="unfinished">Canvia &l'etiqueta...</translation>
</message>
@@ -22669,22 +21657,22 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation type="unfinished">Mou el fragment</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation type="unfinished">Mou els fragments</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation type="unfinished"></translation>
</message>
@@ -22879,12 +21867,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation type="unfinished">Grava o MIDI o à udio</translation>
</message>
@@ -22960,7 +21948,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
@@ -22984,17 +21972,17 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished">S'està generant una mostra d'à udio...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Redimensiona el fragment</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation type="unfinished"></translation>
</message>
@@ -23004,7 +21992,7 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation type="unfinished"></translation>
</message>
@@ -23017,25 +22005,17 @@ Voleu configurar-ho ara?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation type="unfinished">Fes clic per seleccionar un tipus de lletra</translation>
</message>
- <message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation type="unfinished">
- <numerusform>
- </numerusform>
- </translation>
- </message>
<message>
- <location line="+154"/>
+ <location line="+348"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation type="unfinished"></translation>
</message>
@@ -23064,8 +22044,15 @@ Voleu configurar-ho ara?</translation>
<source>Click and drag to copy segments</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <location line="-287"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <location line="+6"/>
+ <location line="+293"/>
<source>Click and drag to copy segment</source>
<translation type="unfinished"></translation>
</message>
@@ -23135,24 +22122,12 @@ Voleu configurar-ho ara?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Divideix el fragment</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23983,26 +22958,6 @@ Si sortiu de les altres aplicacions que estan corrent, millorareu el rendiment d
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">Do#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">Id</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">Fa#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">Sol#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location line="-276"/>
<source>%1: %2</source>
<translation type="unfinished">%1 (%2)</translation>
@@ -24014,13 +22969,6 @@ Si sortiu de les altres aplicacions que estan corrent, millorareu el rendiment d
</message>
</context>
<context>
- <name>Rosegarden::Studio</name>
- <message>
- <source>Audio</source>
- <translation type="obsolete">Àudio</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SustainInsertionCommand</name>
<message>
<location filename="../../src/commands/notation/SustainInsertionCommand.h" line="+51"/>
@@ -24894,7 +23842,7 @@ Si sortiu de les altres aplicacions que estan corrent, millorareu el rendiment d
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation type="unfinished"><cap instrument></translation>
</message>
@@ -24909,15 +23857,7 @@ Si sortiu de les altres aplicacions que estan corrent, millorareu el rendiment d
<translation type="unfinished"><sense nom></translation>
</message>
<message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">La ubicació del fitxer d'à udio no existeix o no s'hi pot escriure.
-Seleccioneu una ubicació correcta, en les propietats del document abans de gravar l'à udio.
-Voleu configurar-ho ara?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation type="unfinished">Posa la pista en silenci</translation>
</message>
@@ -24930,39 +23870,31 @@ Voleu configurar-ho ara?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Converteix el fragment repetit en un còpia</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Converteix els fragments repetits en còpies</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -24971,10 +23903,6 @@ Voleu configurar-ho ara?</translation>
<source>Rosegarden cannot accept dropped files of this type.</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>You can't drop files into Rosegarden from this client. Try using Konqueror instead.</source>
- <translation type="obsolete">No podeu arrossegar fitxers cap al Rosegarden des d'aquest client. Proveu-ho de fer amb el Konqueror.</translation>
- </message>
</context>
<context>
<name>Rosegarden::TrackLabel</name>
@@ -25012,7 +23940,7 @@ Voleu configurar-ho ara?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation type="unfinished">Pista</translation>
</message>
@@ -25023,12 +23951,12 @@ Voleu configurar-ho ara?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation type="unfinished"><sense nom></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation type="unfinished">Volum de reproducció</translation>
</message>
@@ -25169,117 +24097,169 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Soprano</translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Baix</translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation type="unfinished">&Octaves</translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished">S&forzando</translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Alto</translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Tenor</translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Variació</translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Variació</translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Baix</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>treble</source>
+ <translation type="obsolete">Soprano</translation>
+ </message>
+ <message>
+ <source>bass</source>
+ <translation type="obsolete">Baix</translation>
+ </message>
+ <message>
+ <source>crotales</source>
+ <translation type="obsolete">&Octaves</translation>
+ </message>
+ <message>
+ <source>mezzosoprano</source>
+ <translation type="obsolete">S&forzando</translation>
+ </message>
+ <message>
+ <source>alto</source>
+ <translation type="obsolete">Alto</translation>
+ </message>
+ <message>
+ <source>tenor</source>
+ <translation type="obsolete">Tenor</translation>
+ </message>
+ <message>
+ <source>baritone</source>
+ <translation type="obsolete">Variació</translation>
+ </message>
+ <message>
+ <source>varbaritone</source>
+ <translation type="obsolete">Variació</translation>
+ </message>
+ <message>
+ <source>subbass</source>
+ <translation type="obsolete">Baix</translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation type="unfinished">Transposa</translation>
</message>
@@ -25320,7 +24300,7 @@ Voleu configurar-ho ara?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation type="unfinished">Àudio</translation>
@@ -25952,24 +24932,6 @@ Voleu configurar-ho ara?</translation>
</message>
</context>
<context>
- <name>RosegardenApplication</name>
- <message>
- <source>Rosegarden - A sequencer and musical notation editor</source>
- <translation type="obsolete">Rosegarden - Un seqüenciador i editor de partitures</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">%1 (enregistrat)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/cs.ts b/data/locale/cs.ts
index 90eff73..53abee4 100644
--- a/data/locale/cs.ts
+++ b/data/locale/cs.ts
@@ -2,13 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0" language="cs">
<context>
- <name></name>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
<name>:</name>
<message>
<location filename="../../src/sound/MidiFile.cpp" line="104"/>
@@ -62,10 +55,6 @@
<translation>Výchozà zaÅ™Ãzenà pro pÅ™ehrávánÃ</translation>
</message>
<message>
- <source><qt><p>Create new playback devices here. Click the device name to change it. Select a device here and connect it to a MIDI output port by clicking on a port to the right.</p></qt></source>
- <translation type="obsolete"><qt><p>Zde vytvoÅ™te nové zaÅ™Ãzenà pro pÅ™ehrávánÃ. KlepnÄ›te na název zaÅ™ÃzenÃ, abyste jej mohl zmÄ›nit. Vyberte zde zaÅ™Ãzenà a spojte je s pÅ™Ãpojkou výstupu MIDI klepnutÃm na pÅ™Ãpojku na pravé stranÄ›.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/studio/DeviceManagerDialogUi.ui" line="150"/>
<location filename="../../src/gui/studio/DeviceManagerDialogUi.h" line="489"/>
<source><qt><p>Bank definitions allow you to tell Rosegarden about the programs or patches available for use on the equipment (hardware or software synth) connected to this device.</p><p>You must have something defined for any program or bank changes you wish to transmit, as Rosegarden hides all bank and program numbers that are undefined.</p></qt></source>
@@ -149,10 +138,6 @@
<translation><qt><p>Dostupné vstupy MIDI (od technických po programové)</p></qt></translation>
</message>
<message>
- <source><qt><p>Available ALSA MIDI outputs for any hardware detected and supported by your distribution, and any available soft synths such as QSynth, ZynAddSubFX, etc.</p></qt></source>
- <translation type="obsolete"><qt><p>Jsou zjiÅ¡tÄ›na a vaÅ¡Ã distribucà podporována dostupná ALSA MIDI výstupnà zaÅ™ÃzenÃ, a vÅ¡echny dostupné softwarové syntetizátory jako napÅ™Ãklad QSynth, ZynAddSubFX, etc.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/studio/DeviceManagerDialogUi.ui" line="389"/>
<location filename="../../src/gui/studio/DeviceManagerDialogUi.ui" line="729"/>
<location filename="../../src/gui/studio/DeviceManagerDialogUi.h" line="520"/>
@@ -223,10 +208,6 @@
<source>Available inputs</source>
<translation>Dostupné vstupy</translation>
</message>
- <message>
- <source><qt><p>Available ALSA MIDI inputs for any hardware MIDI inputs detected by your distribution's hardware autodetection, plus any ALSA MIDI software that exposes output ports, such as VMPK</p></qt></source>
- <translation type="obsolete"><qt><p>Dostupná ALSA MIDI vstupnà zaÅ™Ãzenà pro vÅ¡echny MIDI hardwarové vstupy, která byla zjiÅ¡tÄ›na bÄ›hem automatického zjiÅ¡Å¥ovánà vaÅ¡Ã distribucÃ, plus vÅ¡echen ALSA MIDI software, který poskytuje výstupnà pÅ™Ãpojky, jako napÅ™Ãklad VMPK</p></qt></translation>
- </message>
</context>
<context>
<name>EventParameterDialog</name>
@@ -313,10 +294,6 @@
<translation>VyzvánÄ›nà - nastavit %1 na stÅ™Ãdánà od nejvÄ›tÅ¡Ãho po nejmenÅ¡Ã s ukonÄenÃm na nule</translation>
</message>
<message>
- <source>Half-wave crescendo - set %1 rising from min to max n a half sine wave contour</source>
- <translation type="obsolete">Crescendo - nastavit %1 na zvÄ›tÅ¡ujÃcà se od nejmenÅ¡Ãho po nejvÄ›tÅ¡Ã</translation>
- </message>
- <message>
<location filename="../../src/base/parameterpattern/HalfSinePattern.cpp" line="28"/>
<source>Half-wave crescendo - set %1 rising from min to max in a half sine wave contour</source>
<translation type="unfinished"></translation>
@@ -355,5415 +332,5047 @@
<translation>Nelze otevÅ™Ãt soubor %1 pro zobrazenà pÃsma</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="30"/>
- <location filename="../QMenuStrings.cpp" line="63"/>
- <location filename="../QMenuStrings.cpp" line="124"/>
- <location filename="../QMenuStrings.cpp" line="173"/>
- <location filename="../QMenuStrings.cpp" line="316"/>
- <location filename="../QMenuStrings.cpp" line="473"/>
- <location filename="../QMenuStrings.cpp" line="1680"/>
- <location filename="../QMenuStrings.cpp" line="1728"/>
- <location filename="../QMenuStrings.cpp" line="1801"/>
- <location filename="../QMenuStrings.cpp" line="3742"/>
- <location filename="../QMenuStrings.cpp" line="4602"/>
- <location filename="../QMenuStrings.cpp" line="4717"/>
+ <location filename="../QMenuStrings.cpp" line="66"/>
+ <location filename="../QMenuStrings.cpp" line="181"/>
+ <location filename="../QMenuStrings.cpp" line="251"/>
+ <location filename="../QMenuStrings.cpp" line="1355"/>
+ <location filename="../QMenuStrings.cpp" line="1495"/>
+ <location filename="../QMenuStrings.cpp" line="1540"/>
+ <location filename="../QMenuStrings.cpp" line="1589"/>
+ <location filename="../QMenuStrings.cpp" line="1831"/>
+ <location filename="../QMenuStrings.cpp" line="1867"/>
+ <location filename="../QMenuStrings.cpp" line="1973"/>
+ <location filename="../QMenuStrings.cpp" line="2720"/>
+ <location filename="../QMenuStrings.cpp" line="2774"/>
<source>&File</source>
<translation>&Soubor</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="31"/>
+ <location filename="../QMenuStrings.cpp" line="1832"/>
<source>&Add Audio File...</source>
<translation>&Přidat zvukový soubor...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="32"/>
+ <location filename="../QMenuStrings.cpp" line="1833"/>
<source>&Export Audio File...</source>
<translation>&Vyvést zvukový soubor...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="33"/>
- <location filename="../QMenuStrings.cpp" line="64"/>
- <location filename="../QMenuStrings.cpp" line="134"/>
- <location filename="../QMenuStrings.cpp" line="183"/>
- <location filename="../QMenuStrings.cpp" line="317"/>
- <location filename="../QMenuStrings.cpp" line="483"/>
- <location filename="../QMenuStrings.cpp" line="1690"/>
- <location filename="../QMenuStrings.cpp" line="1738"/>
- <location filename="../QMenuStrings.cpp" line="1813"/>
- <location filename="../QMenuStrings.cpp" line="3805"/>
- <location filename="../QMenuStrings.cpp" line="4612"/>
- <location filename="../QMenuStrings.cpp" line="4718"/>
+ <location filename="../QMenuStrings.cpp" line="76"/>
+ <location filename="../QMenuStrings.cpp" line="182"/>
+ <location filename="../QMenuStrings.cpp" line="261"/>
+ <location filename="../QMenuStrings.cpp" line="1365"/>
+ <location filename="../QMenuStrings.cpp" line="1496"/>
+ <location filename="../QMenuStrings.cpp" line="1550"/>
+ <location filename="../QMenuStrings.cpp" line="1599"/>
+ <location filename="../QMenuStrings.cpp" line="1834"/>
+ <location filename="../QMenuStrings.cpp" line="1877"/>
+ <location filename="../QMenuStrings.cpp" line="2036"/>
+ <location filename="../QMenuStrings.cpp" line="2721"/>
+ <location filename="../QMenuStrings.cpp" line="2786"/>
<source>&Close</source>
<translation>&ZavÅ™Ãt</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="42"/>
- <location filename="../QMenuStrings.cpp" line="73"/>
- <location filename="../QMenuStrings.cpp" line="143"/>
- <location filename="../QMenuStrings.cpp" line="192"/>
- <location filename="../QMenuStrings.cpp" line="326"/>
- <location filename="../QMenuStrings.cpp" line="492"/>
- <location filename="../QMenuStrings.cpp" line="1822"/>
- <location filename="../QMenuStrings.cpp" line="3823"/>
- <location filename="../QMenuStrings.cpp" line="4621"/>
- <location filename="../QMenuStrings.cpp" line="4727"/>
+ <location filename="../QMenuStrings.cpp" line="85"/>
+ <location filename="../QMenuStrings.cpp" line="191"/>
+ <location filename="../QMenuStrings.cpp" line="270"/>
+ <location filename="../QMenuStrings.cpp" line="1374"/>
+ <location filename="../QMenuStrings.cpp" line="1505"/>
+ <location filename="../QMenuStrings.cpp" line="1559"/>
+ <location filename="../QMenuStrings.cpp" line="1843"/>
+ <location filename="../QMenuStrings.cpp" line="2054"/>
+ <location filename="../QMenuStrings.cpp" line="2730"/>
+ <location filename="../QMenuStrings.cpp" line="2795"/>
<source>&Edit</source>
<translation>&Úpravy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="43"/>
+ <location filename="../QMenuStrings.cpp" line="1844"/>
<source>&Unload Audio File</source>
<translation>Uvolnit &zvukový soubor z paměti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="44"/>
+ <location filename="../QMenuStrings.cpp" line="1845"/>
<source>Unload &All Audio Files</source>
<translation>Uvolnit &všechny zvukové soubory z paměti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="45"/>
+ <location filename="../QMenuStrings.cpp" line="1846"/>
<source>Unload All Unused Audio &Files</source>
<translation>Uvolnit vÅ¡echny nepoužÃvané zvukové &soubory z pamÄ›ti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="46"/>
+ <location filename="../QMenuStrings.cpp" line="1847"/>
<source>&Delete Unused Audio Files...</source>
<translation>&Smazat nepoužÃvané zvukové &soubory...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="48"/>
+ <location filename="../QMenuStrings.cpp" line="1849"/>
<source>Play Preview</source>
<translation>Přehrát ukázku</translation>
</message>
<message>
- <source>Insert Into Selected Audio track</source>
- <translation type="obsolete">Vložit do vybrané zvukové stopy</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="51"/>
- <location filename="../QMenuStrings.cpp" line="110"/>
- <location filename="../QMenuStrings.cpp" line="111"/>
- <location filename="../QMenuStrings.cpp" line="162"/>
- <location filename="../QMenuStrings.cpp" line="163"/>
- <location filename="../QMenuStrings.cpp" line="297"/>
- <location filename="../QMenuStrings.cpp" line="298"/>
- <location filename="../QMenuStrings.cpp" line="349"/>
- <location filename="../QMenuStrings.cpp" line="350"/>
- <location filename="../QMenuStrings.cpp" line="1543"/>
- <location filename="../QMenuStrings.cpp" line="1716"/>
- <location filename="../QMenuStrings.cpp" line="1717"/>
- <location filename="../QMenuStrings.cpp" line="1786"/>
- <location filename="../QMenuStrings.cpp" line="1787"/>
- <location filename="../QMenuStrings.cpp" line="3479"/>
- <location filename="../QMenuStrings.cpp" line="4359"/>
- <location filename="../QMenuStrings.cpp" line="4701"/>
- <location filename="../QMenuStrings.cpp" line="4702"/>
- <location filename="../QMenuStrings.cpp" line="4759"/>
- <location filename="../QMenuStrings.cpp" line="4760"/>
+ <location filename="../QMenuStrings.cpp" line="165"/>
+ <location filename="../QMenuStrings.cpp" line="166"/>
+ <location filename="../QMenuStrings.cpp" line="228"/>
+ <location filename="../QMenuStrings.cpp" line="229"/>
+ <location filename="../QMenuStrings.cpp" line="1321"/>
+ <location filename="../QMenuStrings.cpp" line="1479"/>
+ <location filename="../QMenuStrings.cpp" line="1480"/>
+ <location filename="../QMenuStrings.cpp" line="1528"/>
+ <location filename="../QMenuStrings.cpp" line="1529"/>
+ <location filename="../QMenuStrings.cpp" line="1578"/>
+ <location filename="../QMenuStrings.cpp" line="1579"/>
+ <location filename="../QMenuStrings.cpp" line="1625"/>
+ <location filename="../QMenuStrings.cpp" line="1626"/>
+ <location filename="../QMenuStrings.cpp" line="1852"/>
+ <location filename="../QMenuStrings.cpp" line="1925"/>
+ <location filename="../QMenuStrings.cpp" line="1926"/>
+ <location filename="../QMenuStrings.cpp" line="2590"/>
+ <location filename="../QMenuStrings.cpp" line="2762"/>
+ <location filename="../QMenuStrings.cpp" line="2763"/>
+ <location filename="../QMenuStrings.cpp" line="4453"/>
<source>&Help</source>
<translation>&Nápověda</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">&Výukový materiál pro Rosegarden</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1554"/>
- <location filename="../QMenuStrings.cpp" line="3490"/>
- <location filename="../QMenuStrings.cpp" line="4370"/>
+ <location filename="../QMenuStrings.cpp" line="1332"/>
+ <location filename="../QMenuStrings.cpp" line="2601"/>
+ <location filename="../QMenuStrings.cpp" line="4464"/>
<source>&Bug Reporting Guidelines</source>
<translation>Pravidla a návody pro hlášenà chy&b</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="61"/>
- <location filename="../QMenuStrings.cpp" line="120"/>
- <location filename="../QMenuStrings.cpp" line="172"/>
- <location filename="../QMenuStrings.cpp" line="307"/>
- <location filename="../QMenuStrings.cpp" line="359"/>
- <location filename="../QMenuStrings.cpp" line="1555"/>
- <location filename="../QMenuStrings.cpp" line="1726"/>
- <location filename="../QMenuStrings.cpp" line="1796"/>
- <location filename="../QMenuStrings.cpp" line="3491"/>
- <location filename="../QMenuStrings.cpp" line="4371"/>
- <location filename="../QMenuStrings.cpp" line="4711"/>
- <location filename="../QMenuStrings.cpp" line="4769"/>
+ <location filename="../QMenuStrings.cpp" line="175"/>
+ <location filename="../QMenuStrings.cpp" line="238"/>
+ <location filename="../QMenuStrings.cpp" line="1333"/>
+ <location filename="../QMenuStrings.cpp" line="1489"/>
+ <location filename="../QMenuStrings.cpp" line="1538"/>
+ <location filename="../QMenuStrings.cpp" line="1588"/>
+ <location filename="../QMenuStrings.cpp" line="1635"/>
+ <location filename="../QMenuStrings.cpp" line="1862"/>
+ <location filename="../QMenuStrings.cpp" line="1935"/>
+ <location filename="../QMenuStrings.cpp" line="2602"/>
+ <location filename="../QMenuStrings.cpp" line="2772"/>
+ <location filename="../QMenuStrings.cpp" line="4465"/>
<source>&About Rosegarden</source>
<translation>&O programu Rosegarden</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="62"/>
- <location filename="../QMenuStrings.cpp" line="1558"/>
- <location filename="../QMenuStrings.cpp" line="3494"/>
+ <location filename="../QMenuStrings.cpp" line="1336"/>
+ <location filename="../QMenuStrings.cpp" line="1863"/>
+ <location filename="../QMenuStrings.cpp" line="4468"/>
<source>General Toolbar</source>
<translation>Obecný nástrojový pruh</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="74"/>
- <location filename="../QMenuStrings.cpp" line="144"/>
- <location filename="../QMenuStrings.cpp" line="193"/>
- <location filename="../QMenuStrings.cpp" line="327"/>
- <location filename="../QMenuStrings.cpp" line="4622"/>
- <location filename="../QMenuStrings.cpp" line="4728"/>
+ <location filename="../QMenuStrings.cpp" line="86"/>
+ <location filename="../QMenuStrings.cpp" line="192"/>
+ <location filename="../QMenuStrings.cpp" line="1375"/>
+ <location filename="../QMenuStrings.cpp" line="1506"/>
+ <location filename="../QMenuStrings.cpp" line="1560"/>
+ <location filename="../QMenuStrings.cpp" line="2731"/>
<source>&Nothing to undo</source>
<translation>&Nic pro vzetà zpět</translation>
</message>
<message>
- <source>Ctrl+Z</source>
- <translation type="obsolete">Ctrl+Z</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="83"/>
- <location filename="../QMenuStrings.cpp" line="153"/>
- <location filename="../QMenuStrings.cpp" line="202"/>
- <location filename="../QMenuStrings.cpp" line="336"/>
- <location filename="../QMenuStrings.cpp" line="4631"/>
- <location filename="../QMenuStrings.cpp" line="4737"/>
+ <location filename="../QMenuStrings.cpp" line="95"/>
+ <location filename="../QMenuStrings.cpp" line="201"/>
+ <location filename="../QMenuStrings.cpp" line="1384"/>
+ <location filename="../QMenuStrings.cpp" line="1515"/>
+ <location filename="../QMenuStrings.cpp" line="1569"/>
+ <location filename="../QMenuStrings.cpp" line="2740"/>
<source>N&othing to redo</source>
<translation>&Nic pro provedenà znovu</translation>
</message>
<message>
- <source>Ctrl+Shift+Z</source>
- <translation type="obsolete">Ctrl+Shift+Z</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="92"/>
- <location filename="../QMenuStrings.cpp" line="248"/>
- <location filename="../QMenuStrings.cpp" line="520"/>
- <location filename="../QMenuStrings.cpp" line="1850"/>
- <location filename="../QMenuStrings.cpp" line="3851"/>
- <location filename="../QMenuStrings.cpp" line="4481"/>
+ <location filename="../QMenuStrings.cpp" line="210"/>
+ <location filename="../QMenuStrings.cpp" line="298"/>
+ <location filename="../QMenuStrings.cpp" line="1430"/>
+ <location filename="../QMenuStrings.cpp" line="1718"/>
+ <location filename="../QMenuStrings.cpp" line="2082"/>
+ <location filename="../QMenuStrings.cpp" line="2823"/>
<source>&Copy</source>
<translation>&KopÃrovat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="101"/>
- <location filename="../QMenuStrings.cpp" line="257"/>
- <location filename="../QMenuStrings.cpp" line="529"/>
- <location filename="../QMenuStrings.cpp" line="1859"/>
- <location filename="../QMenuStrings.cpp" line="3860"/>
- <location filename="../QMenuStrings.cpp" line="4490"/>
+ <location filename="../QMenuStrings.cpp" line="219"/>
+ <location filename="../QMenuStrings.cpp" line="307"/>
+ <location filename="../QMenuStrings.cpp" line="1439"/>
+ <location filename="../QMenuStrings.cpp" line="1727"/>
+ <location filename="../QMenuStrings.cpp" line="2091"/>
+ <location filename="../QMenuStrings.cpp" line="2832"/>
<source>&Paste</source>
<translation>&Vložit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="121"/>
- <location filename="../QMenuStrings.cpp" line="313"/>
- <location filename="../QMenuStrings.cpp" line="365"/>
- <location filename="../QMenuStrings.cpp" line="401"/>
- <location filename="../QMenuStrings.cpp" line="437"/>
- <location filename="../QMenuStrings.cpp" line="1563"/>
- <location filename="../QMenuStrings.cpp" line="1635"/>
- <location filename="../QMenuStrings.cpp" line="1798"/>
- <location filename="../QMenuStrings.cpp" line="3728"/>
- <location filename="../QMenuStrings.cpp" line="4591"/>
- <location filename="../QMenuStrings.cpp" line="4714"/>
+ <location filename="../QMenuStrings.cpp" line="30"/>
+ <location filename="../QMenuStrings.cpp" line="178"/>
+ <location filename="../QMenuStrings.cpp" line="1341"/>
+ <location filename="../QMenuStrings.cpp" line="1828"/>
+ <location filename="../QMenuStrings.cpp" line="1864"/>
+ <location filename="../QMenuStrings.cpp" line="1937"/>
+ <location filename="../QMenuStrings.cpp" line="2631"/>
+ <location filename="../QMenuStrings.cpp" line="4694"/>
+ <location filename="../QMenuStrings.cpp" line="4697"/>
+ <location filename="../QMenuStrings.cpp" line="4700"/>
+ <location filename="../QMenuStrings.cpp" line="4736"/>
<source>Switch to Select Tool</source>
<translation>Přepnout na nástroj pro výběr</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="122"/>
- <location filename="../QMenuStrings.cpp" line="314"/>
- <location filename="../QMenuStrings.cpp" line="4592"/>
- <location filename="../QMenuStrings.cpp" line="4715"/>
+ <location filename="../QMenuStrings.cpp" line="179"/>
+ <location filename="../QMenuStrings.cpp" line="1865"/>
+ <location filename="../QMenuStrings.cpp" line="4695"/>
+ <location filename="../QMenuStrings.cpp" line="4698"/>
<source>Switch to Inserting Notes</source>
<translation>Přepnout na vkládánà not</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="123"/>
- <location filename="../QMenuStrings.cpp" line="315"/>
- <location filename="../QMenuStrings.cpp" line="419"/>
- <location filename="../QMenuStrings.cpp" line="455"/>
- <location filename="../QMenuStrings.cpp" line="1590"/>
- <location filename="../QMenuStrings.cpp" line="1617"/>
- <location filename="../QMenuStrings.cpp" line="1653"/>
- <location filename="../QMenuStrings.cpp" line="3717"/>
- <location filename="../QMenuStrings.cpp" line="3729"/>
- <location filename="../QMenuStrings.cpp" line="4593"/>
- <location filename="../QMenuStrings.cpp" line="4716"/>
+ <location filename="../QMenuStrings.cpp" line="48"/>
+ <location filename="../QMenuStrings.cpp" line="180"/>
+ <location filename="../QMenuStrings.cpp" line="240"/>
+ <location filename="../QMenuStrings.cpp" line="1342"/>
+ <location filename="../QMenuStrings.cpp" line="1866"/>
+ <location filename="../QMenuStrings.cpp" line="1955"/>
+ <location filename="../QMenuStrings.cpp" line="2649"/>
+ <location filename="../QMenuStrings.cpp" line="2702"/>
+ <location filename="../QMenuStrings.cpp" line="4696"/>
+ <location filename="../QMenuStrings.cpp" line="4699"/>
+ <location filename="../QMenuStrings.cpp" line="4727"/>
<source>Switch to Erase Tool</source>
<translation>PÅ™epnout na nástroj pro mazánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="125"/>
- <location filename="../QMenuStrings.cpp" line="174"/>
- <location filename="../QMenuStrings.cpp" line="474"/>
- <location filename="../QMenuStrings.cpp" line="1681"/>
- <location filename="../QMenuStrings.cpp" line="1729"/>
- <location filename="../QMenuStrings.cpp" line="1802"/>
- <location filename="../QMenuStrings.cpp" line="3781"/>
- <location filename="../QMenuStrings.cpp" line="4603"/>
+ <location filename="../QMenuStrings.cpp" line="67"/>
+ <location filename="../QMenuStrings.cpp" line="252"/>
+ <location filename="../QMenuStrings.cpp" line="1356"/>
+ <location filename="../QMenuStrings.cpp" line="1541"/>
+ <location filename="../QMenuStrings.cpp" line="1590"/>
+ <location filename="../QMenuStrings.cpp" line="1868"/>
+ <location filename="../QMenuStrings.cpp" line="2012"/>
+ <location filename="../QMenuStrings.cpp" line="2775"/>
<source>&Save</source>
<translation>&Uložit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="211"/>
+ <location filename="../QMenuStrings.cpp" line="1393"/>
<source>&Insert Event</source>
<translation>&Vložit událost</translation>
</message>
<message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="220"/>
+ <location filename="../QMenuStrings.cpp" line="1402"/>
<source>&Delete Event</source>
<translation>&Odstranit událost</translation>
</message>
<message>
- <source>Delete</source>
- <translation type="obsolete">Smazat</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="229"/>
+ <location filename="../QMenuStrings.cpp" line="1411"/>
<source>&Edit Event</source>
<translation>&Upravit událost</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="238"/>
+ <location filename="../QMenuStrings.cpp" line="1420"/>
<source>&Advanced Event Editor</source>
<translation>&RozÅ¡ÃÅ™ené úpravy události</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="239"/>
- <location filename="../QMenuStrings.cpp" line="511"/>
- <location filename="../QMenuStrings.cpp" line="1841"/>
- <location filename="../QMenuStrings.cpp" line="3842"/>
- <location filename="../QMenuStrings.cpp" line="4472"/>
+ <location filename="../QMenuStrings.cpp" line="289"/>
+ <location filename="../QMenuStrings.cpp" line="1421"/>
+ <location filename="../QMenuStrings.cpp" line="1709"/>
+ <location filename="../QMenuStrings.cpp" line="2073"/>
+ <location filename="../QMenuStrings.cpp" line="2814"/>
<source>Cu&t</source>
<translation>Vyjmou&t</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="266"/>
+ <location filename="../QMenuStrings.cpp" line="1448"/>
<source>&Select All</source>
<translation>&Vybrat vše</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="275"/>
- <location filename="../QMenuStrings.cpp" line="556"/>
+ <location filename="../QMenuStrings.cpp" line="334"/>
+ <location filename="../QMenuStrings.cpp" line="1457"/>
<source>C&lear Selection</source>
<translation>Vyprázd&nit výběr</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="565"/>
- <location filename="../QMenuStrings.cpp" line="1928"/>
+ <location filename="../QMenuStrings.cpp" line="343"/>
+ <location filename="../QMenuStrings.cpp" line="2901"/>
<source>&Filter Selection</source>
<translation>&Filtrovat výběr</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="284"/>
+ <location filename="../QMenuStrings.cpp" line="1466"/>
<source>Set Se&gment Start Time...</source>
<translation>Nastavit poÄáteÄnà Äas Äá&sti...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="285"/>
+ <location filename="../QMenuStrings.cpp" line="1467"/>
<source>Set Seg&ment Duration...</source>
<translation>Nastavit dobu trvánà Äá&sti...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="287"/>
- <location filename="../QMenuStrings.cpp" line="345"/>
- <location filename="../QMenuStrings.cpp" line="575"/>
- <location filename="../QMenuStrings.cpp" line="1939"/>
- <location filename="../QMenuStrings.cpp" line="3935"/>
- <location filename="../QMenuStrings.cpp" line="4695"/>
- <location filename="../QMenuStrings.cpp" line="4755"/>
+ <location filename="../QMenuStrings.cpp" line="159"/>
+ <location filename="../QMenuStrings.cpp" line="353"/>
+ <location filename="../QMenuStrings.cpp" line="1469"/>
+ <location filename="../QMenuStrings.cpp" line="1524"/>
+ <location filename="../QMenuStrings.cpp" line="2166"/>
+ <location filename="../QMenuStrings.cpp" line="2758"/>
+ <location filename="../QMenuStrings.cpp" line="2912"/>
<source>&View</source>
<translation>&Pohled</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="288"/>
- <location filename="../QMenuStrings.cpp" line="346"/>
- <location filename="../QMenuStrings.cpp" line="4696"/>
- <location filename="../QMenuStrings.cpp" line="4756"/>
+ <location filename="../QMenuStrings.cpp" line="160"/>
+ <location filename="../QMenuStrings.cpp" line="1470"/>
+ <location filename="../QMenuStrings.cpp" line="1525"/>
+ <location filename="../QMenuStrings.cpp" line="2759"/>
<source>&Musical Times</source>
<translation>&Hudebnà Äas</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="289"/>
- <location filename="../QMenuStrings.cpp" line="347"/>
- <location filename="../QMenuStrings.cpp" line="4697"/>
- <location filename="../QMenuStrings.cpp" line="4757"/>
+ <location filename="../QMenuStrings.cpp" line="161"/>
+ <location filename="../QMenuStrings.cpp" line="1471"/>
+ <location filename="../QMenuStrings.cpp" line="1526"/>
+ <location filename="../QMenuStrings.cpp" line="2760"/>
<source>&Real Times</source>
<translation>&SkuteÄný Äas</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="290"/>
- <location filename="../QMenuStrings.cpp" line="348"/>
- <location filename="../QMenuStrings.cpp" line="4698"/>
- <location filename="../QMenuStrings.cpp" line="4758"/>
+ <location filename="../QMenuStrings.cpp" line="162"/>
+ <location filename="../QMenuStrings.cpp" line="1472"/>
+ <location filename="../QMenuStrings.cpp" line="1527"/>
+ <location filename="../QMenuStrings.cpp" line="2761"/>
<source>Ra&w Times</source>
<translation>H&rubý Äas</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="293"/>
- <location filename="../QMenuStrings.cpp" line="690"/>
- <location filename="../QMenuStrings.cpp" line="1978"/>
- <location filename="../QMenuStrings.cpp" line="4018"/>
+ <location filename="../QMenuStrings.cpp" line="468"/>
+ <location filename="../QMenuStrings.cpp" line="1475"/>
+ <location filename="../QMenuStrings.cpp" line="2249"/>
+ <location filename="../QMenuStrings.cpp" line="2952"/>
<source>Se&gment</source>
<translation>Čá&st</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="294"/>
- <location filename="../QMenuStrings.cpp" line="691"/>
- <location filename="../QMenuStrings.cpp" line="1979"/>
- <location filename="../QMenuStrings.cpp" line="4028"/>
+ <location filename="../QMenuStrings.cpp" line="469"/>
+ <location filename="../QMenuStrings.cpp" line="1476"/>
+ <location filename="../QMenuStrings.cpp" line="2259"/>
+ <location filename="../QMenuStrings.cpp" line="2953"/>
<source>Edit &With</source>
<translation>Upravit &pomocÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="295"/>
- <location filename="../QMenuStrings.cpp" line="694"/>
- <location filename="../QMenuStrings.cpp" line="1981"/>
- <location filename="../QMenuStrings.cpp" line="4038"/>
- <location filename="../QMenuStrings.cpp" line="4409"/>
+ <location filename="../QMenuStrings.cpp" line="472"/>
+ <location filename="../QMenuStrings.cpp" line="1477"/>
+ <location filename="../QMenuStrings.cpp" line="1646"/>
+ <location filename="../QMenuStrings.cpp" line="2269"/>
+ <location filename="../QMenuStrings.cpp" line="2955"/>
<source>Open in Matri&x Editor</source>
<translation>OtevÅ™Ãt v &tabulkovém editoru</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="296"/>
- <location filename="../QMenuStrings.cpp" line="693"/>
- <location filename="../QMenuStrings.cpp" line="4056"/>
- <location filename="../QMenuStrings.cpp" line="4427"/>
+ <location filename="../QMenuStrings.cpp" line="471"/>
+ <location filename="../QMenuStrings.cpp" line="1478"/>
+ <location filename="../QMenuStrings.cpp" line="1664"/>
+ <location filename="../QMenuStrings.cpp" line="2287"/>
<source>Open in &Notation Editor</source>
<translation>OtevÅ™Ãt v editoru ¬ového zápisu</translation>
</message>
<message>
- <source>Rosegarden &manual</source>
- <translation type="obsolete">&PÅ™ÃruÄka k programu Rosegarden</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1556"/>
- <location filename="../QMenuStrings.cpp" line="3492"/>
- <location filename="../QMenuStrings.cpp" line="4372"/>
+ <location filename="../QMenuStrings.cpp" line="1334"/>
+ <location filename="../QMenuStrings.cpp" line="2603"/>
+ <location filename="../QMenuStrings.cpp" line="4466"/>
<source>About &Qt</source>
<translation>O &Qt</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2843"/>
+ <location filename="../QMenuStrings.cpp" line="3817"/>
<source>Add &Segno</source>
<translation>Přidat &segno</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2844"/>
+ <location filename="../QMenuStrings.cpp" line="3818"/>
<source>Add &Coda</source>
<translation>Přidat &codu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2845"/>
+ <location filename="../QMenuStrings.cpp" line="3819"/>
<source>Add &Breath mark</source>
<translation>PÅ™idat znaÄku pro &nádech</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2010"/>
+ <location filename="../QMenuStrings.cpp" line="2984"/>
<source>Add &Open</source>
<translation>Přidat &otevřeno</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2011"/>
+ <location filename="../QMenuStrings.cpp" line="2985"/>
<source>Add &Stopped</source>
<translation>Přidat &zastaveno</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2938"/>
+ <location filename="../QMenuStrings.cpp" line="3912"/>
<source>Dotted Ha&lf Note</source>
<translation>TeÄkovaná &půlová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3730"/>
+ <location filename="../QMenuStrings.cpp" line="1343"/>
<source>Switch To &Notes</source>
<translation>PÅ™epnout na ¬y</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3731"/>
+ <location filename="../QMenuStrings.cpp" line="1344"/>
<source>Switch To &Rests</source>
<translation>Přepnout na &pomlky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3732"/>
+ <location filename="../QMenuStrings.cpp" line="1345"/>
<source>To&ggle Dot On</source>
<translation>&Zapnout teÄky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3733"/>
+ <location filename="../QMenuStrings.cpp" line="1346"/>
<source>To&ggle Dot Off</source>
<translation>&Vypnout teÄky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1955"/>
+ <location filename="../QMenuStrings.cpp" line="2928"/>
<source>Show &Symbols Toolbar</source>
<translation>Ukázat nástrojový pruh se &symboly</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3497"/>
+ <location filename="../QMenuStrings.cpp" line="4471"/>
<source>Duration Toolbar</source>
<translation>Nástrojový pruh s dobami trvánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3680"/>
+ <location filename="../QMenuStrings.cpp" line="4654"/>
<source>Symbols Toolbar</source>
<translation>Nástrojový pruh se symboly</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4388"/>
+ <location filename="../QMenuStrings.cpp" line="2619"/>
<source>Home</source>
<comment>keyboard shortcut</comment>
<translation>Home</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4397"/>
+ <location filename="../QMenuStrings.cpp" line="2628"/>
<source>End</source>
<comment>keyboard shortcut</comment>
<translation>End</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4699"/>
+ <location filename="../QMenuStrings.cpp" line="163"/>
<source>Show &Toolbar</source>
<translation>Ukázat ná&strojový pruh</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4700"/>
+ <location filename="../QMenuStrings.cpp" line="164"/>
<source>Hide St&atusbar</source>
<translation>Skrýt stavo&vý řádek</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="308"/>
- <location filename="../QMenuStrings.cpp" line="311"/>
- <location filename="../QMenuStrings.cpp" line="1561"/>
- <location filename="../QMenuStrings.cpp" line="4712"/>
+ <location filename="../QMenuStrings.cpp" line="176"/>
+ <location filename="../QMenuStrings.cpp" line="1339"/>
+ <location filename="../QMenuStrings.cpp" line="1490"/>
+ <location filename="../QMenuStrings.cpp" line="1493"/>
<source>Actions Toolbar</source>
<translation>Nástrojový pruh pro Äinnosti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="309"/>
- <location filename="../QMenuStrings.cpp" line="360"/>
- <location filename="../QMenuStrings.cpp" line="4713"/>
- <location filename="../QMenuStrings.cpp" line="4770"/>
+ <location filename="../QMenuStrings.cpp" line="177"/>
+ <location filename="../QMenuStrings.cpp" line="1491"/>
+ <location filename="../QMenuStrings.cpp" line="1539"/>
+ <location filename="../QMenuStrings.cpp" line="2773"/>
<source>Time Toolbar</source>
<translation>Nástrojový pruh pro Äas</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="310"/>
- <location filename="../QMenuStrings.cpp" line="1560"/>
- <location filename="../QMenuStrings.cpp" line="1727"/>
- <location filename="../QMenuStrings.cpp" line="1797"/>
- <location filename="../QMenuStrings.cpp" line="3496"/>
- <location filename="../QMenuStrings.cpp" line="4380"/>
+ <location filename="../QMenuStrings.cpp" line="1338"/>
+ <location filename="../QMenuStrings.cpp" line="1492"/>
+ <location filename="../QMenuStrings.cpp" line="1636"/>
+ <location filename="../QMenuStrings.cpp" line="1936"/>
+ <location filename="../QMenuStrings.cpp" line="2611"/>
+ <location filename="../QMenuStrings.cpp" line="4470"/>
<source>Transport Toolbar</source>
<translation>Nástrojový pruh pro přesun</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="312"/>
- <location filename="../QMenuStrings.cpp" line="4399"/>
+ <location filename="../QMenuStrings.cpp" line="1494"/>
+ <location filename="../QMenuStrings.cpp" line="2630"/>
<source>Zoom Toolbar</source>
<translation>Nástrojový pruh pro pÅ™iblÞenÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="361"/>
+ <location filename="../QMenuStrings.cpp" line="4690"/>
<source>Insert Marker</source>
<translation>Vložit znaÄku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="362"/>
+ <location filename="../QMenuStrings.cpp" line="4691"/>
<source>Insert Marker at Playback Position</source>
<translation>Vložit znaÄku v poloze pÅ™ehrávánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="363"/>
+ <location filename="../QMenuStrings.cpp" line="4692"/>
<source>Delete Marker</source>
<translation>Odstranit znaÄku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="364"/>
+ <location filename="../QMenuStrings.cpp" line="4693"/>
<source>Edit Marker</source>
<translation>Upravit znaÄku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="374"/>
- <location filename="../QMenuStrings.cpp" line="446"/>
- <location filename="../QMenuStrings.cpp" line="1572"/>
- <location filename="../QMenuStrings.cpp" line="1608"/>
- <location filename="../QMenuStrings.cpp" line="1662"/>
+ <location filename="../QMenuStrings.cpp" line="1946"/>
+ <location filename="../QMenuStrings.cpp" line="2658"/>
+ <location filename="../QMenuStrings.cpp" line="2693"/>
+ <location filename="../QMenuStrings.cpp" line="4709"/>
+ <location filename="../QMenuStrings.cpp" line="4745"/>
<source>Switch to Move Tool</source>
<translation>Přepnout na nástroj pro přesun</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="383"/>
- <location filename="../QMenuStrings.cpp" line="410"/>
- <location filename="../QMenuStrings.cpp" line="1581"/>
- <location filename="../QMenuStrings.cpp" line="1599"/>
- <location filename="../QMenuStrings.cpp" line="1644"/>
+ <location filename="../QMenuStrings.cpp" line="39"/>
+ <location filename="../QMenuStrings.cpp" line="2640"/>
+ <location filename="../QMenuStrings.cpp" line="2684"/>
+ <location filename="../QMenuStrings.cpp" line="4718"/>
+ <location filename="../QMenuStrings.cpp" line="4754"/>
<source>Switch to Draw Tool</source>
<translation>PÅ™epnout na nástroj pro kreslenÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="392"/>
- <location filename="../QMenuStrings.cpp" line="428"/>
- <location filename="../QMenuStrings.cpp" line="464"/>
- <location filename="../QMenuStrings.cpp" line="1626"/>
- <location filename="../QMenuStrings.cpp" line="1671"/>
+ <location filename="../QMenuStrings.cpp" line="57"/>
+ <location filename="../QMenuStrings.cpp" line="1964"/>
+ <location filename="../QMenuStrings.cpp" line="2667"/>
+ <location filename="../QMenuStrings.cpp" line="2711"/>
+ <location filename="../QMenuStrings.cpp" line="4763"/>
<source>Switch to Resize Tool</source>
<translation>Přepnout na nástroj pro změnu velikosti</translation>
</message>
<message>
- <source>E&dit</source>
- <translation type="obsolete">U&pravit</translation>
- </message>
- <message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">&Nic pro vzetà zpět</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">&Nic pro provedenà znovu</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="538"/>
- <location filename="../QMenuStrings.cpp" line="3878"/>
- <location filename="../QMenuStrings.cpp" line="4499"/>
- <location filename="../QMenuStrings.cpp" line="4658"/>
+ <location filename="../QMenuStrings.cpp" line="122"/>
+ <location filename="../QMenuStrings.cpp" line="316"/>
+ <location filename="../QMenuStrings.cpp" line="1736"/>
+ <location filename="../QMenuStrings.cpp" line="2109"/>
<source>&Delete</source>
<translation>&Smazat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="576"/>
+ <location filename="../QMenuStrings.cpp" line="354"/>
<source>&Grid</source>
<translation>&MřÞka</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="577"/>
+ <location filename="../QMenuStrings.cpp" line="355"/>
<source>&No Snap</source>
<translation>&Bez zapadávánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="578"/>
+ <location filename="../QMenuStrings.cpp" line="356"/>
<source>&Snap to 1/64</source>
<translation>&Zapadnout do 1/64</translation>
</message>
<message>
- <source>0</source>
- <translation type="obsolete">0</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="587"/>
+ <location filename="../QMenuStrings.cpp" line="365"/>
<source>Snap to &1/48</source>
<translation>Zapadnout do &1/48</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="588"/>
+ <location filename="../QMenuStrings.cpp" line="366"/>
<source>Sn&ap to 1/32</source>
<translation>Za&padnout do 1/32</translation>
</message>
<message>
- <source>3</source>
- <translation type="obsolete">3</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="597"/>
+ <location filename="../QMenuStrings.cpp" line="375"/>
<source>Snap to 1/&24</source>
<translation>Zapadnout do 1/&24</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="598"/>
+ <location filename="../QMenuStrings.cpp" line="376"/>
<source>Sna&p to 1/16</source>
<translation>Zapad&nout do 1/16</translation>
</message>
<message>
- <source>6</source>
- <translation type="obsolete">6</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="607"/>
+ <location filename="../QMenuStrings.cpp" line="385"/>
<source>Snap t&o 1/12</source>
<translation>Zapadnout &do 1/12</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="608"/>
+ <location filename="../QMenuStrings.cpp" line="386"/>
<source>Snap to 1/&8</source>
<translation>Zapadnout do 1/&8</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="617"/>
+ <location filename="../QMenuStrings.cpp" line="395"/>
<source>Snap to &3/16</source>
<translation>Zapadnout do &3/16</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="618"/>
+ <location filename="../QMenuStrings.cpp" line="396"/>
<source>Snap to 1/4</source>
<translation>Zapadnout do 1/4</translation>
</message>
<message>
- <source>4</source>
- <translation type="obsolete">4</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="627"/>
+ <location filename="../QMenuStrings.cpp" line="405"/>
<source>Snap to 3/8</source>
<translation>Zapadnout do 3/8</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="628"/>
+ <location filename="../QMenuStrings.cpp" line="406"/>
<source>Snap to 1/2</source>
<translation>Zapadnout do 1/2</translation>
</message>
<message>
- <source>2</source>
- <translation type="obsolete">2</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="637"/>
+ <location filename="../QMenuStrings.cpp" line="415"/>
<source>Snap to Bea&t</source>
<translation>Zapadnout do &doby</translation>
</message>
<message>
- <source>1</source>
- <translation type="obsolete">1</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="646"/>
+ <location filename="../QMenuStrings.cpp" line="424"/>
<source>Snap to &Bar</source>
<translation>Zapadnout k &taktové Äáře</translation>
</message>
<message>
- <source>5</source>
- <translation type="obsolete">5</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="687"/>
- <location filename="../QMenuStrings.cpp" line="1975"/>
- <location filename="../QMenuStrings.cpp" line="3970"/>
+ <location filename="../QMenuStrings.cpp" line="465"/>
+ <location filename="../QMenuStrings.cpp" line="2201"/>
+ <location filename="../QMenuStrings.cpp" line="2948"/>
<source>&Composition</source>
<translation>&Skladba</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="688"/>
- <location filename="../QMenuStrings.cpp" line="1976"/>
- <location filename="../QMenuStrings.cpp" line="3971"/>
- <location filename="../QMenuStrings.cpp" line="4640"/>
+ <location filename="../QMenuStrings.cpp" line="104"/>
+ <location filename="../QMenuStrings.cpp" line="466"/>
+ <location filename="../QMenuStrings.cpp" line="2202"/>
+ <location filename="../QMenuStrings.cpp" line="2949"/>
<source>Add Te&mpo Change...</source>
<translation>Přidat změnu te&mpa...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="689"/>
- <location filename="../QMenuStrings.cpp" line="1977"/>
- <location filename="../QMenuStrings.cpp" line="3972"/>
- <location filename="../QMenuStrings.cpp" line="4649"/>
+ <location filename="../QMenuStrings.cpp" line="113"/>
+ <location filename="../QMenuStrings.cpp" line="467"/>
+ <location filename="../QMenuStrings.cpp" line="2203"/>
+ <location filename="../QMenuStrings.cpp" line="2950"/>
<source>Add Time Si&gnature Change...</source>
<translation>PÅ™idat zmÄ›nu &taktového oznaÄenÃ...</translation>
</message>
<message>
- <source>&Segment</source>
- <translation type="obsolete">&Část</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="692"/>
- <location filename="../QMenuStrings.cpp" line="1980"/>
- <location filename="../QMenuStrings.cpp" line="4065"/>
- <location filename="../QMenuStrings.cpp" line="4436"/>
+ <location filename="../QMenuStrings.cpp" line="470"/>
+ <location filename="../QMenuStrings.cpp" line="1673"/>
+ <location filename="../QMenuStrings.cpp" line="2296"/>
+ <location filename="../QMenuStrings.cpp" line="2954"/>
<source>Open in &Event List Editor</source>
<translation>OtevÅ™Ãt v editoru seznamu &událostÃ</translation>
</message>
<message>
- <source>Set Segment Start &Time...</source>
- <translation type="obsolete">Nastavit poÄáteÄnà Ä&as Äásti...</translation>
- </message>
- <message>
- <source>Set Segment &Duration...</source>
- <translation type="obsolete">Nastavit &dobu trvánà Äásti...</translation>
- </message>
- <message>
- <source>Left</source>
- <translation type="obsolete">Vlevo</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="951"/>
- <location filename="../QMenuStrings.cpp" line="2705"/>
+ <location filename="../QMenuStrings.cpp" line="729"/>
+ <location filename="../QMenuStrings.cpp" line="3679"/>
<source>Step Back (Left)</source>
<translation>Krok zpět (vlevo)</translation>
</message>
<message>
- <source>Right</source>
- <translation type="obsolete">Vpravo</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="966"/>
- <location filename="../QMenuStrings.cpp" line="2720"/>
+ <location filename="../QMenuStrings.cpp" line="744"/>
+ <location filename="../QMenuStrings.cpp" line="3694"/>
<source>Step Forward (Right)</source>
<translation>Krok vpřed (vpravo)</translation>
</message>
<message>
- <source>Ctrl+R</source>
- <translation type="obsolete">Ctrl+R</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="699"/>
- <location filename="../QMenuStrings.cpp" line="2269"/>
+ <location filename="../QMenuStrings.cpp" line="477"/>
+ <location filename="../QMenuStrings.cpp" line="3243"/>
<source>Ad&just</source>
<translation>&PÅ™izpůsobenÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="700"/>
- <location filename="../QMenuStrings.cpp" line="2455"/>
+ <location filename="../QMenuStrings.cpp" line="478"/>
+ <location filename="../QMenuStrings.cpp" line="3429"/>
<source>&Quantize</source>
<translation>&Kvantizovat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="40"/>
- <location filename="../QMenuStrings.cpp" line="71"/>
- <location filename="../QMenuStrings.cpp" line="141"/>
- <location filename="../QMenuStrings.cpp" line="190"/>
- <location filename="../QMenuStrings.cpp" line="324"/>
- <location filename="../QMenuStrings.cpp" line="490"/>
- <location filename="../QMenuStrings.cpp" line="1697"/>
- <location filename="../QMenuStrings.cpp" line="1745"/>
- <location filename="../QMenuStrings.cpp" line="1820"/>
- <location filename="../QMenuStrings.cpp" line="3812"/>
- <location filename="../QMenuStrings.cpp" line="4619"/>
- <location filename="../QMenuStrings.cpp" line="4725"/>
+ <location filename="../QMenuStrings.cpp" line="83"/>
+ <location filename="../QMenuStrings.cpp" line="189"/>
+ <location filename="../QMenuStrings.cpp" line="268"/>
+ <location filename="../QMenuStrings.cpp" line="1372"/>
+ <location filename="../QMenuStrings.cpp" line="1503"/>
+ <location filename="../QMenuStrings.cpp" line="1557"/>
+ <location filename="../QMenuStrings.cpp" line="1606"/>
+ <location filename="../QMenuStrings.cpp" line="1841"/>
+ <location filename="../QMenuStrings.cpp" line="1884"/>
+ <location filename="../QMenuStrings.cpp" line="2043"/>
+ <location filename="../QMenuStrings.cpp" line="2728"/>
+ <location filename="../QMenuStrings.cpp" line="2793"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="49"/>
+ <location filename="../QMenuStrings.cpp" line="1850"/>
<source>Insert into Selected Audio Track</source>
<translation>Vložit do vybrané zvukové stopy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="50"/>
+ <location filename="../QMenuStrings.cpp" line="1851"/>
<source>Distribute Audio on MIDI Segment</source>
<translation>RozdÄ›lovat zvuk nad Äástà MIDI</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="52"/>
+ <location filename="../QMenuStrings.cpp" line="1853"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="59"/>
- <location filename="../QMenuStrings.cpp" line="118"/>
- <location filename="../QMenuStrings.cpp" line="170"/>
- <location filename="../QMenuStrings.cpp" line="305"/>
- <location filename="../QMenuStrings.cpp" line="357"/>
- <location filename="../QMenuStrings.cpp" line="1551"/>
- <location filename="../QMenuStrings.cpp" line="1724"/>
- <location filename="../QMenuStrings.cpp" line="1794"/>
- <location filename="../QMenuStrings.cpp" line="3487"/>
- <location filename="../QMenuStrings.cpp" line="4367"/>
- <location filename="../QMenuStrings.cpp" line="4709"/>
- <location filename="../QMenuStrings.cpp" line="4767"/>
- <source>F1</source>
- <comment>keyboard shortcut</comment>
+ <location filename="../QMenuStrings.cpp" line="173"/>
+ <location filename="../QMenuStrings.cpp" line="236"/>
+ <location filename="../QMenuStrings.cpp" line="1329"/>
+ <location filename="../QMenuStrings.cpp" line="1487"/>
+ <location filename="../QMenuStrings.cpp" line="1536"/>
+ <location filename="../QMenuStrings.cpp" line="1586"/>
+ <location filename="../QMenuStrings.cpp" line="1633"/>
+ <location filename="../QMenuStrings.cpp" line="1860"/>
+ <location filename="../QMenuStrings.cpp" line="1933"/>
+ <location filename="../QMenuStrings.cpp" line="2598"/>
+ <location filename="../QMenuStrings.cpp" line="2770"/>
+ <location filename="../QMenuStrings.cpp" line="4461"/>
+ <source>F1</source>
+ <comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="81"/>
- <location filename="../QMenuStrings.cpp" line="151"/>
- <location filename="../QMenuStrings.cpp" line="200"/>
- <location filename="../QMenuStrings.cpp" line="334"/>
- <location filename="../QMenuStrings.cpp" line="500"/>
- <location filename="../QMenuStrings.cpp" line="1830"/>
- <location filename="../QMenuStrings.cpp" line="3831"/>
- <location filename="../QMenuStrings.cpp" line="4461"/>
- <location filename="../QMenuStrings.cpp" line="4629"/>
- <location filename="../QMenuStrings.cpp" line="4735"/>
+ <location filename="../QMenuStrings.cpp" line="93"/>
+ <location filename="../QMenuStrings.cpp" line="199"/>
+ <location filename="../QMenuStrings.cpp" line="278"/>
+ <location filename="../QMenuStrings.cpp" line="1382"/>
+ <location filename="../QMenuStrings.cpp" line="1513"/>
+ <location filename="../QMenuStrings.cpp" line="1567"/>
+ <location filename="../QMenuStrings.cpp" line="1698"/>
+ <location filename="../QMenuStrings.cpp" line="2062"/>
+ <location filename="../QMenuStrings.cpp" line="2738"/>
+ <location filename="../QMenuStrings.cpp" line="2803"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="90"/>
- <location filename="../QMenuStrings.cpp" line="160"/>
- <location filename="../QMenuStrings.cpp" line="209"/>
- <location filename="../QMenuStrings.cpp" line="343"/>
- <location filename="../QMenuStrings.cpp" line="509"/>
- <location filename="../QMenuStrings.cpp" line="1839"/>
- <location filename="../QMenuStrings.cpp" line="3840"/>
- <location filename="../QMenuStrings.cpp" line="4470"/>
- <location filename="../QMenuStrings.cpp" line="4638"/>
- <location filename="../QMenuStrings.cpp" line="4744"/>
+ <location filename="../QMenuStrings.cpp" line="102"/>
+ <location filename="../QMenuStrings.cpp" line="208"/>
+ <location filename="../QMenuStrings.cpp" line="287"/>
+ <location filename="../QMenuStrings.cpp" line="1391"/>
+ <location filename="../QMenuStrings.cpp" line="1522"/>
+ <location filename="../QMenuStrings.cpp" line="1576"/>
+ <location filename="../QMenuStrings.cpp" line="1707"/>
+ <location filename="../QMenuStrings.cpp" line="2071"/>
+ <location filename="../QMenuStrings.cpp" line="2747"/>
+ <location filename="../QMenuStrings.cpp" line="2812"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="99"/>
- <location filename="../QMenuStrings.cpp" line="255"/>
- <location filename="../QMenuStrings.cpp" line="527"/>
- <location filename="../QMenuStrings.cpp" line="1857"/>
- <location filename="../QMenuStrings.cpp" line="3858"/>
- <location filename="../QMenuStrings.cpp" line="4488"/>
+ <location filename="../QMenuStrings.cpp" line="217"/>
+ <location filename="../QMenuStrings.cpp" line="305"/>
+ <location filename="../QMenuStrings.cpp" line="1437"/>
+ <location filename="../QMenuStrings.cpp" line="1725"/>
+ <location filename="../QMenuStrings.cpp" line="2089"/>
+ <location filename="../QMenuStrings.cpp" line="2830"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="108"/>
- <location filename="../QMenuStrings.cpp" line="264"/>
- <location filename="../QMenuStrings.cpp" line="536"/>
- <location filename="../QMenuStrings.cpp" line="1866"/>
- <location filename="../QMenuStrings.cpp" line="3867"/>
- <location filename="../QMenuStrings.cpp" line="4497"/>
+ <location filename="../QMenuStrings.cpp" line="226"/>
+ <location filename="../QMenuStrings.cpp" line="314"/>
+ <location filename="../QMenuStrings.cpp" line="1446"/>
+ <location filename="../QMenuStrings.cpp" line="1734"/>
+ <location filename="../QMenuStrings.cpp" line="2098"/>
+ <location filename="../QMenuStrings.cpp" line="2839"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="132"/>
- <location filename="../QMenuStrings.cpp" line="181"/>
- <location filename="../QMenuStrings.cpp" line="481"/>
- <location filename="../QMenuStrings.cpp" line="1688"/>
- <location filename="../QMenuStrings.cpp" line="1736"/>
- <location filename="../QMenuStrings.cpp" line="1809"/>
- <location filename="../QMenuStrings.cpp" line="3788"/>
- <location filename="../QMenuStrings.cpp" line="4610"/>
+ <location filename="../QMenuStrings.cpp" line="74"/>
+ <location filename="../QMenuStrings.cpp" line="259"/>
+ <location filename="../QMenuStrings.cpp" line="1363"/>
+ <location filename="../QMenuStrings.cpp" line="1548"/>
+ <location filename="../QMenuStrings.cpp" line="1597"/>
+ <location filename="../QMenuStrings.cpp" line="1875"/>
+ <location filename="../QMenuStrings.cpp" line="2019"/>
+ <location filename="../QMenuStrings.cpp" line="2782"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="218"/>
- <location filename="../QMenuStrings.cpp" line="1350"/>
- <location filename="../QMenuStrings.cpp" line="3258"/>
- <location filename="../QMenuStrings.cpp" line="4081"/>
- <location filename="../QMenuStrings.cpp" line="4452"/>
- <location filename="../QMenuStrings.cpp" line="4647"/>
+ <location filename="../QMenuStrings.cpp" line="111"/>
+ <location filename="../QMenuStrings.cpp" line="1128"/>
+ <location filename="../QMenuStrings.cpp" line="1400"/>
+ <location filename="../QMenuStrings.cpp" line="1689"/>
+ <location filename="../QMenuStrings.cpp" line="2312"/>
+ <location filename="../QMenuStrings.cpp" line="4232"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="227"/>
- <location filename="../QMenuStrings.cpp" line="1893"/>
- <location filename="../QMenuStrings.cpp" line="3885"/>
- <location filename="../QMenuStrings.cpp" line="4506"/>
+ <location filename="../QMenuStrings.cpp" line="1409"/>
+ <location filename="../QMenuStrings.cpp" line="1743"/>
+ <location filename="../QMenuStrings.cpp" line="2116"/>
+ <location filename="../QMenuStrings.cpp" line="2866"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="236"/>
- <location filename="../QMenuStrings.cpp" line="1287"/>
- <location filename="../QMenuStrings.cpp" line="3195"/>
- <location filename="../QMenuStrings.cpp" line="4072"/>
- <location filename="../QMenuStrings.cpp" line="4443"/>
- <location filename="../QMenuStrings.cpp" line="4674"/>
+ <location filename="../QMenuStrings.cpp" line="138"/>
+ <location filename="../QMenuStrings.cpp" line="1065"/>
+ <location filename="../QMenuStrings.cpp" line="1418"/>
+ <location filename="../QMenuStrings.cpp" line="1680"/>
+ <location filename="../QMenuStrings.cpp" line="2303"/>
+ <location filename="../QMenuStrings.cpp" line="4169"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="246"/>
- <location filename="../QMenuStrings.cpp" line="518"/>
- <location filename="../QMenuStrings.cpp" line="1848"/>
- <location filename="../QMenuStrings.cpp" line="3849"/>
- <location filename="../QMenuStrings.cpp" line="4479"/>
+ <location filename="../QMenuStrings.cpp" line="296"/>
+ <location filename="../QMenuStrings.cpp" line="1428"/>
+ <location filename="../QMenuStrings.cpp" line="1716"/>
+ <location filename="../QMenuStrings.cpp" line="2080"/>
+ <location filename="../QMenuStrings.cpp" line="2821"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="273"/>
- <location filename="../QMenuStrings.cpp" line="554"/>
- <location filename="../QMenuStrings.cpp" line="1908"/>
- <location filename="../QMenuStrings.cpp" line="3932"/>
- <location filename="../QMenuStrings.cpp" line="4683"/>
+ <location filename="../QMenuStrings.cpp" line="147"/>
+ <location filename="../QMenuStrings.cpp" line="332"/>
+ <location filename="../QMenuStrings.cpp" line="1455"/>
+ <location filename="../QMenuStrings.cpp" line="2163"/>
+ <location filename="../QMenuStrings.cpp" line="2881"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="282"/>
- <location filename="../QMenuStrings.cpp" line="563"/>
- <location filename="../QMenuStrings.cpp" line="1917"/>
- <location filename="../QMenuStrings.cpp" line="4692"/>
+ <location filename="../QMenuStrings.cpp" line="156"/>
+ <location filename="../QMenuStrings.cpp" line="341"/>
+ <location filename="../QMenuStrings.cpp" line="1464"/>
+ <location filename="../QMenuStrings.cpp" line="2890"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="572"/>
- <location filename="../QMenuStrings.cpp" line="1935"/>
+ <location filename="../QMenuStrings.cpp" line="350"/>
+ <location filename="../QMenuStrings.cpp" line="2908"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="372"/>
- <location filename="../QMenuStrings.cpp" line="408"/>
- <location filename="../QMenuStrings.cpp" line="444"/>
- <location filename="../QMenuStrings.cpp" line="1015"/>
- <location filename="../QMenuStrings.cpp" line="1570"/>
- <location filename="../QMenuStrings.cpp" line="1642"/>
- <location filename="../QMenuStrings.cpp" line="2808"/>
- <location filename="../QMenuStrings.cpp" line="4239"/>
- <location filename="../QMenuStrings.cpp" line="4544"/>
+ <location filename="../QMenuStrings.cpp" line="37"/>
+ <location filename="../QMenuStrings.cpp" line="793"/>
+ <location filename="../QMenuStrings.cpp" line="1781"/>
+ <location filename="../QMenuStrings.cpp" line="1944"/>
+ <location filename="../QMenuStrings.cpp" line="2470"/>
+ <location filename="../QMenuStrings.cpp" line="2638"/>
+ <location filename="../QMenuStrings.cpp" line="3782"/>
+ <location filename="../QMenuStrings.cpp" line="4707"/>
+ <location filename="../QMenuStrings.cpp" line="4743"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="381"/>
- <location filename="../QMenuStrings.cpp" line="453"/>
- <location filename="../QMenuStrings.cpp" line="1042"/>
- <location filename="../QMenuStrings.cpp" line="1579"/>
- <location filename="../QMenuStrings.cpp" line="1615"/>
- <location filename="../QMenuStrings.cpp" line="1669"/>
- <location filename="../QMenuStrings.cpp" line="4266"/>
- <location filename="../QMenuStrings.cpp" line="4553"/>
+ <location filename="../QMenuStrings.cpp" line="820"/>
+ <location filename="../QMenuStrings.cpp" line="1790"/>
+ <location filename="../QMenuStrings.cpp" line="1953"/>
+ <location filename="../QMenuStrings.cpp" line="2497"/>
+ <location filename="../QMenuStrings.cpp" line="2665"/>
+ <location filename="../QMenuStrings.cpp" line="2700"/>
+ <location filename="../QMenuStrings.cpp" line="4716"/>
+ <location filename="../QMenuStrings.cpp" line="4752"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="390"/>
- <location filename="../QMenuStrings.cpp" line="417"/>
- <location filename="../QMenuStrings.cpp" line="1024"/>
- <location filename="../QMenuStrings.cpp" line="1588"/>
- <location filename="../QMenuStrings.cpp" line="1606"/>
- <location filename="../QMenuStrings.cpp" line="1651"/>
- <location filename="../QMenuStrings.cpp" line="2818"/>
- <location filename="../QMenuStrings.cpp" line="4248"/>
- <location filename="../QMenuStrings.cpp" line="4562"/>
+ <location filename="../QMenuStrings.cpp" line="46"/>
+ <location filename="../QMenuStrings.cpp" line="802"/>
+ <location filename="../QMenuStrings.cpp" line="1799"/>
+ <location filename="../QMenuStrings.cpp" line="2479"/>
+ <location filename="../QMenuStrings.cpp" line="2647"/>
+ <location filename="../QMenuStrings.cpp" line="2691"/>
+ <location filename="../QMenuStrings.cpp" line="3792"/>
+ <location filename="../QMenuStrings.cpp" line="4725"/>
+ <location filename="../QMenuStrings.cpp" line="4761"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="399"/>
- <location filename="../QMenuStrings.cpp" line="435"/>
- <location filename="../QMenuStrings.cpp" line="471"/>
- <location filename="../QMenuStrings.cpp" line="1051"/>
- <location filename="../QMenuStrings.cpp" line="1633"/>
- <location filename="../QMenuStrings.cpp" line="1678"/>
- <location filename="../QMenuStrings.cpp" line="4275"/>
- <location filename="../QMenuStrings.cpp" line="4580"/>
+ <location filename="../QMenuStrings.cpp" line="64"/>
+ <location filename="../QMenuStrings.cpp" line="829"/>
+ <location filename="../QMenuStrings.cpp" line="1817"/>
+ <location filename="../QMenuStrings.cpp" line="1971"/>
+ <location filename="../QMenuStrings.cpp" line="2506"/>
+ <location filename="../QMenuStrings.cpp" line="2674"/>
+ <location filename="../QMenuStrings.cpp" line="2718"/>
+ <location filename="../QMenuStrings.cpp" line="4770"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="426"/>
- <location filename="../QMenuStrings.cpp" line="462"/>
- <location filename="../QMenuStrings.cpp" line="1033"/>
- <location filename="../QMenuStrings.cpp" line="1597"/>
- <location filename="../QMenuStrings.cpp" line="1624"/>
- <location filename="../QMenuStrings.cpp" line="1660"/>
- <location filename="../QMenuStrings.cpp" line="2827"/>
- <location filename="../QMenuStrings.cpp" line="4257"/>
- <location filename="../QMenuStrings.cpp" line="4571"/>
+ <location filename="../QMenuStrings.cpp" line="55"/>
+ <location filename="../QMenuStrings.cpp" line="811"/>
+ <location filename="../QMenuStrings.cpp" line="1808"/>
+ <location filename="../QMenuStrings.cpp" line="1962"/>
+ <location filename="../QMenuStrings.cpp" line="2488"/>
+ <location filename="../QMenuStrings.cpp" line="2656"/>
+ <location filename="../QMenuStrings.cpp" line="2709"/>
+ <location filename="../QMenuStrings.cpp" line="3801"/>
+ <location filename="../QMenuStrings.cpp" line="4734"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="493"/>
+ <location filename="../QMenuStrings.cpp" line="271"/>
<source>Nothing to &Undo</source>
<translation>Nic pro vzetà &zpět</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="502"/>
+ <location filename="../QMenuStrings.cpp" line="280"/>
<source>Nothing to &Redo</source>
<translation>Nic pro provedenà z&novu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="545"/>
- <location filename="../QMenuStrings.cpp" line="4665"/>
+ <location filename="../QMenuStrings.cpp" line="129"/>
+ <location filename="../QMenuStrings.cpp" line="323"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="585"/>
- <location filename="../QMenuStrings.cpp" line="2935"/>
+ <location filename="../QMenuStrings.cpp" line="363"/>
+ <location filename="../QMenuStrings.cpp" line="3909"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="595"/>
- <location filename="../QMenuStrings.cpp" line="2926"/>
+ <location filename="../QMenuStrings.cpp" line="373"/>
+ <location filename="../QMenuStrings.cpp" line="3900"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="605"/>
- <location filename="../QMenuStrings.cpp" line="2917"/>
+ <location filename="../QMenuStrings.cpp" line="383"/>
+ <location filename="../QMenuStrings.cpp" line="3891"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="615"/>
- <location filename="../QMenuStrings.cpp" line="2908"/>
+ <location filename="../QMenuStrings.cpp" line="393"/>
+ <location filename="../QMenuStrings.cpp" line="3882"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="625"/>
- <location filename="../QMenuStrings.cpp" line="2899"/>
+ <location filename="../QMenuStrings.cpp" line="403"/>
+ <location filename="../QMenuStrings.cpp" line="3873"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="635"/>
- <location filename="../QMenuStrings.cpp" line="2890"/>
+ <location filename="../QMenuStrings.cpp" line="413"/>
+ <location filename="../QMenuStrings.cpp" line="3864"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="644"/>
- <location filename="../QMenuStrings.cpp" line="2881"/>
+ <location filename="../QMenuStrings.cpp" line="422"/>
+ <location filename="../QMenuStrings.cpp" line="3855"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="653"/>
- <location filename="../QMenuStrings.cpp" line="2872"/>
+ <location filename="../QMenuStrings.cpp" line="431"/>
+ <location filename="../QMenuStrings.cpp" line="3846"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="701"/>
- <location filename="../QMenuStrings.cpp" line="2456"/>
- <location filename="../QMenuStrings.cpp" line="4084"/>
- <location filename="../QMenuStrings.cpp" line="4517"/>
+ <location filename="../QMenuStrings.cpp" line="479"/>
+ <location filename="../QMenuStrings.cpp" line="1754"/>
+ <location filename="../QMenuStrings.cpp" line="2315"/>
+ <location filename="../QMenuStrings.cpp" line="3430"/>
<source>&Quantize...</source>
<translation>&Kvantizovat...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="708"/>
- <location filename="../QMenuStrings.cpp" line="2463"/>
- <location filename="../QMenuStrings.cpp" line="4091"/>
- <location filename="../QMenuStrings.cpp" line="4524"/>
+ <location filename="../QMenuStrings.cpp" line="486"/>
+ <location filename="../QMenuStrings.cpp" line="1761"/>
+ <location filename="../QMenuStrings.cpp" line="2322"/>
+ <location filename="../QMenuStrings.cpp" line="3437"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="710"/>
+ <location filename="../QMenuStrings.cpp" line="488"/>
<source>&Repeat Last Quantize</source>
<translation>&Opakovat poslednà kvantizaci</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="717"/>
- <location filename="../QMenuStrings.cpp" line="4100"/>
- <location filename="../QMenuStrings.cpp" line="4533"/>
+ <location filename="../QMenuStrings.cpp" line="495"/>
+ <location filename="../QMenuStrings.cpp" line="1770"/>
+ <location filename="../QMenuStrings.cpp" line="2331"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="719"/>
+ <location filename="../QMenuStrings.cpp" line="497"/>
<source>&Legato</source>
<translation>&Legato</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="726"/>
+ <location filename="../QMenuStrings.cpp" line="504"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="728"/>
- <location filename="../QMenuStrings.cpp" line="2282"/>
+ <location filename="../QMenuStrings.cpp" line="506"/>
+ <location filename="../QMenuStrings.cpp" line="3256"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>Sjednotit noty st&ejné tónové výšky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="737"/>
- <location filename="../QMenuStrings.cpp" line="2558"/>
- <location filename="../QMenuStrings.cpp" line="4108"/>
+ <location filename="../QMenuStrings.cpp" line="515"/>
+ <location filename="../QMenuStrings.cpp" line="2339"/>
+ <location filename="../QMenuStrings.cpp" line="3532"/>
<source>Jog &Left</source>
<translation>PostrÄit v&levo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="744"/>
- <location filename="../QMenuStrings.cpp" line="2565"/>
- <location filename="../QMenuStrings.cpp" line="4115"/>
+ <location filename="../QMenuStrings.cpp" line="522"/>
+ <location filename="../QMenuStrings.cpp" line="2346"/>
+ <location filename="../QMenuStrings.cpp" line="3539"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="746"/>
+ <location filename="../QMenuStrings.cpp" line="524"/>
<source>&Jog Right</source>
<translation>PostrÄit v&pravo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="753"/>
- <location filename="../QMenuStrings.cpp" line="2574"/>
- <location filename="../QMenuStrings.cpp" line="4124"/>
+ <location filename="../QMenuStrings.cpp" line="531"/>
+ <location filename="../QMenuStrings.cpp" line="2355"/>
+ <location filename="../QMenuStrings.cpp" line="3548"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="755"/>
- <location filename="../QMenuStrings.cpp" line="2532"/>
+ <location filename="../QMenuStrings.cpp" line="533"/>
+ <location filename="../QMenuStrings.cpp" line="3506"/>
<source>&Increase Velocity</source>
<translation>Z&výšit sÃlu tónu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="762"/>
- <location filename="../QMenuStrings.cpp" line="2539"/>
- <location filename="../QMenuStrings.cpp" line="4189"/>
+ <location filename="../QMenuStrings.cpp" line="540"/>
+ <location filename="../QMenuStrings.cpp" line="2420"/>
+ <location filename="../QMenuStrings.cpp" line="3513"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="764"/>
- <location filename="../QMenuStrings.cpp" line="2541"/>
+ <location filename="../QMenuStrings.cpp" line="542"/>
+ <location filename="../QMenuStrings.cpp" line="3515"/>
<source>&Reduce Velocity</source>
<translation>S&nÞit sÃlu tónu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="771"/>
- <location filename="../QMenuStrings.cpp" line="2548"/>
- <location filename="../QMenuStrings.cpp" line="4180"/>
+ <location filename="../QMenuStrings.cpp" line="549"/>
+ <location filename="../QMenuStrings.cpp" line="2411"/>
+ <location filename="../QMenuStrings.cpp" line="3522"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="773"/>
+ <location filename="../QMenuStrings.cpp" line="551"/>
<source>&Set to Current Velocity</source>
<translation>&Nastavit na souÄasnou sÃlu tónu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="774"/>
+ <location filename="../QMenuStrings.cpp" line="552"/>
<source>Set Event &Velocities...</source>
<translation>Nastavit &rychlosti událostÃ...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="775"/>
+ <location filename="../QMenuStrings.cpp" line="553"/>
<source>Resc&ale</source>
<translation>ZmÄ›nit &měřÃtko</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="776"/>
- <location filename="../QMenuStrings.cpp" line="2469"/>
+ <location filename="../QMenuStrings.cpp" line="554"/>
+ <location filename="../QMenuStrings.cpp" line="3443"/>
<source>&Halve Durations</source>
<translation>&PoloviÄnà doby trvánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="783"/>
- <location filename="../QMenuStrings.cpp" line="2476"/>
+ <location filename="../QMenuStrings.cpp" line="561"/>
+ <location filename="../QMenuStrings.cpp" line="3450"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="785"/>
- <location filename="../QMenuStrings.cpp" line="2478"/>
+ <location filename="../QMenuStrings.cpp" line="563"/>
+ <location filename="../QMenuStrings.cpp" line="3452"/>
<source>&Double Durations</source>
<translation>&Dvojité doby trvánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="792"/>
- <location filename="../QMenuStrings.cpp" line="2485"/>
+ <location filename="../QMenuStrings.cpp" line="570"/>
+ <location filename="../QMenuStrings.cpp" line="3459"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="794"/>
- <location filename="../QMenuStrings.cpp" line="2487"/>
+ <location filename="../QMenuStrings.cpp" line="572"/>
+ <location filename="../QMenuStrings.cpp" line="3461"/>
<source>Stretch or S&quash...</source>
<translation>Prodloužit nebo &zkrátit...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="795"/>
- <location filename="../QMenuStrings.cpp" line="2488"/>
+ <location filename="../QMenuStrings.cpp" line="573"/>
+ <location filename="../QMenuStrings.cpp" line="3462"/>
<source>Trans&pose</source>
<translation>&Transponovat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="796"/>
- <location filename="../QMenuStrings.cpp" line="2489"/>
+ <location filename="../QMenuStrings.cpp" line="574"/>
+ <location filename="../QMenuStrings.cpp" line="3463"/>
<source>&Up a Semitone</source>
<translation>O půl tónu &výš</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="803"/>
- <location filename="../QMenuStrings.cpp" line="2496"/>
- <location filename="../QMenuStrings.cpp" line="4207"/>
+ <location filename="../QMenuStrings.cpp" line="581"/>
+ <location filename="../QMenuStrings.cpp" line="2438"/>
+ <location filename="../QMenuStrings.cpp" line="3470"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="805"/>
- <location filename="../QMenuStrings.cpp" line="2498"/>
+ <location filename="../QMenuStrings.cpp" line="583"/>
+ <location filename="../QMenuStrings.cpp" line="3472"/>
<source>&Down a Semitone</source>
<translation>O půl tónu &nÞ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="812"/>
- <location filename="../QMenuStrings.cpp" line="2505"/>
- <location filename="../QMenuStrings.cpp" line="4198"/>
+ <location filename="../QMenuStrings.cpp" line="590"/>
+ <location filename="../QMenuStrings.cpp" line="2429"/>
+ <location filename="../QMenuStrings.cpp" line="3479"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="814"/>
- <location filename="../QMenuStrings.cpp" line="2507"/>
+ <location filename="../QMenuStrings.cpp" line="592"/>
+ <location filename="../QMenuStrings.cpp" line="3481"/>
<source>Up an &Octave</source>
<translation>O &oktávu výš</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="821"/>
- <location filename="../QMenuStrings.cpp" line="2514"/>
+ <location filename="../QMenuStrings.cpp" line="599"/>
+ <location filename="../QMenuStrings.cpp" line="3488"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="823"/>
- <location filename="../QMenuStrings.cpp" line="2516"/>
+ <location filename="../QMenuStrings.cpp" line="601"/>
+ <location filename="../QMenuStrings.cpp" line="3490"/>
<source>Down an Octa&ve</source>
<translation>O o&ktávu nÞ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="830"/>
- <location filename="../QMenuStrings.cpp" line="2523"/>
+ <location filename="../QMenuStrings.cpp" line="608"/>
+ <location filename="../QMenuStrings.cpp" line="3497"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="832"/>
- <location filename="../QMenuStrings.cpp" line="2525"/>
+ <location filename="../QMenuStrings.cpp" line="610"/>
+ <location filename="../QMenuStrings.cpp" line="3499"/>
<source>&Transpose by Semitones...</source>
<translation>Transponovat o &půltóny...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="833"/>
- <location filename="../QMenuStrings.cpp" line="1991"/>
- <location filename="../QMenuStrings.cpp" line="2526"/>
- <location filename="../QMenuStrings.cpp" line="4102"/>
- <location filename="../QMenuStrings.cpp" line="4536"/>
+ <location filename="../QMenuStrings.cpp" line="611"/>
+ <location filename="../QMenuStrings.cpp" line="1773"/>
+ <location filename="../QMenuStrings.cpp" line="2333"/>
+ <location filename="../QMenuStrings.cpp" line="2965"/>
+ <location filename="../QMenuStrings.cpp" line="3500"/>
<source>Transpose by &Interval...</source>
<translation>Převést o &interval...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="834"/>
+ <location filename="../QMenuStrings.cpp" line="612"/>
<source>&Convert</source>
<translation>&Převést</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="835"/>
- <location filename="../QMenuStrings.cpp" line="2528"/>
+ <location filename="../QMenuStrings.cpp" line="613"/>
+ <location filename="../QMenuStrings.cpp" line="3502"/>
<source>&Invert</source>
<translation>&Obrátit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="842"/>
+ <location filename="../QMenuStrings.cpp" line="620"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="844"/>
- <location filename="../QMenuStrings.cpp" line="2529"/>
+ <location filename="../QMenuStrings.cpp" line="622"/>
+ <location filename="../QMenuStrings.cpp" line="3503"/>
<source>&Retrograde</source>
<translation>&Zrcadlový</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="851"/>
+ <location filename="../QMenuStrings.cpp" line="629"/>
<source>Shift+Alt+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="853"/>
- <location filename="../QMenuStrings.cpp" line="2530"/>
+ <location filename="../QMenuStrings.cpp" line="631"/>
+ <location filename="../QMenuStrings.cpp" line="3504"/>
<source>Re&trograde Invert</source>
<translation>Obrá&tit zrcadlový</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="854"/>
+ <location filename="../QMenuStrings.cpp" line="632"/>
<source>Trigger Se&gment...</source>
<translation>&Spustit Äást...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="857"/>
- <location filename="../QMenuStrings.cpp" line="2580"/>
+ <location filename="../QMenuStrings.cpp" line="635"/>
+ <location filename="../QMenuStrings.cpp" line="3554"/>
<source>Cut Controller Events (&X)</source>
<translation>Vyjmout události ovládacÃho prvku (&X)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="858"/>
- <location filename="../QMenuStrings.cpp" line="2581"/>
+ <location filename="../QMenuStrings.cpp" line="636"/>
+ <location filename="../QMenuStrings.cpp" line="3555"/>
<source>&Copy Controller Events</source>
<translation>&KopÃrovat události ovládacÃho prvku</translation>
</message>
<message>
- <source>Paste Events (&V)</source>
- <translation type="obsolete">Vložit události (&V)</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="860"/>
- <location filename="../QMenuStrings.cpp" line="2583"/>
+ <location filename="../QMenuStrings.cpp" line="638"/>
+ <location filename="../QMenuStrings.cpp" line="3557"/>
<source>&Place a Controller for Each Note</source>
<translation>&UmÃstit ovládacà prvek pro každou notu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="871"/>
- <location filename="../QMenuStrings.cpp" line="2595"/>
+ <location filename="../QMenuStrings.cpp" line="649"/>
+ <location filename="../QMenuStrings.cpp" line="3569"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="880"/>
- <location filename="../QMenuStrings.cpp" line="2604"/>
+ <location filename="../QMenuStrings.cpp" line="658"/>
+ <location filename="../QMenuStrings.cpp" line="3578"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="907"/>
- <location filename="../QMenuStrings.cpp" line="2631"/>
+ <location filename="../QMenuStrings.cpp" line="685"/>
+ <location filename="../QMenuStrings.cpp" line="3605"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="916"/>
- <location filename="../QMenuStrings.cpp" line="2640"/>
+ <location filename="../QMenuStrings.cpp" line="694"/>
+ <location filename="../QMenuStrings.cpp" line="3614"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="925"/>
- <location filename="../QMenuStrings.cpp" line="2667"/>
+ <location filename="../QMenuStrings.cpp" line="703"/>
+ <location filename="../QMenuStrings.cpp" line="3641"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="934"/>
- <location filename="../QMenuStrings.cpp" line="2676"/>
+ <location filename="../QMenuStrings.cpp" line="712"/>
+ <location filename="../QMenuStrings.cpp" line="3650"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="945"/>
- <location filename="../QMenuStrings.cpp" line="2699"/>
+ <location filename="../QMenuStrings.cpp" line="723"/>
+ <location filename="../QMenuStrings.cpp" line="3673"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation>Vlevo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="960"/>
- <location filename="../QMenuStrings.cpp" line="2714"/>
+ <location filename="../QMenuStrings.cpp" line="738"/>
+ <location filename="../QMenuStrings.cpp" line="3688"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="975"/>
- <location filename="../QMenuStrings.cpp" line="2729"/>
+ <location filename="../QMenuStrings.cpp" line="753"/>
+ <location filename="../QMenuStrings.cpp" line="3703"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="984"/>
- <location filename="../QMenuStrings.cpp" line="2738"/>
+ <location filename="../QMenuStrings.cpp" line="762"/>
+ <location filename="../QMenuStrings.cpp" line="3712"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="996"/>
- <location filename="../QMenuStrings.cpp" line="2777"/>
- <location filename="../QMenuStrings.cpp" line="4348"/>
+ <location filename="../QMenuStrings.cpp" line="774"/>
+ <location filename="../QMenuStrings.cpp" line="2579"/>
+ <location filename="../QMenuStrings.cpp" line="3751"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation>Pause</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1005"/>
- <location filename="../QMenuStrings.cpp" line="1714"/>
- <location filename="../QMenuStrings.cpp" line="1762"/>
- <location filename="../QMenuStrings.cpp" line="2792"/>
- <location filename="../QMenuStrings.cpp" line="4357"/>
+ <location filename="../QMenuStrings.cpp" line="783"/>
+ <location filename="../QMenuStrings.cpp" line="1623"/>
+ <location filename="../QMenuStrings.cpp" line="1901"/>
+ <location filename="../QMenuStrings.cpp" line="2588"/>
+ <location filename="../QMenuStrings.cpp" line="3766"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1007"/>
- <location filename="../QMenuStrings.cpp" line="2800"/>
- <location filename="../QMenuStrings.cpp" line="4231"/>
+ <location filename="../QMenuStrings.cpp" line="785"/>
+ <location filename="../QMenuStrings.cpp" line="2462"/>
+ <location filename="../QMenuStrings.cpp" line="3774"/>
<source>&Tools</source>
<translation>&Nástroje</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1008"/>
- <location filename="../QMenuStrings.cpp" line="2801"/>
- <location filename="../QMenuStrings.cpp" line="4232"/>
- <location filename="../QMenuStrings.cpp" line="4537"/>
+ <location filename="../QMenuStrings.cpp" line="786"/>
+ <location filename="../QMenuStrings.cpp" line="1774"/>
+ <location filename="../QMenuStrings.cpp" line="2463"/>
+ <location filename="../QMenuStrings.cpp" line="3775"/>
<source>&Select and Edit</source>
<translation>&Vybrat a upravit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1017"/>
- <location filename="../QMenuStrings.cpp" line="4241"/>
- <location filename="../QMenuStrings.cpp" line="4555"/>
+ <location filename="../QMenuStrings.cpp" line="795"/>
+ <location filename="../QMenuStrings.cpp" line="1792"/>
+ <location filename="../QMenuStrings.cpp" line="2472"/>
<source>&Draw</source>
<translation>&Kreslit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1026"/>
- <location filename="../QMenuStrings.cpp" line="2820"/>
- <location filename="../QMenuStrings.cpp" line="4250"/>
- <location filename="../QMenuStrings.cpp" line="4564"/>
+ <location filename="../QMenuStrings.cpp" line="804"/>
+ <location filename="../QMenuStrings.cpp" line="1801"/>
+ <location filename="../QMenuStrings.cpp" line="2481"/>
+ <location filename="../QMenuStrings.cpp" line="3794"/>
<source>&Erase</source>
<translation>&Vymazat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="863"/>
- <location filename="../QMenuStrings.cpp" line="1035"/>
- <location filename="../QMenuStrings.cpp" line="2587"/>
- <location filename="../QMenuStrings.cpp" line="4259"/>
- <location filename="../QMenuStrings.cpp" line="4546"/>
+ <location filename="../QMenuStrings.cpp" line="641"/>
+ <location filename="../QMenuStrings.cpp" line="813"/>
+ <location filename="../QMenuStrings.cpp" line="1783"/>
+ <location filename="../QMenuStrings.cpp" line="2490"/>
+ <location filename="../QMenuStrings.cpp" line="3561"/>
<source>&Move</source>
<translation>&Přesun</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1044"/>
+ <location filename="../QMenuStrings.cpp" line="822"/>
<source>Resi&ze</source>
<translation>&Změnit velikost</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1053"/>
- <location filename="../QMenuStrings.cpp" line="4277"/>
- <location filename="../QMenuStrings.cpp" line="4582"/>
+ <location filename="../QMenuStrings.cpp" line="831"/>
+ <location filename="../QMenuStrings.cpp" line="1819"/>
+ <location filename="../QMenuStrings.cpp" line="2508"/>
<source>S&plit</source>
<translation>RozdÄ›&lit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1062"/>
+ <location filename="../QMenuStrings.cpp" line="840"/>
<source>&Velocity</source>
<translation>&Rychlost</translation>
</message>
<message>
- <source>Local &Cursor</source>
- <translation type="obsolete">Lokálnà &kurzor</translation>
- </message>
- <message>
- <source>Cursor &Back</source>
- <translation type="obsolete">Běžec &zpět</translation>
- </message>
- <message>
- <source>Cursor &Forward</source>
- <translation type="obsolete">Běžec &vpřed</translation>
- </message>
- <message>
- <source>C&ursor Back Bar</source>
- <translation type="obsolete">Běžec na &pÅ™edcházejÃcà taktovou Äáru</translation>
- </message>
- <message>
- <source>Cursor For&ward Bar</source>
- <translation type="obsolete">Běžec na &následujÃcà taktovou Äáru</translation>
- </message>
- <message>
- <source>Cursor to St&art</source>
- <translation type="obsolete">Běžec na z&aÄátek</translation>
- </message>
- <message>
- <source>Cursor to &End</source>
- <translation type="obsolete">Běžec na &konec</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="2588"/>
+ <location filename="../QMenuStrings.cpp" line="3562"/>
<source>Cursor back and Se&lect</source>
<translation>Běžec zpět a &vybrat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="873"/>
- <location filename="../QMenuStrings.cpp" line="2597"/>
+ <location filename="../QMenuStrings.cpp" line="651"/>
+ <location filename="../QMenuStrings.cpp" line="3571"/>
<source>Cursor Forward and &Select</source>
<translation>Běžec vpřed a v&ybrat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="900"/>
- <location filename="../QMenuStrings.cpp" line="2624"/>
+ <location filename="../QMenuStrings.cpp" line="678"/>
+ <location filename="../QMenuStrings.cpp" line="3598"/>
<source>Set Loop &to Selection</source>
<translation>Nastavit opakovánà &pro výběr</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="909"/>
- <location filename="../QMenuStrings.cpp" line="2633"/>
+ <location filename="../QMenuStrings.cpp" line="687"/>
+ <location filename="../QMenuStrings.cpp" line="3607"/>
<source>Clear L&oop</source>
<translation>Vymazat &opakovánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1699"/>
- <location filename="../QMenuStrings.cpp" line="1747"/>
- <location filename="../QMenuStrings.cpp" line="4286"/>
+ <location filename="../QMenuStrings.cpp" line="1608"/>
+ <location filename="../QMenuStrings.cpp" line="1886"/>
+ <location filename="../QMenuStrings.cpp" line="2517"/>
<source>T&ransport</source>
<translation>Pře&sun</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="936"/>
- <location filename="../QMenuStrings.cpp" line="1700"/>
- <location filename="../QMenuStrings.cpp" line="1748"/>
- <location filename="../QMenuStrings.cpp" line="2678"/>
- <location filename="../QMenuStrings.cpp" line="4287"/>
+ <location filename="../QMenuStrings.cpp" line="714"/>
+ <location filename="../QMenuStrings.cpp" line="1609"/>
+ <location filename="../QMenuStrings.cpp" line="1887"/>
+ <location filename="../QMenuStrings.cpp" line="2518"/>
+ <location filename="../QMenuStrings.cpp" line="3652"/>
<source>&Play</source>
<translation>&Přehrát</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="937"/>
- <location filename="../QMenuStrings.cpp" line="1701"/>
- <location filename="../QMenuStrings.cpp" line="1749"/>
- <location filename="../QMenuStrings.cpp" line="2685"/>
- <location filename="../QMenuStrings.cpp" line="4296"/>
+ <location filename="../QMenuStrings.cpp" line="715"/>
+ <location filename="../QMenuStrings.cpp" line="1610"/>
+ <location filename="../QMenuStrings.cpp" line="1888"/>
+ <location filename="../QMenuStrings.cpp" line="2527"/>
+ <location filename="../QMenuStrings.cpp" line="3659"/>
<source>&Stop</source>
<translation>&Zastavit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="968"/>
- <location filename="../QMenuStrings.cpp" line="1702"/>
- <location filename="../QMenuStrings.cpp" line="1750"/>
- <location filename="../QMenuStrings.cpp" line="2722"/>
- <location filename="../QMenuStrings.cpp" line="4305"/>
+ <location filename="../QMenuStrings.cpp" line="746"/>
+ <location filename="../QMenuStrings.cpp" line="1611"/>
+ <location filename="../QMenuStrings.cpp" line="1889"/>
+ <location filename="../QMenuStrings.cpp" line="2536"/>
+ <location filename="../QMenuStrings.cpp" line="3696"/>
<source>Re&wind</source>
<translation>Ukazatel přehrávánà o takt &zpět</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="977"/>
- <location filename="../QMenuStrings.cpp" line="1703"/>
- <location filename="../QMenuStrings.cpp" line="1751"/>
- <location filename="../QMenuStrings.cpp" line="2731"/>
- <location filename="../QMenuStrings.cpp" line="4314"/>
+ <location filename="../QMenuStrings.cpp" line="755"/>
+ <location filename="../QMenuStrings.cpp" line="1612"/>
+ <location filename="../QMenuStrings.cpp" line="1890"/>
+ <location filename="../QMenuStrings.cpp" line="2545"/>
+ <location filename="../QMenuStrings.cpp" line="3705"/>
<source>&Fast Forward</source>
<translation>Ukazatel přehrávánà o takt &dopředu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="986"/>
- <location filename="../QMenuStrings.cpp" line="1704"/>
- <location filename="../QMenuStrings.cpp" line="1752"/>
- <location filename="../QMenuStrings.cpp" line="2740"/>
+ <location filename="../QMenuStrings.cpp" line="764"/>
+ <location filename="../QMenuStrings.cpp" line="1613"/>
+ <location filename="../QMenuStrings.cpp" line="1891"/>
+ <location filename="../QMenuStrings.cpp" line="3714"/>
<source>Rewind to &Beginning</source>
<translation>Ukazatel pÅ™ehrávánà na z&aÄátek</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="987"/>
- <location filename="../QMenuStrings.cpp" line="1705"/>
- <location filename="../QMenuStrings.cpp" line="1753"/>
- <location filename="../QMenuStrings.cpp" line="2747"/>
+ <location filename="../QMenuStrings.cpp" line="765"/>
+ <location filename="../QMenuStrings.cpp" line="1614"/>
+ <location filename="../QMenuStrings.cpp" line="1892"/>
+ <location filename="../QMenuStrings.cpp" line="3721"/>
<source>Fast Forward to &End</source>
<translation>Ukazatel přehrávánà na &konec</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="988"/>
- <location filename="../QMenuStrings.cpp" line="2763"/>
+ <location filename="../QMenuStrings.cpp" line="766"/>
+ <location filename="../QMenuStrings.cpp" line="3737"/>
<source>S&olo</source>
<translation>Sól&o</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="989"/>
- <location filename="../QMenuStrings.cpp" line="2770"/>
- <location filename="../QMenuStrings.cpp" line="4341"/>
+ <location filename="../QMenuStrings.cpp" line="767"/>
+ <location filename="../QMenuStrings.cpp" line="2572"/>
+ <location filename="../QMenuStrings.cpp" line="3744"/>
<source>Scro&ll to Follow Playback</source>
<translation>P&rojÞdÄ›t podle polohy pÅ™ehrávánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="998"/>
- <location filename="../QMenuStrings.cpp" line="1707"/>
- <location filename="../QMenuStrings.cpp" line="1755"/>
- <location filename="../QMenuStrings.cpp" line="2785"/>
- <location filename="../QMenuStrings.cpp" line="4350"/>
+ <location filename="../QMenuStrings.cpp" line="776"/>
+ <location filename="../QMenuStrings.cpp" line="1616"/>
+ <location filename="../QMenuStrings.cpp" line="1894"/>
+ <location filename="../QMenuStrings.cpp" line="2581"/>
+ <location filename="../QMenuStrings.cpp" line="3759"/>
<source>P&anic</source>
<translation>&Nouzové zastavenÃ</translation>
</message>
<message>
- <source>I&nsert Note</source>
- <translation type="obsolete">V&ložit notu</translation>
- </message>
- <message>
- <source>&I</source>
- <translation type="obsolete">&I</translation>
- </message>
- <message>
- <source>I &sharp</source>
- <translation type="obsolete">I &zvýšený o půltón</translation>
- </message>
- <message>
- <source>II &flat</source>
- <translation type="obsolete">II &snÞený o půltón</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>II sh&arp</source>
- <translation type="obsolete">II zvýš&ený o půltón</translation>
- </message>
- <message>
- <source>III flat</source>
- <translation type="obsolete">III snÞený o půltón</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>IV sha&rp</source>
- <translation type="obsolete">IV zvýšený o &půltón</translation>
- </message>
- <message>
- <source>&V flat</source>
- <translation type="obsolete">&V snÞený o půltón</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>V s&harp</source>
- <translation type="obsolete">V zvýšený &o půltón</translation>
- </message>
- <message>
- <source>VI fla&t</source>
- <translation type="obsolete">VI snÞe&ný o půltón</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VI shar&p</source>
- <translation type="obsolete">VI zvýšený o půltó&n</translation>
- </message>
- <message>
- <source>VII flat</source>
- <translation type="obsolete">VII snÞený o půltón</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1225"/>
- <location filename="../QMenuStrings.cpp" line="3133"/>
+ <location filename="../QMenuStrings.cpp" line="1003"/>
+ <location filename="../QMenuStrings.cpp" line="4107"/>
<source>&Upper Octave</source>
<translation>&Vyššà oktáva</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1533"/>
- <location filename="../QMenuStrings.cpp" line="3450"/>
+ <location filename="../QMenuStrings.cpp" line="1311"/>
+ <location filename="../QMenuStrings.cpp" line="4424"/>
<source>C&hord Insert Mode</source>
<translation>Režim vkládánà &akordů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1542"/>
- <location filename="../QMenuStrings.cpp" line="3478"/>
+ <location filename="../QMenuStrings.cpp" line="1320"/>
+ <location filename="../QMenuStrings.cpp" line="4452"/>
<source>Ste&p Recording</source>
<translation>&Krokové nahrávánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="655"/>
- <location filename="../QMenuStrings.cpp" line="1948"/>
- <location filename="../QMenuStrings.cpp" line="3937"/>
+ <location filename="../QMenuStrings.cpp" line="433"/>
+ <location filename="../QMenuStrings.cpp" line="2168"/>
+ <location filename="../QMenuStrings.cpp" line="2921"/>
<source>&Toolbars</source>
<translation>&Nástrojové pruhy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="47"/>
+ <location filename="../QMenuStrings.cpp" line="1848"/>
<source>&Action</source>
<translation>&ÄŒinnost</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="861"/>
- <location filename="../QMenuStrings.cpp" line="2585"/>
+ <location filename="../QMenuStrings.cpp" line="639"/>
+ <location filename="../QMenuStrings.cpp" line="3559"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>Vložit pořadà &změn výšek tónů...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="659"/>
+ <location filename="../QMenuStrings.cpp" line="437"/>
<source>Show A&ctions Toolbar</source>
<translation>Ukázat nástrojový pruh s Ä&innostmi</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="660"/>
+ <location filename="../QMenuStrings.cpp" line="438"/>
<source>Show R&ulers Toolbar</source>
<translation>Ukázat nástrojový pruh s &pravÃtky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="662"/>
- <location filename="../QMenuStrings.cpp" line="1963"/>
- <location filename="../QMenuStrings.cpp" line="3944"/>
+ <location filename="../QMenuStrings.cpp" line="440"/>
+ <location filename="../QMenuStrings.cpp" line="2175"/>
+ <location filename="../QMenuStrings.cpp" line="2936"/>
<source>&Rulers</source>
<translation>&PravÃtka</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="663"/>
- <location filename="../QMenuStrings.cpp" line="1964"/>
+ <location filename="../QMenuStrings.cpp" line="441"/>
+ <location filename="../QMenuStrings.cpp" line="2937"/>
<source>Show Ch&ord Name Ruler</source>
<translation>Ukázat pravÃtko s názvy &akordů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="664"/>
- <location filename="../QMenuStrings.cpp" line="1966"/>
+ <location filename="../QMenuStrings.cpp" line="442"/>
+ <location filename="../QMenuStrings.cpp" line="2939"/>
<source>Show &Tempo Ruler</source>
<translation>Ukázat pravÃtko s &tempem</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="667"/>
- <location filename="../QMenuStrings.cpp" line="1969"/>
+ <location filename="../QMenuStrings.cpp" line="445"/>
+ <location filename="../QMenuStrings.cpp" line="2942"/>
<source>Add &Control Ruler</source>
<translation>PÅ™idat &ovládacà pravÃtko</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="856"/>
- <location filename="../QMenuStrings.cpp" line="2579"/>
+ <location filename="../QMenuStrings.cpp" line="634"/>
+ <location filename="../QMenuStrings.cpp" line="3553"/>
<source>Co&ntrollers</source>
<translation>&OvladaÄe</translation>
</message>
<message>
- <source>Cut controller events (&X)</source>
- <translation type="obsolete">Vyjmout události ovládacÃho prvku (&X)</translation>
- </message>
- <message>
- <source>&Copy controller events</source>
- <translation type="obsolete">&KopÃrovat události ovládacÃho prvku</translation>
- </message>
- <message>
- <source>Paste events (&V)</source>
- <translation type="obsolete">Vložit události (&V)</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="859"/>
- <location filename="../QMenuStrings.cpp" line="2582"/>
+ <location filename="../QMenuStrings.cpp" line="637"/>
+ <location filename="../QMenuStrings.cpp" line="3556"/>
<source>&Set Controller Values</source>
<translation>&Nastavit hodnoty ovládacÃho prvku</translation>
</message>
<message>
- <source>&Place a controller for each note</source>
- <translation type="obsolete">&UmÃstit ovládacà prvek pro každou notu</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="862"/>
- <location filename="../QMenuStrings.cpp" line="2586"/>
+ <location filename="../QMenuStrings.cpp" line="640"/>
+ <location filename="../QMenuStrings.cpp" line="3560"/>
<source>Insert C&ontroller Sequence...</source>
<translation>Vložit poÅ™adà &ovládacÃho prvku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="882"/>
- <location filename="../QMenuStrings.cpp" line="2606"/>
+ <location filename="../QMenuStrings.cpp" line="660"/>
+ <location filename="../QMenuStrings.cpp" line="3580"/>
<source>Cursor Back &Bar and Select</source>
<translation>Ukazatel o &takt zpět a vybrat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="889"/>
- <location filename="../QMenuStrings.cpp" line="2613"/>
+ <location filename="../QMenuStrings.cpp" line="667"/>
+ <location filename="../QMenuStrings.cpp" line="3587"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Å ipka vlevo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="891"/>
- <location filename="../QMenuStrings.cpp" line="2615"/>
+ <location filename="../QMenuStrings.cpp" line="669"/>
+ <location filename="../QMenuStrings.cpp" line="3589"/>
<source>Cursor For&ward and Select</source>
<translation>Ukazatel o &takt vpřed a vybrat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="898"/>
- <location filename="../QMenuStrings.cpp" line="2622"/>
+ <location filename="../QMenuStrings.cpp" line="676"/>
+ <location filename="../QMenuStrings.cpp" line="3596"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Å ipka vpravo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1060"/>
- <location filename="../QMenuStrings.cpp" line="1069"/>
- <location filename="../QMenuStrings.cpp" line="4284"/>
- <location filename="../QMenuStrings.cpp" line="4589"/>
+ <location filename="../QMenuStrings.cpp" line="838"/>
+ <location filename="../QMenuStrings.cpp" line="847"/>
+ <location filename="../QMenuStrings.cpp" line="1826"/>
+ <location filename="../QMenuStrings.cpp" line="2515"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1072"/>
- <location filename="../QMenuStrings.cpp" line="1226"/>
- <location filename="../QMenuStrings.cpp" line="1380"/>
- <location filename="../QMenuStrings.cpp" line="2980"/>
- <location filename="../QMenuStrings.cpp" line="3134"/>
- <location filename="../QMenuStrings.cpp" line="3288"/>
+ <location filename="../QMenuStrings.cpp" line="850"/>
+ <location filename="../QMenuStrings.cpp" line="1004"/>
+ <location filename="../QMenuStrings.cpp" line="1158"/>
+ <location filename="../QMenuStrings.cpp" line="3954"/>
+ <location filename="../QMenuStrings.cpp" line="4108"/>
+ <location filename="../QMenuStrings.cpp" line="4262"/>
<source>I/do</source>
<translatorcomment>You translated both "sharp" and "flat" as "snÞený o půltón" which I am guessing (I don't remotely speak Czech) means "sharp or flat". Having two translations for "V sharp or flat" probably makes little sense to users, and I question this, but what do I know about Czech? (Almost nothing.) I just thought I'd mention it. I've done the re-translation in the same pattern as your original, in an attempt to make your life a little easier. I hope it helped. -dmm</translatorcomment>
<translation>I</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1079"/>
- <location filename="../QMenuStrings.cpp" line="2987"/>
+ <location filename="../QMenuStrings.cpp" line="857"/>
+ <location filename="../QMenuStrings.cpp" line="3961"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1081"/>
- <location filename="../QMenuStrings.cpp" line="1235"/>
- <location filename="../QMenuStrings.cpp" line="1389"/>
- <location filename="../QMenuStrings.cpp" line="2989"/>
- <location filename="../QMenuStrings.cpp" line="3143"/>
- <location filename="../QMenuStrings.cpp" line="3297"/>
+ <location filename="../QMenuStrings.cpp" line="859"/>
+ <location filename="../QMenuStrings.cpp" line="1013"/>
+ <location filename="../QMenuStrings.cpp" line="1167"/>
+ <location filename="../QMenuStrings.cpp" line="3963"/>
+ <location filename="../QMenuStrings.cpp" line="4117"/>
+ <location filename="../QMenuStrings.cpp" line="4271"/>
<source>I/do sharp</source>
<translation>II zvýšený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1088"/>
- <location filename="../QMenuStrings.cpp" line="2996"/>
+ <location filename="../QMenuStrings.cpp" line="866"/>
+ <location filename="../QMenuStrings.cpp" line="3970"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1090"/>
- <location filename="../QMenuStrings.cpp" line="1244"/>
- <location filename="../QMenuStrings.cpp" line="1398"/>
- <location filename="../QMenuStrings.cpp" line="2998"/>
- <location filename="../QMenuStrings.cpp" line="3152"/>
- <location filename="../QMenuStrings.cpp" line="3306"/>
+ <location filename="../QMenuStrings.cpp" line="868"/>
+ <location filename="../QMenuStrings.cpp" line="1022"/>
+ <location filename="../QMenuStrings.cpp" line="1176"/>
+ <location filename="../QMenuStrings.cpp" line="3972"/>
+ <location filename="../QMenuStrings.cpp" line="4126"/>
+ <location filename="../QMenuStrings.cpp" line="4280"/>
<source>II/re flat</source>
<translation>III snÞený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1097"/>
- <location filename="../QMenuStrings.cpp" line="3005"/>
- <location filename="../QMenuStrings.cpp" line="3797"/>
+ <location filename="../QMenuStrings.cpp" line="875"/>
+ <location filename="../QMenuStrings.cpp" line="2028"/>
+ <location filename="../QMenuStrings.cpp" line="3979"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1099"/>
- <location filename="../QMenuStrings.cpp" line="1253"/>
- <location filename="../QMenuStrings.cpp" line="1407"/>
- <location filename="../QMenuStrings.cpp" line="3007"/>
- <location filename="../QMenuStrings.cpp" line="3161"/>
- <location filename="../QMenuStrings.cpp" line="3315"/>
+ <location filename="../QMenuStrings.cpp" line="877"/>
+ <location filename="../QMenuStrings.cpp" line="1031"/>
+ <location filename="../QMenuStrings.cpp" line="1185"/>
+ <location filename="../QMenuStrings.cpp" line="3981"/>
+ <location filename="../QMenuStrings.cpp" line="4135"/>
+ <location filename="../QMenuStrings.cpp" line="4289"/>
<source>II/re</source>
<translation>II</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1106"/>
- <location filename="../QMenuStrings.cpp" line="3014"/>
+ <location filename="../QMenuStrings.cpp" line="884"/>
+ <location filename="../QMenuStrings.cpp" line="3988"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1108"/>
- <location filename="../QMenuStrings.cpp" line="1262"/>
- <location filename="../QMenuStrings.cpp" line="1416"/>
- <location filename="../QMenuStrings.cpp" line="3016"/>
- <location filename="../QMenuStrings.cpp" line="3170"/>
- <location filename="../QMenuStrings.cpp" line="3324"/>
+ <location filename="../QMenuStrings.cpp" line="886"/>
+ <location filename="../QMenuStrings.cpp" line="1040"/>
+ <location filename="../QMenuStrings.cpp" line="1194"/>
+ <location filename="../QMenuStrings.cpp" line="3990"/>
+ <location filename="../QMenuStrings.cpp" line="4144"/>
+ <location filename="../QMenuStrings.cpp" line="4298"/>
<source>II/re sharp</source>
<translation>II zvýšený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1115"/>
- <location filename="../QMenuStrings.cpp" line="3023"/>
+ <location filename="../QMenuStrings.cpp" line="893"/>
+ <location filename="../QMenuStrings.cpp" line="3997"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1117"/>
- <location filename="../QMenuStrings.cpp" line="1271"/>
- <location filename="../QMenuStrings.cpp" line="1425"/>
- <location filename="../QMenuStrings.cpp" line="3025"/>
- <location filename="../QMenuStrings.cpp" line="3179"/>
- <location filename="../QMenuStrings.cpp" line="3333"/>
+ <location filename="../QMenuStrings.cpp" line="895"/>
+ <location filename="../QMenuStrings.cpp" line="1049"/>
+ <location filename="../QMenuStrings.cpp" line="1203"/>
+ <location filename="../QMenuStrings.cpp" line="3999"/>
+ <location filename="../QMenuStrings.cpp" line="4153"/>
+ <location filename="../QMenuStrings.cpp" line="4307"/>
<source>III/mi flat</source>
<translation>III snÞený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1124"/>
- <location filename="../QMenuStrings.cpp" line="3032"/>
+ <location filename="../QMenuStrings.cpp" line="902"/>
+ <location filename="../QMenuStrings.cpp" line="4006"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1126"/>
- <location filename="../QMenuStrings.cpp" line="1280"/>
- <location filename="../QMenuStrings.cpp" line="1434"/>
- <location filename="../QMenuStrings.cpp" line="3034"/>
- <location filename="../QMenuStrings.cpp" line="3188"/>
- <location filename="../QMenuStrings.cpp" line="3342"/>
+ <location filename="../QMenuStrings.cpp" line="904"/>
+ <location filename="../QMenuStrings.cpp" line="1058"/>
+ <location filename="../QMenuStrings.cpp" line="1212"/>
+ <location filename="../QMenuStrings.cpp" line="4008"/>
+ <location filename="../QMenuStrings.cpp" line="4162"/>
+ <location filename="../QMenuStrings.cpp" line="4316"/>
<source>III/mi</source>
<translation>III snÞený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1133"/>
- <location filename="../QMenuStrings.cpp" line="3041"/>
- <location filename="../QMenuStrings.cpp" line="4054"/>
- <location filename="../QMenuStrings.cpp" line="4425"/>
+ <location filename="../QMenuStrings.cpp" line="911"/>
+ <location filename="../QMenuStrings.cpp" line="1662"/>
+ <location filename="../QMenuStrings.cpp" line="2285"/>
+ <location filename="../QMenuStrings.cpp" line="4015"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1135"/>
- <location filename="../QMenuStrings.cpp" line="1289"/>
- <location filename="../QMenuStrings.cpp" line="1443"/>
- <location filename="../QMenuStrings.cpp" line="3043"/>
- <location filename="../QMenuStrings.cpp" line="3197"/>
- <location filename="../QMenuStrings.cpp" line="3351"/>
+ <location filename="../QMenuStrings.cpp" line="913"/>
+ <location filename="../QMenuStrings.cpp" line="1067"/>
+ <location filename="../QMenuStrings.cpp" line="1221"/>
+ <location filename="../QMenuStrings.cpp" line="4017"/>
+ <location filename="../QMenuStrings.cpp" line="4171"/>
+ <location filename="../QMenuStrings.cpp" line="4325"/>
<source>IV/fa</source>
<translation>IV</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1142"/>
- <location filename="../QMenuStrings.cpp" line="3050"/>
+ <location filename="../QMenuStrings.cpp" line="920"/>
+ <location filename="../QMenuStrings.cpp" line="4024"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1144"/>
- <location filename="../QMenuStrings.cpp" line="1298"/>
- <location filename="../QMenuStrings.cpp" line="1452"/>
- <location filename="../QMenuStrings.cpp" line="3052"/>
- <location filename="../QMenuStrings.cpp" line="3206"/>
- <location filename="../QMenuStrings.cpp" line="3360"/>
+ <location filename="../QMenuStrings.cpp" line="922"/>
+ <location filename="../QMenuStrings.cpp" line="1076"/>
+ <location filename="../QMenuStrings.cpp" line="1230"/>
+ <location filename="../QMenuStrings.cpp" line="4026"/>
+ <location filename="../QMenuStrings.cpp" line="4180"/>
+ <location filename="../QMenuStrings.cpp" line="4334"/>
<source>IV/fa sharp</source>
<translation>IV zvýšený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1151"/>
- <location filename="../QMenuStrings.cpp" line="3059"/>
+ <location filename="../QMenuStrings.cpp" line="929"/>
+ <location filename="../QMenuStrings.cpp" line="4033"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1153"/>
- <location filename="../QMenuStrings.cpp" line="1307"/>
- <location filename="../QMenuStrings.cpp" line="1461"/>
- <location filename="../QMenuStrings.cpp" line="3061"/>
- <location filename="../QMenuStrings.cpp" line="3215"/>
- <location filename="../QMenuStrings.cpp" line="3369"/>
+ <location filename="../QMenuStrings.cpp" line="931"/>
+ <location filename="../QMenuStrings.cpp" line="1085"/>
+ <location filename="../QMenuStrings.cpp" line="1239"/>
+ <location filename="../QMenuStrings.cpp" line="4035"/>
+ <location filename="../QMenuStrings.cpp" line="4189"/>
+ <location filename="../QMenuStrings.cpp" line="4343"/>
<source>V/sol flat</source>
<translation>V snÞený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1160"/>
- <location filename="../QMenuStrings.cpp" line="3068"/>
+ <location filename="../QMenuStrings.cpp" line="938"/>
+ <location filename="../QMenuStrings.cpp" line="4042"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1162"/>
- <location filename="../QMenuStrings.cpp" line="1316"/>
- <location filename="../QMenuStrings.cpp" line="1470"/>
- <location filename="../QMenuStrings.cpp" line="3070"/>
- <location filename="../QMenuStrings.cpp" line="3224"/>
- <location filename="../QMenuStrings.cpp" line="3378"/>
+ <location filename="../QMenuStrings.cpp" line="940"/>
+ <location filename="../QMenuStrings.cpp" line="1094"/>
+ <location filename="../QMenuStrings.cpp" line="1248"/>
+ <location filename="../QMenuStrings.cpp" line="4044"/>
+ <location filename="../QMenuStrings.cpp" line="4198"/>
+ <location filename="../QMenuStrings.cpp" line="4352"/>
<source>V/sol</source>
<translation>V</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1169"/>
- <location filename="../QMenuStrings.cpp" line="3077"/>
+ <location filename="../QMenuStrings.cpp" line="947"/>
+ <location filename="../QMenuStrings.cpp" line="4051"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1171"/>
- <location filename="../QMenuStrings.cpp" line="1325"/>
- <location filename="../QMenuStrings.cpp" line="1479"/>
- <location filename="../QMenuStrings.cpp" line="3079"/>
- <location filename="../QMenuStrings.cpp" line="3233"/>
- <location filename="../QMenuStrings.cpp" line="3387"/>
+ <location filename="../QMenuStrings.cpp" line="949"/>
+ <location filename="../QMenuStrings.cpp" line="1103"/>
+ <location filename="../QMenuStrings.cpp" line="1257"/>
+ <location filename="../QMenuStrings.cpp" line="4053"/>
+ <location filename="../QMenuStrings.cpp" line="4207"/>
+ <location filename="../QMenuStrings.cpp" line="4361"/>
<source>V/sol sharp</source>
<translation>VI zvýšený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1178"/>
- <location filename="../QMenuStrings.cpp" line="3086"/>
+ <location filename="../QMenuStrings.cpp" line="956"/>
+ <location filename="../QMenuStrings.cpp" line="4060"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1180"/>
- <location filename="../QMenuStrings.cpp" line="1334"/>
- <location filename="../QMenuStrings.cpp" line="1488"/>
- <location filename="../QMenuStrings.cpp" line="3088"/>
- <location filename="../QMenuStrings.cpp" line="3242"/>
- <location filename="../QMenuStrings.cpp" line="3396"/>
+ <location filename="../QMenuStrings.cpp" line="958"/>
+ <location filename="../QMenuStrings.cpp" line="1112"/>
+ <location filename="../QMenuStrings.cpp" line="1266"/>
+ <location filename="../QMenuStrings.cpp" line="4062"/>
+ <location filename="../QMenuStrings.cpp" line="4216"/>
+ <location filename="../QMenuStrings.cpp" line="4370"/>
<source>VI/la flat</source>
<translation>VII snÞený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1187"/>
- <location filename="../QMenuStrings.cpp" line="3095"/>
+ <location filename="../QMenuStrings.cpp" line="965"/>
+ <location filename="../QMenuStrings.cpp" line="4069"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1189"/>
- <location filename="../QMenuStrings.cpp" line="1343"/>
- <location filename="../QMenuStrings.cpp" line="1497"/>
- <location filename="../QMenuStrings.cpp" line="3097"/>
- <location filename="../QMenuStrings.cpp" line="3251"/>
- <location filename="../QMenuStrings.cpp" line="3405"/>
+ <location filename="../QMenuStrings.cpp" line="967"/>
+ <location filename="../QMenuStrings.cpp" line="1121"/>
+ <location filename="../QMenuStrings.cpp" line="1275"/>
+ <location filename="../QMenuStrings.cpp" line="4071"/>
+ <location filename="../QMenuStrings.cpp" line="4225"/>
+ <location filename="../QMenuStrings.cpp" line="4379"/>
<source>VI/la</source>
<translation>VI</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1196"/>
- <location filename="../QMenuStrings.cpp" line="3104"/>
+ <location filename="../QMenuStrings.cpp" line="974"/>
+ <location filename="../QMenuStrings.cpp" line="4078"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1198"/>
- <location filename="../QMenuStrings.cpp" line="1352"/>
- <location filename="../QMenuStrings.cpp" line="1506"/>
- <location filename="../QMenuStrings.cpp" line="3106"/>
- <location filename="../QMenuStrings.cpp" line="3260"/>
- <location filename="../QMenuStrings.cpp" line="3414"/>
+ <location filename="../QMenuStrings.cpp" line="976"/>
+ <location filename="../QMenuStrings.cpp" line="1130"/>
+ <location filename="../QMenuStrings.cpp" line="1284"/>
+ <location filename="../QMenuStrings.cpp" line="4080"/>
+ <location filename="../QMenuStrings.cpp" line="4234"/>
+ <location filename="../QMenuStrings.cpp" line="4388"/>
<source>VI/la sharp</source>
<translation>VI zvýšený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1205"/>
- <location filename="../QMenuStrings.cpp" line="3113"/>
+ <location filename="../QMenuStrings.cpp" line="983"/>
+ <location filename="../QMenuStrings.cpp" line="4087"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1207"/>
- <location filename="../QMenuStrings.cpp" line="1361"/>
- <location filename="../QMenuStrings.cpp" line="1515"/>
- <location filename="../QMenuStrings.cpp" line="3115"/>
- <location filename="../QMenuStrings.cpp" line="3269"/>
- <location filename="../QMenuStrings.cpp" line="3423"/>
+ <location filename="../QMenuStrings.cpp" line="985"/>
+ <location filename="../QMenuStrings.cpp" line="1139"/>
+ <location filename="../QMenuStrings.cpp" line="1293"/>
+ <location filename="../QMenuStrings.cpp" line="4089"/>
+ <location filename="../QMenuStrings.cpp" line="4243"/>
+ <location filename="../QMenuStrings.cpp" line="4397"/>
<source>VII/ti flat</source>
<translation>VII snÞený o půltón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1214"/>
- <location filename="../QMenuStrings.cpp" line="3122"/>
+ <location filename="../QMenuStrings.cpp" line="992"/>
+ <location filename="../QMenuStrings.cpp" line="4096"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1216"/>
- <location filename="../QMenuStrings.cpp" line="1370"/>
- <location filename="../QMenuStrings.cpp" line="1524"/>
- <location filename="../QMenuStrings.cpp" line="3124"/>
- <location filename="../QMenuStrings.cpp" line="3278"/>
- <location filename="../QMenuStrings.cpp" line="3432"/>
+ <location filename="../QMenuStrings.cpp" line="994"/>
+ <location filename="../QMenuStrings.cpp" line="1148"/>
+ <location filename="../QMenuStrings.cpp" line="1302"/>
+ <location filename="../QMenuStrings.cpp" line="4098"/>
+ <location filename="../QMenuStrings.cpp" line="4252"/>
+ <location filename="../QMenuStrings.cpp" line="4406"/>
<source>VII/ti</source>
<translation>VII</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1223"/>
- <location filename="../QMenuStrings.cpp" line="3131"/>
+ <location filename="../QMenuStrings.cpp" line="1001"/>
+ <location filename="../QMenuStrings.cpp" line="4105"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1233"/>
- <location filename="../QMenuStrings.cpp" line="3141"/>
+ <location filename="../QMenuStrings.cpp" line="1011"/>
+ <location filename="../QMenuStrings.cpp" line="4115"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1242"/>
- <location filename="../QMenuStrings.cpp" line="3150"/>
+ <location filename="../QMenuStrings.cpp" line="1020"/>
+ <location filename="../QMenuStrings.cpp" line="4124"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1251"/>
- <location filename="../QMenuStrings.cpp" line="3159"/>
+ <location filename="../QMenuStrings.cpp" line="1029"/>
+ <location filename="../QMenuStrings.cpp" line="4133"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1260"/>
- <location filename="../QMenuStrings.cpp" line="3168"/>
+ <location filename="../QMenuStrings.cpp" line="1038"/>
+ <location filename="../QMenuStrings.cpp" line="4142"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1269"/>
- <location filename="../QMenuStrings.cpp" line="3177"/>
+ <location filename="../QMenuStrings.cpp" line="1047"/>
+ <location filename="../QMenuStrings.cpp" line="4151"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1278"/>
- <location filename="../QMenuStrings.cpp" line="3186"/>
+ <location filename="../QMenuStrings.cpp" line="1056"/>
+ <location filename="../QMenuStrings.cpp" line="4160"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1296"/>
- <location filename="../QMenuStrings.cpp" line="3204"/>
- <location filename="../QMenuStrings.cpp" line="4225"/>
+ <location filename="../QMenuStrings.cpp" line="1074"/>
+ <location filename="../QMenuStrings.cpp" line="2456"/>
+ <location filename="../QMenuStrings.cpp" line="4178"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1305"/>
- <location filename="../QMenuStrings.cpp" line="3213"/>
+ <location filename="../QMenuStrings.cpp" line="1083"/>
+ <location filename="../QMenuStrings.cpp" line="4187"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1314"/>
- <location filename="../QMenuStrings.cpp" line="3222"/>
+ <location filename="../QMenuStrings.cpp" line="1092"/>
+ <location filename="../QMenuStrings.cpp" line="4196"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1323"/>
- <location filename="../QMenuStrings.cpp" line="3231"/>
- <location filename="../QMenuStrings.cpp" line="4216"/>
+ <location filename="../QMenuStrings.cpp" line="1101"/>
+ <location filename="../QMenuStrings.cpp" line="2447"/>
+ <location filename="../QMenuStrings.cpp" line="4205"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1332"/>
- <location filename="../QMenuStrings.cpp" line="3240"/>
+ <location filename="../QMenuStrings.cpp" line="1110"/>
+ <location filename="../QMenuStrings.cpp" line="4214"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1341"/>
- <location filename="../QMenuStrings.cpp" line="3249"/>
+ <location filename="../QMenuStrings.cpp" line="1119"/>
+ <location filename="../QMenuStrings.cpp" line="4223"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1359"/>
- <location filename="../QMenuStrings.cpp" line="3267"/>
+ <location filename="../QMenuStrings.cpp" line="1137"/>
+ <location filename="../QMenuStrings.cpp" line="4241"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1368"/>
- <location filename="../QMenuStrings.cpp" line="3276"/>
+ <location filename="../QMenuStrings.cpp" line="1146"/>
+ <location filename="../QMenuStrings.cpp" line="4250"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1377"/>
- <location filename="../QMenuStrings.cpp" line="3285"/>
+ <location filename="../QMenuStrings.cpp" line="1155"/>
+ <location filename="../QMenuStrings.cpp" line="4259"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1387"/>
- <location filename="../QMenuStrings.cpp" line="3295"/>
+ <location filename="../QMenuStrings.cpp" line="1165"/>
+ <location filename="../QMenuStrings.cpp" line="4269"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1396"/>
- <location filename="../QMenuStrings.cpp" line="3304"/>
+ <location filename="../QMenuStrings.cpp" line="1174"/>
+ <location filename="../QMenuStrings.cpp" line="4278"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1405"/>
- <location filename="../QMenuStrings.cpp" line="3313"/>
- <location filename="../QMenuStrings.cpp" line="3894"/>
+ <location filename="../QMenuStrings.cpp" line="1183"/>
+ <location filename="../QMenuStrings.cpp" line="2125"/>
+ <location filename="../QMenuStrings.cpp" line="4287"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1414"/>
- <location filename="../QMenuStrings.cpp" line="3322"/>
+ <location filename="../QMenuStrings.cpp" line="1192"/>
+ <location filename="../QMenuStrings.cpp" line="4296"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1423"/>
- <location filename="../QMenuStrings.cpp" line="3331"/>
+ <location filename="../QMenuStrings.cpp" line="1201"/>
+ <location filename="../QMenuStrings.cpp" line="4305"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1432"/>
- <location filename="../QMenuStrings.cpp" line="3340"/>
- <location filename="../QMenuStrings.cpp" line="3903"/>
+ <location filename="../QMenuStrings.cpp" line="1210"/>
+ <location filename="../QMenuStrings.cpp" line="2134"/>
+ <location filename="../QMenuStrings.cpp" line="4314"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1441"/>
- <location filename="../QMenuStrings.cpp" line="3349"/>
+ <location filename="../QMenuStrings.cpp" line="1219"/>
+ <location filename="../QMenuStrings.cpp" line="4323"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1450"/>
- <location filename="../QMenuStrings.cpp" line="3358"/>
+ <location filename="../QMenuStrings.cpp" line="1228"/>
+ <location filename="../QMenuStrings.cpp" line="4332"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1459"/>
- <location filename="../QMenuStrings.cpp" line="3367"/>
+ <location filename="../QMenuStrings.cpp" line="1237"/>
+ <location filename="../QMenuStrings.cpp" line="4341"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1468"/>
- <location filename="../QMenuStrings.cpp" line="3376"/>
+ <location filename="../QMenuStrings.cpp" line="1246"/>
+ <location filename="../QMenuStrings.cpp" line="4350"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1477"/>
- <location filename="../QMenuStrings.cpp" line="3385"/>
+ <location filename="../QMenuStrings.cpp" line="1255"/>
+ <location filename="../QMenuStrings.cpp" line="4359"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1486"/>
- <location filename="../QMenuStrings.cpp" line="3394"/>
+ <location filename="../QMenuStrings.cpp" line="1264"/>
+ <location filename="../QMenuStrings.cpp" line="4368"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1495"/>
- <location filename="../QMenuStrings.cpp" line="3403"/>
+ <location filename="../QMenuStrings.cpp" line="1273"/>
+ <location filename="../QMenuStrings.cpp" line="4377"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1504"/>
- <location filename="../QMenuStrings.cpp" line="3412"/>
- <location filename="../QMenuStrings.cpp" line="4063"/>
- <location filename="../QMenuStrings.cpp" line="4434"/>
+ <location filename="../QMenuStrings.cpp" line="1282"/>
+ <location filename="../QMenuStrings.cpp" line="1671"/>
+ <location filename="../QMenuStrings.cpp" line="2294"/>
+ <location filename="../QMenuStrings.cpp" line="4386"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1513"/>
- <location filename="../QMenuStrings.cpp" line="3421"/>
+ <location filename="../QMenuStrings.cpp" line="1291"/>
+ <location filename="../QMenuStrings.cpp" line="4395"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1522"/>
- <location filename="../QMenuStrings.cpp" line="3430"/>
- <location filename="../QMenuStrings.cpp" line="3995"/>
+ <location filename="../QMenuStrings.cpp" line="1300"/>
+ <location filename="../QMenuStrings.cpp" line="2226"/>
+ <location filename="../QMenuStrings.cpp" line="4404"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1531"/>
- <location filename="../QMenuStrings.cpp" line="3439"/>
- <location filename="../QMenuStrings.cpp" line="4045"/>
- <location filename="../QMenuStrings.cpp" line="4416"/>
+ <location filename="../QMenuStrings.cpp" line="1309"/>
+ <location filename="../QMenuStrings.cpp" line="1653"/>
+ <location filename="../QMenuStrings.cpp" line="2276"/>
+ <location filename="../QMenuStrings.cpp" line="4413"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1540"/>
- <location filename="../QMenuStrings.cpp" line="3457"/>
+ <location filename="../QMenuStrings.cpp" line="1318"/>
+ <location filename="../QMenuStrings.cpp" line="4431"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1553"/>
- <location filename="../QMenuStrings.cpp" line="3489"/>
+ <location filename="../QMenuStrings.cpp" line="1331"/>
+ <location filename="../QMenuStrings.cpp" line="4463"/>
<source>&Rosegarden Tutorial</source>
<translation>&Výukový materiál pro Rosegarden</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1559"/>
- <location filename="../QMenuStrings.cpp" line="3495"/>
- <location filename="../QMenuStrings.cpp" line="4377"/>
+ <location filename="../QMenuStrings.cpp" line="1337"/>
+ <location filename="../QMenuStrings.cpp" line="2608"/>
+ <location filename="../QMenuStrings.cpp" line="4469"/>
<source>Tools Toolbar</source>
<translation>Nástrojový pruh s ovládacÃmi nástroji</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1706"/>
- <location filename="../QMenuStrings.cpp" line="1754"/>
- <location filename="../QMenuStrings.cpp" line="4323"/>
+ <location filename="../QMenuStrings.cpp" line="1615"/>
+ <location filename="../QMenuStrings.cpp" line="1893"/>
+ <location filename="../QMenuStrings.cpp" line="2554"/>
<source>&Record</source>
<translation>&Nahrát</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1764"/>
+ <location filename="../QMenuStrings.cpp" line="1903"/>
<source>&Settings</source>
<translation>&NastavenÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1765"/>
+ <location filename="../QMenuStrings.cpp" line="1904"/>
<source>Number of Stereo &Inputs</source>
<translation>PoÄet stereo v&stupů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1766"/>
+ <location filename="../QMenuStrings.cpp" line="1905"/>
<source>&1 Input</source>
<translation>&1 vstup</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1767"/>
+ <location filename="../QMenuStrings.cpp" line="1906"/>
<source>&2 Inputs</source>
<translation>&2 vstupy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1768"/>
+ <location filename="../QMenuStrings.cpp" line="1907"/>
<source>&4 Inputs</source>
<translation>&4 vstupy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1769"/>
+ <location filename="../QMenuStrings.cpp" line="1908"/>
<source>&8 Inputs</source>
<translation>&8 vstupů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1770"/>
+ <location filename="../QMenuStrings.cpp" line="1909"/>
<source>1&6 Inputs</source>
<translation>1&6 vstupů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1771"/>
+ <location filename="../QMenuStrings.cpp" line="1910"/>
<source>&Number of Submasters</source>
<translation>&PoÄet Å™Ãzených sekvencerů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1772"/>
+ <location filename="../QMenuStrings.cpp" line="1911"/>
<source>No Submasters</source>
<translation>Žádné Å™Ãzené sekvencery</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1773"/>
+ <location filename="../QMenuStrings.cpp" line="1912"/>
<source>&2 Submasters</source>
<translation>&2 Å™Ãzené sekvencery</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1774"/>
+ <location filename="../QMenuStrings.cpp" line="1913"/>
<source>&4 Submasters</source>
<translation>&4 Å™Ãzené sekvencery</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1775"/>
+ <location filename="../QMenuStrings.cpp" line="1914"/>
<source>&8 Submasters</source>
<translation>&8 Å™Ãzených sekvencerů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1776"/>
+ <location filename="../QMenuStrings.cpp" line="1915"/>
<source>Panning &Law</source>
<translation>Stereo režim vyváženà (&L)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1777"/>
+ <location filename="../QMenuStrings.cpp" line="1916"/>
<source>&0dB Law (Basic Balance Control)</source>
<translation>Pravidlo &0dB (jednoduché ovládánà vyváženÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1778"/>
+ <location filename="../QMenuStrings.cpp" line="1917"/>
<source>-&3dB Law (Constant Power)</source>
<translation>Pravidlo -&3dB (stálá hlasitost)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1779"/>
+ <location filename="../QMenuStrings.cpp" line="1918"/>
<source>-&6dB Law (Reduced Center)</source>
<translation>Pravidlo -&6dB (snÞený stÅ™ed)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1780"/>
+ <location filename="../QMenuStrings.cpp" line="1919"/>
<source>&Alternate -3dB Law (Constant Power, 0dB Center)</source>
<translation>&Náhradnà pravidlo -3dB (stálá hlasitost, střed 0dB)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1781"/>
+ <location filename="../QMenuStrings.cpp" line="1920"/>
<source>Show &Audio Faders</source>
<translation>Ukázat &zvukové zeslabovaÄe</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1782"/>
+ <location filename="../QMenuStrings.cpp" line="1921"/>
<source>Show &Synth Faders</source>
<translation>Ukázat &syntezátorové zeslabovaÄe</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1783"/>
+ <location filename="../QMenuStrings.cpp" line="1922"/>
<source>Show Audio Su&bmasters</source>
<translation>Ukázat zvukové Å™Ãze&né sekvencery</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1784"/>
+ <location filename="../QMenuStrings.cpp" line="1923"/>
<source>Show &Plugin Buttons</source>
<translation>Ukázat tlaÄÃtka pÅ™Ãdavných &modulů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1785"/>
+ <location filename="../QMenuStrings.cpp" line="1924"/>
<source>Show &Unassigned Faders</source>
<translation>Zobrazit &nepÅ™iÅ™azené zeslabovaÄe</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1799"/>
+ <location filename="../QMenuStrings.cpp" line="1829"/>
<source>Switch to Inserting Tool</source>
<translation>PÅ™epnout na nástroj pro vkládánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1800"/>
+ <location filename="../QMenuStrings.cpp" line="1830"/>
<source>Collapse Rests After Erase</source>
<translation>Po vymazánà sjednotit pomlky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1811"/>
+ <location filename="../QMenuStrings.cpp" line="2784"/>
<source>P&rint Preview...</source>
<translation>Náhled t&isku...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1812"/>
- <location filename="../QMenuStrings.cpp" line="3802"/>
+ <location filename="../QMenuStrings.cpp" line="2033"/>
+ <location filename="../QMenuStrings.cpp" line="2785"/>
<source>&Print...</source>
<translation>&Tisk...</translation>
</message>
<message>
- <source>P&rint preview...</source>
- <translation type="obsolete">Náhled &tisku...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1868"/>
+ <location filename="../QMenuStrings.cpp" line="2841"/>
<source>C&ut and Close</source>
<translation>Vyjmout a &zavÅ™Ãt</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1877"/>
+ <location filename="../QMenuStrings.cpp" line="2850"/>
<source>Pa&ste...</source>
<translation>&Vložit...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1886"/>
+ <location filename="../QMenuStrings.cpp" line="2859"/>
<source>De&lete</source>
<translation>&Smazat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1895"/>
+ <location filename="../QMenuStrings.cpp" line="2868"/>
<source>&Move to Staff Above</source>
<translation>&Přesunout na osnovu výše</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1897"/>
+ <location filename="../QMenuStrings.cpp" line="2870"/>
<source>Move to Staff &Below</source>
<translation>Přesunout na osnovu &nÞe</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1899"/>
+ <location filename="../QMenuStrings.cpp" line="2872"/>
<source>Select from Sta&rt</source>
<translation>Vybrat od &zaÄátku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1900"/>
+ <location filename="../QMenuStrings.cpp" line="2873"/>
<source>Select to &End</source>
<translation>Vybrat do &konce</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1901"/>
+ <location filename="../QMenuStrings.cpp" line="2874"/>
<source>Select Whole St&aff</source>
<translation>Vybrat celou &osnovu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1910"/>
+ <location filename="../QMenuStrings.cpp" line="2883"/>
<source>Clear Select&ion</source>
<translation>Smazat &výběr</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1940"/>
+ <location filename="../QMenuStrings.cpp" line="2913"/>
<source>Note &Font</source>
<translation>Notové &pÃsmo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1941"/>
+ <location filename="../QMenuStrings.cpp" line="2914"/>
<source>Si&ze</source>
<translation>V&elikost</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1942"/>
+ <location filename="../QMenuStrings.cpp" line="2915"/>
<source>S&pacing</source>
<translation>&Rozestupy</translation>
</message>
<message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Faktor doby &trvánÃ</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1943"/>
+ <location filename="../QMenuStrings.cpp" line="2916"/>
<source>&Layout Mode</source>
<translation>Režim &rozvrženÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1944"/>
+ <location filename="../QMenuStrings.cpp" line="2917"/>
<source>&Linear Layout</source>
<translation>Čá&rové rozvrženÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1945"/>
+ <location filename="../QMenuStrings.cpp" line="2918"/>
<source>&Continuous Page Layout</source>
<translation>&Rozvrženà na jednu nepřetržitou stranu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1946"/>
+ <location filename="../QMenuStrings.cpp" line="2919"/>
<source>&Multiple Page Layout</source>
<translation>&Rozvrženà na vÃce stran</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1947"/>
+ <location filename="../QMenuStrings.cpp" line="2920"/>
<source>Open L&yric Editor</source>
<translation>OtevÅ™Ãt editor se &slovy pÃsnÄ›</translation>
</message>
<message>
- <source>Add Event Ruler</source>
- <translation type="obsolete">PÅ™idat pravÃtko událostÃ</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1970"/>
+ <location filename="../QMenuStrings.cpp" line="2943"/>
<source>Show &Track Headers</source>
<translation>Ukázat hlaviÄky s&top</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="695"/>
- <location filename="../QMenuStrings.cpp" line="1982"/>
- <location filename="../QMenuStrings.cpp" line="4047"/>
- <location filename="../QMenuStrings.cpp" line="4418"/>
+ <location filename="../QMenuStrings.cpp" line="473"/>
+ <location filename="../QMenuStrings.cpp" line="1655"/>
+ <location filename="../QMenuStrings.cpp" line="2278"/>
+ <location filename="../QMenuStrings.cpp" line="2956"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>OtevÅ™Ãt v tabulkovém editoru &bicÃch</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1984"/>
+ <location filename="../QMenuStrings.cpp" line="2958"/>
<source>Add Cle&f Change...</source>
<translation>PÅ™idat zmÄ›nu &klÃÄe...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="696"/>
- <location filename="../QMenuStrings.cpp" line="1986"/>
+ <location filename="../QMenuStrings.cpp" line="474"/>
+ <location filename="../QMenuStrings.cpp" line="2960"/>
<source>Add &Key Change...</source>
<translation>Přidat změnu &tóniny...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1987"/>
+ <location filename="../QMenuStrings.cpp" line="2961"/>
<source>Add Pedal &Press</source>
<translation>Přidat &sešlápnutà pedálu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1988"/>
+ <location filename="../QMenuStrings.cpp" line="2962"/>
<source>Add Pedal &Release</source>
<translation>Přidat &uvolněnà pedálu</translation>
</message>
<message>
- <source>&Set Segment Start Time...</source>
- <translation type="obsolete">&Nastavit poÄáteÄnà Äas Äásti...</translation>
- </message>
- <message>
- <source>Transpose by &Inverval...</source>
- <translation type="obsolete">PÅ™emÃstit o &interval...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1992"/>
- <location filename="../QMenuStrings.cpp" line="4103"/>
+ <location filename="../QMenuStrings.cpp" line="2334"/>
+ <location filename="../QMenuStrings.cpp" line="2966"/>
<source>&Convert Notation for...</source>
<translation>&Převést notový zápis pro...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1993"/>
+ <location filename="../QMenuStrings.cpp" line="2967"/>
<source>Add &Layer</source>
<translation>Přidat &vrstvu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2399"/>
+ <location filename="../QMenuStrings.cpp" line="3373"/>
<source>Ctrl+Alt+1</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2003"/>
+ <location filename="../QMenuStrings.cpp" line="2977"/>
<source>N&ote</source>
<translation>N&ota(y)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1823"/>
- <location filename="../QMenuStrings.cpp" line="3824"/>
- <location filename="../QMenuStrings.cpp" line="4375"/>
- <location filename="../QMenuStrings.cpp" line="4454"/>
+ <location filename="../QMenuStrings.cpp" line="1691"/>
+ <location filename="../QMenuStrings.cpp" line="2055"/>
+ <location filename="../QMenuStrings.cpp" line="2606"/>
+ <location filename="../QMenuStrings.cpp" line="2796"/>
<source>&Nothing to Undo</source>
<translation>&Nic pro vzetà zpět</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1832"/>
- <location filename="../QMenuStrings.cpp" line="3833"/>
- <location filename="../QMenuStrings.cpp" line="4376"/>
- <location filename="../QMenuStrings.cpp" line="4463"/>
+ <location filename="../QMenuStrings.cpp" line="1700"/>
+ <location filename="../QMenuStrings.cpp" line="2064"/>
+ <location filename="../QMenuStrings.cpp" line="2607"/>
+ <location filename="../QMenuStrings.cpp" line="2805"/>
<source>N&othing to Redo</source>
<translation>N&ic pro provedenà znovu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1919"/>
+ <location filename="../QMenuStrings.cpp" line="2892"/>
<source>Search and Selec&t</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1937"/>
+ <location filename="../QMenuStrings.cpp" line="2910"/>
<source>&Guess Beats</source>
<translation>&Hádat doby</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1961"/>
+ <location filename="../QMenuStrings.cpp" line="2934"/>
<source>Show &Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1985"/>
+ <location filename="../QMenuStrings.cpp" line="2959"/>
<source>Add Clef Change in This Link Only...</source>
<translation>PÅ™idat zmÄ›nu klÃÄe pouze v tomto odkazu...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2002"/>
+ <location filename="../QMenuStrings.cpp" line="2976"/>
<source>Unadopt an Adopted Segment</source>
<translation>ZruÅ¡it pÅ™ijetà pÅ™ijmuté Äásti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2004"/>
+ <location filename="../QMenuStrings.cpp" line="2978"/>
<source>Mar&ks</source>
<translation>ZnaÄ&ky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2005"/>
+ <location filename="../QMenuStrings.cpp" line="2979"/>
<source>Add &Accent</source>
<translation>PÅ™idat &pÅ™Ãzvuk</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2006"/>
+ <location filename="../QMenuStrings.cpp" line="2980"/>
<source>Add T&enuto</source>
<translation>Přidat t&enuto</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2007"/>
+ <location filename="../QMenuStrings.cpp" line="2981"/>
<source>Add Sta&ccato</source>
<translation>Přidat sta&ccato</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2008"/>
+ <location filename="../QMenuStrings.cpp" line="2982"/>
<source>Add &Staccatissimo</source>
<translation>Přidat &staccatissimo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2009"/>
+ <location filename="../QMenuStrings.cpp" line="2983"/>
<source>Add &Marcato</source>
<translation>Přidat &marcato</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2012"/>
+ <location filename="../QMenuStrings.cpp" line="2986"/>
<source>Add S&forzando</source>
<translation>Přidat s&forzando</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2013"/>
+ <location filename="../QMenuStrings.cpp" line="2987"/>
<source>Add R&inforzando</source>
<translation>Přidat r&inforzando</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2014"/>
+ <location filename="../QMenuStrings.cpp" line="2988"/>
<source>Add Tri&ll</source>
<translation>Přidat try&lek</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2015"/>
+ <location filename="../QMenuStrings.cpp" line="2989"/>
<source>Add &Turn</source>
<translation>Přidat &obal</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2016"/>
+ <location filename="../QMenuStrings.cpp" line="2990"/>
<source>Add M&ordent</source>
<translation>Přidat m&ordent</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2017"/>
+ <location filename="../QMenuStrings.cpp" line="2991"/>
<source>Add I&nverted Mordent</source>
<translation>Přidat o&brácený mordent</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2018"/>
+ <location filename="../QMenuStrings.cpp" line="2992"/>
<source>Add Long Mordent</source>
<translation>Přidat dlouhý mordent</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2019"/>
+ <location filename="../QMenuStrings.cpp" line="2993"/>
<source>Add Lon&g Inverted Mordent</source>
<translation>Přidat dlo&hý obrácený mordent</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2020"/>
+ <location filename="../QMenuStrings.cpp" line="2994"/>
<source>Add &Up-Bow</source>
<translation>PÅ™idat &smyk nahoru/od Å¡piÄky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2021"/>
+ <location filename="../QMenuStrings.cpp" line="2995"/>
<source>Add &Down-Bow</source>
<translation>Přidat &smyk/tah dolů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2022"/>
+ <location filename="../QMenuStrings.cpp" line="2996"/>
<source>Add &Harmonic</source>
<translation>PÅ™idat &alikvotnÃ/Äástkový tón</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2023"/>
+ <location filename="../QMenuStrings.cpp" line="2997"/>
<source>Add &Pause</source>
<translation>Přidat &pomlku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2024"/>
+ <location filename="../QMenuStrings.cpp" line="2998"/>
<source>Add Te&xt Mark...</source>
<translation>PÅ™idat te&xtovou znaÄku...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2025"/>
+ <location filename="../QMenuStrings.cpp" line="2999"/>
<source>&Remove All Marks</source>
<translation>&Odstranit vÅ¡echny znaÄky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2026"/>
+ <location filename="../QMenuStrings.cpp" line="3000"/>
<source>&Ornaments</source>
<translation>Melodické &ozdoby</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2027"/>
+ <location filename="../QMenuStrings.cpp" line="3001"/>
<source>Trigger &Ornament...</source>
<translation>Spouštěcà melodická &ozdoba...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2028"/>
+ <location filename="../QMenuStrings.cpp" line="3002"/>
<source>&Remove Ornament...</source>
<translation>&Odstranit melodické ozdoby...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2029"/>
+ <location filename="../QMenuStrings.cpp" line="3003"/>
<source>Ma&ke Ornament...</source>
<translation>&Vytvořit melodickou ozdobu...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2030"/>
+ <location filename="../QMenuStrings.cpp" line="3004"/>
<source>&Edit Ornament as Notation</source>
<translation>&Upravit ozdobu jako notový zápis</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2031"/>
+ <location filename="../QMenuStrings.cpp" line="3005"/>
<source>&Show Expansion of Ornament</source>
<translation>&Ukázat rozklad ozdoby</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2032"/>
+ <location filename="../QMenuStrings.cpp" line="3006"/>
<source>Skip This Part of Ornament (&Mask Tied Note)</source>
<translation>PÅ™eskoÄit tuto Äást ozdoby (&zakrýt svázanou notu)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2033"/>
+ <location filename="../QMenuStrings.cpp" line="3007"/>
<source>Don't Skip This Part (&Unmask Tied Note)</source>
<translation>NepÅ™eskakovat tuto Äást ozdoby (&zruÅ¡it zakrytà svázané noty)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2034"/>
+ <location filename="../QMenuStrings.cpp" line="3008"/>
<source>&Fingerings</source>
<translation>P&rstoklady</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2035"/>
+ <location filename="../QMenuStrings.cpp" line="3009"/>
<source>&Remove Fingerings</source>
<translation>&Odstranit prstoklady</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2036"/>
+ <location filename="../QMenuStrings.cpp" line="3010"/>
<source>Add Fingering &0 (Thumb)</source>
<translation>Přidat prstoklad &0 (palec)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2043"/>
+ <location filename="../QMenuStrings.cpp" line="3017"/>
<source>Alt+0</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2045"/>
+ <location filename="../QMenuStrings.cpp" line="3019"/>
<source>Add Fingering &1</source>
<translation>Přidat prstoklad &1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2052"/>
+ <location filename="../QMenuStrings.cpp" line="3026"/>
<source>Alt+1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2054"/>
+ <location filename="../QMenuStrings.cpp" line="3028"/>
<source>Add Fingering &2</source>
<translation>Přidat prstoklad &2</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2061"/>
+ <location filename="../QMenuStrings.cpp" line="3035"/>
<source>Alt+2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2063"/>
+ <location filename="../QMenuStrings.cpp" line="3037"/>
<source>Add Fingering &3</source>
<translation>Přidat prstoklad &3</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2070"/>
+ <location filename="../QMenuStrings.cpp" line="3044"/>
<source>Alt+3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2072"/>
+ <location filename="../QMenuStrings.cpp" line="3046"/>
<source>Add Fingering &4</source>
<translation>Přidat prstoklad &4</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2079"/>
+ <location filename="../QMenuStrings.cpp" line="3053"/>
<source>Alt+4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2081"/>
+ <location filename="../QMenuStrings.cpp" line="3055"/>
<source>Add Fingering &5</source>
<translation>Přidat prstoklad &5</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2088"/>
+ <location filename="../QMenuStrings.cpp" line="3062"/>
<source>Alt+5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2090"/>
+ <location filename="../QMenuStrings.cpp" line="3064"/>
<source>&Add Fingering +</source>
<translation>Přidat prsto&klad +</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2097"/>
+ <location filename="../QMenuStrings.cpp" line="3071"/>
<source>Alt+9</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2099"/>
+ <location filename="../QMenuStrings.cpp" line="3073"/>
<source>Add Other &Fingering...</source>
<translation>Přidat dalšà &prstoklad...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2100"/>
+ <location filename="../QMenuStrings.cpp" line="3074"/>
<source>S&lashes</source>
<translation>Å ik&mé Äáry</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2101"/>
+ <location filename="../QMenuStrings.cpp" line="3075"/>
<source>&None</source>
<translation>Žá&dná</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2102"/>
+ <location filename="../QMenuStrings.cpp" line="3076"/>
<source>&1</source>
<translation>&1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2103"/>
+ <location filename="../QMenuStrings.cpp" line="3077"/>
<source>&2</source>
<translation>&2</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2104"/>
+ <location filename="../QMenuStrings.cpp" line="3078"/>
<source>&3</source>
<translation>&3</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2105"/>
+ <location filename="../QMenuStrings.cpp" line="3079"/>
<source>&4</source>
<translation>&4</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2106"/>
+ <location filename="../QMenuStrings.cpp" line="3080"/>
<source>&5</source>
<translation>&5</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2107"/>
+ <location filename="../QMenuStrings.cpp" line="3081"/>
<source>&Cycle Slashes</source>
<translation>&ToÄit Å¡ikmé Äáry</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2114"/>
+ <location filename="../QMenuStrings.cpp" line="3088"/>
<source>/</source>
<comment>keyboard shortcut</comment>
<translation>/</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2116"/>
+ <location filename="../QMenuStrings.cpp" line="3090"/>
<source>Note &Style</source>
<translation>&Styl not</translation>
</message>
<message>
- <source>&Classical</source>
- <translation type="obsolete">Klasi&cký</translation>
- </message>
- <message>
- <source>C&ross</source>
- <translation type="obsolete">&KřÞ</translation>
- </message>
- <message>
- <source>&Mensural</source>
- <translation type="obsolete">&MenzurálnÃ</translation>
- </message>
- <message>
- <source>&Triangle</source>
- <translation type="obsolete">&TrojúhelnÃk</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="2121"/>
- <location filename="../QMenuStrings.cpp" line="2829"/>
+ <location filename="../QMenuStrings.cpp" line="3095"/>
+ <location filename="../QMenuStrings.cpp" line="3803"/>
<source>&Accidentals</source>
<translation>&Posuvky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2122"/>
+ <location filename="../QMenuStrings.cpp" line="3096"/>
<source>&Restore Accidentals</source>
<translation>&Obnovit posuvky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2123"/>
+ <location filename="../QMenuStrings.cpp" line="3097"/>
<source>Respell with Dou&ble Flat</source>
<translation>Přepsat s dvojitým &b</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2124"/>
+ <location filename="../QMenuStrings.cpp" line="3098"/>
<source>Respell with &Flat</source>
<translation>Přepsat s &b</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2125"/>
+ <location filename="../QMenuStrings.cpp" line="3099"/>
<source>Respell with &Natural</source>
<translation>PÅ™epsat bez &pÅ™edznamenánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2126"/>
+ <location filename="../QMenuStrings.cpp" line="3100"/>
<source>Respell with &Sharp</source>
<translation>Přepsat s &křÞkem</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2127"/>
+ <location filename="../QMenuStrings.cpp" line="3101"/>
<source>Respell with Do&uble Sharp</source>
<translation>PÅ™epsat s &dvojitým křÞkem</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2128"/>
+ <location filename="../QMenuStrings.cpp" line="3102"/>
<source>Use &Cautionary Accidentals</source>
<translation>PoužÃt &varovné posuvky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2129"/>
+ <location filename="../QMenuStrings.cpp" line="3103"/>
<source>Cancel C&autionary Accidentals</source>
<translation>Zrušit v&arovné posuvky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2130"/>
+ <location filename="../QMenuStrings.cpp" line="3104"/>
<source>Stem &Up</source>
<translation>NožiÄku noty na&horu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2137"/>
+ <location filename="../QMenuStrings.cpp" line="3111"/>
<source>Ctrl+PgUp</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2139"/>
+ <location filename="../QMenuStrings.cpp" line="3113"/>
<source>Stem &Down</source>
<translation>NožiÄku noty do&lů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2146"/>
+ <location filename="../QMenuStrings.cpp" line="3120"/>
<source>Ctrl+PgDown</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2148"/>
+ <location filename="../QMenuStrings.cpp" line="3122"/>
<source>&Restore Stems</source>
<translation>&Obnovit nožiÄky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="668"/>
- <location filename="../QMenuStrings.cpp" line="2149"/>
+ <location filename="../QMenuStrings.cpp" line="446"/>
+ <location filename="../QMenuStrings.cpp" line="3123"/>
<source>&Phrase</source>
<translation>&Fráze</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2150"/>
+ <location filename="../QMenuStrings.cpp" line="3124"/>
<source>&Make Chord</source>
<translation>&Vytvořit akord</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2151"/>
+ <location filename="../QMenuStrings.cpp" line="3125"/>
<source>&Beam Group</source>
<translation>Skupina s &trámcem</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2158"/>
+ <location filename="../QMenuStrings.cpp" line="3132"/>
<source>Ctrl+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2160"/>
+ <location filename="../QMenuStrings.cpp" line="3134"/>
<source>&Auto-Beam</source>
<translation>&Automatické trámce</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2167"/>
+ <location filename="../QMenuStrings.cpp" line="3141"/>
<source>Ctrl+Alt+B</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+B</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2169"/>
+ <location filename="../QMenuStrings.cpp" line="3143"/>
<source>&Unbeam</source>
<translation>&Odstranit trámce</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2176"/>
+ <location filename="../QMenuStrings.cpp" line="3150"/>
<source>Ctrl+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2178"/>
+ <location filename="../QMenuStrings.cpp" line="3152"/>
<source>Tupl&et...</source>
<translation>Tupl&et...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2185"/>
- <location filename="../QMenuStrings.cpp" line="4153"/>
+ <location filename="../QMenuStrings.cpp" line="2384"/>
+ <location filename="../QMenuStrings.cpp" line="3159"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2187"/>
+ <location filename="../QMenuStrings.cpp" line="3161"/>
<source>&Triplet</source>
<translation>&Triola</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2194"/>
+ <location filename="../QMenuStrings.cpp" line="3168"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2196"/>
+ <location filename="../QMenuStrings.cpp" line="3170"/>
<source>U&ntuplet</source>
<translation>Odstra&nit tuplet</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2197"/>
+ <location filename="../QMenuStrings.cpp" line="3171"/>
<source>Add S&lur</source>
<translation>Přidat &legato</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2204"/>
+ <location filename="../QMenuStrings.cpp" line="3178"/>
<source>)</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2206"/>
+ <location filename="../QMenuStrings.cpp" line="3180"/>
<source>Add P&hrasing Slur</source>
<translation>Přidat frá&zovacà legato</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2213"/>
+ <location filename="../QMenuStrings.cpp" line="3187"/>
<source>Ctrl+)</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2215"/>
+ <location filename="../QMenuStrings.cpp" line="3189"/>
<source>Slur &Position</source>
<translation>&Poloha legata</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2216"/>
+ <location filename="../QMenuStrings.cpp" line="3190"/>
<source>&Restore Slur Positions</source>
<translation>&Obnovit polohy legata</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2217"/>
+ <location filename="../QMenuStrings.cpp" line="3191"/>
<source>Slur &Above</source>
<translation>Legato &nad</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2218"/>
+ <location filename="../QMenuStrings.cpp" line="3192"/>
<source>Slur &Below</source>
<translation>Legato &pod</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="669"/>
- <location filename="../QMenuStrings.cpp" line="2219"/>
+ <location filename="../QMenuStrings.cpp" line="447"/>
+ <location filename="../QMenuStrings.cpp" line="3193"/>
<source>T&ie</source>
<translation>&Svázat tóny ligaturou</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="676"/>
- <location filename="../QMenuStrings.cpp" line="2226"/>
+ <location filename="../QMenuStrings.cpp" line="454"/>
+ <location filename="../QMenuStrings.cpp" line="3200"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="678"/>
- <location filename="../QMenuStrings.cpp" line="2228"/>
+ <location filename="../QMenuStrings.cpp" line="456"/>
+ <location filename="../QMenuStrings.cpp" line="3202"/>
<source>&Untie</source>
<translation>&Zrušit ligaturu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="685"/>
- <location filename="../QMenuStrings.cpp" line="2235"/>
+ <location filename="../QMenuStrings.cpp" line="463"/>
+ <location filename="../QMenuStrings.cpp" line="3209"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2237"/>
+ <location filename="../QMenuStrings.cpp" line="2951"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QMenuStrings.cpp" line="3211"/>
<source>Tie &Position</source>
<translation>&Poloha ligatury</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2238"/>
+ <location filename="../QMenuStrings.cpp" line="3212"/>
<source>&Restore Tie Position</source>
<translation>&Obnovit polohu ligatury</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2239"/>
+ <location filename="../QMenuStrings.cpp" line="3213"/>
<source>Tie &Above</source>
<translation>Ligatura &nad</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2240"/>
+ <location filename="../QMenuStrings.cpp" line="3214"/>
<source>Tie &Below</source>
<translation>Ligatura &pod</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2241"/>
+ <location filename="../QMenuStrings.cpp" line="3215"/>
<source>Add &Crescendo</source>
<translation>Přidat &crescendo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2248"/>
+ <location filename="../QMenuStrings.cpp" line="3222"/>
<source><</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2250"/>
+ <location filename="../QMenuStrings.cpp" line="3224"/>
<source>Add &Decescendo</source>
<translation>Přidat &decrescendo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2257"/>
+ <location filename="../QMenuStrings.cpp" line="3231"/>
<source>></source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2259"/>
+ <location filename="../QMenuStrings.cpp" line="3233"/>
<source>Add Trill With &Line</source>
<translation>Přidat try&lek s linkou</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2260"/>
+ <location filename="../QMenuStrings.cpp" line="3234"/>
<source>&Octaves</source>
<translation>&Oktávy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2261"/>
+ <location filename="../QMenuStrings.cpp" line="3235"/>
<source>&Add Double-Octave Up</source>
<translation>Přidat dvojitou ok&távu nahoru</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2262"/>
+ <location filename="../QMenuStrings.cpp" line="3236"/>
<source>Add Octave &Up</source>
<translation>Přidat oktávu &nahoru</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2263"/>
+ <location filename="../QMenuStrings.cpp" line="3237"/>
<source>Add Octave &Down</source>
<translation>Přidat oktávu &dolů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2264"/>
+ <location filename="../QMenuStrings.cpp" line="3238"/>
<source>Add Double &Octave Down</source>
<translation>Přidat dvojitou &oktávu dolů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2265"/>
+ <location filename="../QMenuStrings.cpp" line="3239"/>
<source>&Figuration</source>
<translation>&Figurace</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2266"/>
+ <location filename="../QMenuStrings.cpp" line="3240"/>
<source>Make &Parameter Chord</source>
<translation>UdÄ›lat akord ¶metru</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2267"/>
+ <location filename="../QMenuStrings.cpp" line="3241"/>
<source>Mark Selection as &Figuration</source>
<translation>OznaÄit výbÄ›r jako &figuraci</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2270"/>
+ <location filename="../QMenuStrings.cpp" line="3244"/>
<source>R&ests</source>
<translation>P&omlky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2271"/>
+ <location filename="../QMenuStrings.cpp" line="3245"/>
<source>&Normalize Rests</source>
<translation>&Normalizovat pomlky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2280"/>
+ <location filename="../QMenuStrings.cpp" line="3254"/>
<source>&Collapse Rests</source>
<translation>&Sjednotit pomlky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2281"/>
+ <location filename="../QMenuStrings.cpp" line="3255"/>
<source>&Notes</source>
<translation>&Noty</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2291"/>
+ <location filename="../QMenuStrings.cpp" line="3265"/>
<source>Tie Notes at &Barlines</source>
<translation>Svázat noty ligaturou na &taktových Äárách</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2292"/>
+ <location filename="../QMenuStrings.cpp" line="3266"/>
<source>Split-and-Tie Overlapping &Chords</source>
<translation>RozdÄ›lit a svázat ligaturou pÅ™ekrývajÃcà se &akordy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2293"/>
+ <location filename="../QMenuStrings.cpp" line="3267"/>
<source>Cycle &Dots</source>
<translation>ToÄit &teÄky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2300"/>
+ <location filename="../QMenuStrings.cpp" line="3274"/>
<source>Ctrl+.</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+.</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2302"/>
+ <location filename="../QMenuStrings.cpp" line="3276"/>
<source>Cycle Dots With&out Duration Change</source>
<translation>ToÄit teÄky be&ze zmÄ›ny doby trvánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2309"/>
+ <location filename="../QMenuStrings.cpp" line="3283"/>
<source>Ctrl+Alt+.</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+.</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2311"/>
+ <location filename="../QMenuStrings.cpp" line="3285"/>
<source>Double Whole Note</source>
<translation>Dvoucelá nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2318"/>
+ <location filename="../QMenuStrings.cpp" line="3292"/>
<source>Ctrl+5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2320"/>
+ <location filename="../QMenuStrings.cpp" line="3294"/>
<source>Whole Note</source>
<translation>Celá nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2327"/>
+ <location filename="../QMenuStrings.cpp" line="3301"/>
<source>Ctrl+1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2329"/>
+ <location filename="../QMenuStrings.cpp" line="3303"/>
<source>Half Note</source>
<translation>Půlová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2336"/>
+ <location filename="../QMenuStrings.cpp" line="3310"/>
<source>Ctrl+2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2338"/>
+ <location filename="../QMenuStrings.cpp" line="3312"/>
<source>Quarter Note</source>
<translation>Čtvrťová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2345"/>
+ <location filename="../QMenuStrings.cpp" line="3319"/>
<source>Ctrl+4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2347"/>
+ <location filename="../QMenuStrings.cpp" line="3321"/>
<source>Eighth Note</source>
<translation>Osminová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2354"/>
+ <location filename="../QMenuStrings.cpp" line="3328"/>
<source>Ctrl+8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2356"/>
+ <location filename="../QMenuStrings.cpp" line="3330"/>
<source>Sixteenth Note</source>
<translation>Šestnáctinová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2363"/>
+ <location filename="../QMenuStrings.cpp" line="3337"/>
<source>Ctrl+6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2365"/>
+ <location filename="../QMenuStrings.cpp" line="3339"/>
<source>Thirty-Second Note</source>
<translation>Dvaatřicetinová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2372"/>
+ <location filename="../QMenuStrings.cpp" line="3346"/>
<source>Ctrl+3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2374"/>
+ <location filename="../QMenuStrings.cpp" line="3348"/>
<source>Sixty-Fourth Note</source>
<translation>Čtyřiašedesátinová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2381"/>
+ <location filename="../QMenuStrings.cpp" line="3355"/>
<source>Ctrl+0</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2383"/>
+ <location filename="../QMenuStrings.cpp" line="3357"/>
<source>Double Whole Note (Without Duration Change)</source>
<translation>Dvoucelá nota (beze zmÄ›ny doby trvánÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2390"/>
+ <location filename="../QMenuStrings.cpp" line="3364"/>
<source>Ctrl+Alt+5</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+5</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2392"/>
+ <location filename="../QMenuStrings.cpp" line="3366"/>
<source>Whole Note (Without Duration Change)</source>
<translation>Celá nota (beze zmÄ›ny doby trvánÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2401"/>
+ <location filename="../QMenuStrings.cpp" line="3375"/>
<source>Half Note (Without Duration Change)</source>
<translation>Půlová nota (beze zmÄ›ny doby trvánÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2408"/>
+ <location filename="../QMenuStrings.cpp" line="3382"/>
<source>Ctrl+Alt+2</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+2</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2410"/>
+ <location filename="../QMenuStrings.cpp" line="3384"/>
<source>Quarter Note (Without Duration Change)</source>
<translation>ÄŒtvrÅ¥ová nota (beze zmÄ›ny doby trvánÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2417"/>
+ <location filename="../QMenuStrings.cpp" line="3391"/>
<source>Ctrl+Alt+4</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+4</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2419"/>
+ <location filename="../QMenuStrings.cpp" line="3393"/>
<source>Eighth Note (Without Duration Change)</source>
<translation>Osminová nota (beze zmÄ›ny doby trvánÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2426"/>
+ <location filename="../QMenuStrings.cpp" line="3400"/>
<source>Ctrl+Alt+8</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+8</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2428"/>
+ <location filename="../QMenuStrings.cpp" line="3402"/>
<source>Sixteenth Note (Without Duration Change)</source>
<translation>Å estnáctinová nota (beze zmÄ›ny doby trvánÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2435"/>
+ <location filename="../QMenuStrings.cpp" line="3409"/>
<source>Ctrl+Alt+6</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+6</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2437"/>
+ <location filename="../QMenuStrings.cpp" line="3411"/>
<source>Thirty-Second Note (Without Duration Change)</source>
<translation>DvaatÅ™icetinová nota (beze zmÄ›ny doby trvánÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2444"/>
+ <location filename="../QMenuStrings.cpp" line="3418"/>
<source>Ctrl+Alt+3</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+3</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2446"/>
+ <location filename="../QMenuStrings.cpp" line="3420"/>
<source>Sixty-Fourth Note (Without Duration Change)</source>
<translation>ÄŒtyÅ™iaÅ¡edesátinová nota (beze zmÄ›ny doby trvánÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2453"/>
+ <location filename="../QMenuStrings.cpp" line="3427"/>
<source>Ctrl+Alt+0</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+0</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2465"/>
+ <location filename="../QMenuStrings.cpp" line="3439"/>
<source>Fi&x Notation Quantization</source>
<translation>O&pravit kvantizaci notace</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2466"/>
+ <location filename="../QMenuStrings.cpp" line="3440"/>
<source>Remo&ve Notation Quantization</source>
<translation>&Odstranit kvantizaci notace</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2467"/>
+ <location filename="../QMenuStrings.cpp" line="3441"/>
<source>&Interpret...</source>
<translation>&Vykládat...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2468"/>
+ <location filename="../QMenuStrings.cpp" line="3442"/>
<source>Rescale</source>
<translation>Změnit délku (rychleji/pomaleji)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2527"/>
+ <location filename="../QMenuStrings.cpp" line="3501"/>
<source>Convert</source>
<translation>Převést</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2531"/>
+ <location filename="../QMenuStrings.cpp" line="3505"/>
<source>Ve&locities</source>
<translation>Rych&losti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2550"/>
+ <location filename="../QMenuStrings.cpp" line="3524"/>
<source>Set Event &Velocities</source>
<translation>Nastavit &rychlosti událostÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2551"/>
+ <location filename="../QMenuStrings.cpp" line="3525"/>
<source>&Fine Positioning</source>
<translation>&Jemné doladěnà polohy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2552"/>
+ <location filename="../QMenuStrings.cpp" line="3526"/>
<source>&Restore Positions</source>
<translation>&Obnovit polohy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2553"/>
+ <location filename="../QMenuStrings.cpp" line="3527"/>
<source>Push &Left</source>
<translation>Odsunout v&levo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2554"/>
+ <location filename="../QMenuStrings.cpp" line="3528"/>
<source>&Push Right</source>
<translation>Odsunout vp&ravo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2555"/>
+ <location filename="../QMenuStrings.cpp" line="3529"/>
<source>Push &Up</source>
<translation>Odsunout &nahoru</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2556"/>
+ <location filename="../QMenuStrings.cpp" line="3530"/>
<source>Push &Down</source>
<translation>Odsunout &dolů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2557"/>
+ <location filename="../QMenuStrings.cpp" line="3531"/>
<source>Fine Ti&ming</source>
<translation>Je&mné ÄasovánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2567"/>
- <location filename="../QMenuStrings.cpp" line="4117"/>
+ <location filename="../QMenuStrings.cpp" line="2348"/>
+ <location filename="../QMenuStrings.cpp" line="3541"/>
<source>Jog &Right</source>
<translation>Krokový posun v&pravo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2576"/>
+ <location filename="../QMenuStrings.cpp" line="3550"/>
<source>&Visibility</source>
<translation>&Viditelnost</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2577"/>
+ <location filename="../QMenuStrings.cpp" line="3551"/>
<source>Make &Invisible</source>
<translation>Z&neviditelnit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2578"/>
+ <location filename="../QMenuStrings.cpp" line="3552"/>
<source>Make &Visible</source>
<translation>Z&viditelnit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2683"/>
+ <location filename="../QMenuStrings.cpp" line="3657"/>
<source>Play</source>
<translation>Přehrát</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2690"/>
+ <location filename="../QMenuStrings.cpp" line="3664"/>
<source>Stop</source>
<translation>Zastavit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2768"/>
+ <location filename="../QMenuStrings.cpp" line="3742"/>
<source>Solo the Active Track</source>
<translatorcomment>PÅ™ehrávat Äinnou stopu jako sólo</translatorcomment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2783"/>
+ <location filename="../QMenuStrings.cpp" line="3757"/>
<source>Scroll to Follow Playback</source>
<translation>Pohled sleduje polohu pÅ™ehrávánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2798"/>
+ <location filename="../QMenuStrings.cpp" line="3772"/>
<source>Panic! (Ctrl+Alt+P)</source>
<translation>Nouzové zastavenÃ! (Ctrl+Alt+P)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2811"/>
+ <location filename="../QMenuStrings.cpp" line="3785"/>
<source>Draw &Notes and Rests</source>
<translation>Kreslit ¬y a pomlky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2842"/>
+ <location filename="../QMenuStrings.cpp" line="3816"/>
<source>S&ymbols</source>
<translation>S&ymboly</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2642"/>
+ <location filename="../QMenuStrings.cpp" line="3616"/>
<source>Next Staff &Up</source>
<translation>Dalšà osnovu na&horu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2651"/>
+ <location filename="../QMenuStrings.cpp" line="3625"/>
<source>Next Staff &Down</source>
<translation>Dalšà osnovu do&lů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="918"/>
- <location filename="../QMenuStrings.cpp" line="2660"/>
+ <location filename="../QMenuStrings.cpp" line="696"/>
+ <location filename="../QMenuStrings.cpp" line="3634"/>
<source>Pre&vious Segment</source>
<translation>&PÅ™edchozà Äást</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="927"/>
- <location filename="../QMenuStrings.cpp" line="2669"/>
+ <location filename="../QMenuStrings.cpp" line="705"/>
+ <location filename="../QMenuStrings.cpp" line="3643"/>
<source>Ne&xt Segment</source>
<translation>D&alÅ¡Ã Äást</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="938"/>
- <location filename="../QMenuStrings.cpp" line="2692"/>
+ <location filename="../QMenuStrings.cpp" line="716"/>
+ <location filename="../QMenuStrings.cpp" line="3666"/>
<source>Step &Back</source>
<translation>Krok &zpět</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="953"/>
- <location filename="../QMenuStrings.cpp" line="2707"/>
+ <location filename="../QMenuStrings.cpp" line="731"/>
+ <location filename="../QMenuStrings.cpp" line="3681"/>
<source>Step &Forward</source>
<translation>Krok &vpřed</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1875"/>
+ <location filename="../QMenuStrings.cpp" line="2848"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1884"/>
+ <location filename="../QMenuStrings.cpp" line="2857"/>
<source>Alt+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2278"/>
- <location filename="../QMenuStrings.cpp" line="3750"/>
+ <location filename="../QMenuStrings.cpp" line="1981"/>
+ <location filename="../QMenuStrings.cpp" line="3252"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="735"/>
- <location filename="../QMenuStrings.cpp" line="2289"/>
+ <location filename="../QMenuStrings.cpp" line="513"/>
+ <location filename="../QMenuStrings.cpp" line="3263"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2649"/>
+ <location filename="../QMenuStrings.cpp" line="3623"/>
<source>Alt+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2658"/>
+ <location filename="../QMenuStrings.cpp" line="3632"/>
<source>Alt+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2853"/>
+ <location filename="../QMenuStrings.cpp" line="3827"/>
<source>F8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2862"/>
+ <location filename="../QMenuStrings.cpp" line="3836"/>
<source>F9</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2864"/>
+ <location filename="../QMenuStrings.cpp" line="3838"/>
<source>&Durations</source>
<translation>&Doby trvánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2865"/>
+ <location filename="../QMenuStrings.cpp" line="3839"/>
<source>&Double Whole Note</source>
<translation>&Dvoucelá nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2874"/>
+ <location filename="../QMenuStrings.cpp" line="3848"/>
<source>&Whole Note</source>
<translation>&Celá nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2883"/>
+ <location filename="../QMenuStrings.cpp" line="3857"/>
<source>&Half Note</source>
<translation>&Půlová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2892"/>
+ <location filename="../QMenuStrings.cpp" line="3866"/>
<source>&Quarter Note</source>
<translation>Č&tvrťová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2901"/>
+ <location filename="../QMenuStrings.cpp" line="3875"/>
<source>&Eighth Note</source>
<translation>&Osminová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2910"/>
+ <location filename="../QMenuStrings.cpp" line="3884"/>
<source>&Sixteenth note</source>
<translation>Š&estnáctinová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2919"/>
+ <location filename="../QMenuStrings.cpp" line="3893"/>
<source>&Thirty-Second Note</source>
<translation>&Dvaatřicetinová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2928"/>
+ <location filename="../QMenuStrings.cpp" line="3902"/>
<source>Sixty-&Fourth Note</source>
<translation>Čtyřiašede&sátinová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2937"/>
+ <location filename="../QMenuStrings.cpp" line="3911"/>
<source>D&otted Whole Note</source>
<translation>TeÄkovaná &celá nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2939"/>
+ <location filename="../QMenuStrings.cpp" line="3913"/>
<source>Dotted Q&uarter Note</source>
<translation>TeÄkovaná Ät&vrÅ¥ová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2940"/>
+ <location filename="../QMenuStrings.cpp" line="3914"/>
<source>Dotted E&ighth Note</source>
<translation>TeÄkovaná osmi&nová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2941"/>
+ <location filename="../QMenuStrings.cpp" line="3915"/>
<source>Dotted Si&xteenth Note</source>
<translation>TeÄkovaná Å¡estná&ctinová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2942"/>
+ <location filename="../QMenuStrings.cpp" line="3916"/>
<source>Dotted Thirt&y-Second Note</source>
<translation>TeÄkovaná dvaatÅ™iceti&nová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2830"/>
+ <location filename="../QMenuStrings.cpp" line="3804"/>
<source>&No Accidental</source>
<translation>Bez &posuvky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2831"/>
+ <location filename="../QMenuStrings.cpp" line="3805"/>
<source>&Follow Previous Accidental</source>
<translation>&Následovat předchozà posuvku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2832"/>
+ <location filename="../QMenuStrings.cpp" line="3806"/>
<source>&Sharp</source>
<translation>&KřÞek</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2833"/>
+ <location filename="../QMenuStrings.cpp" line="3807"/>
<source>F&lat</source>
<translation>&BéÄko</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2834"/>
+ <location filename="../QMenuStrings.cpp" line="3808"/>
<source>N&atural</source>
<translation>Be&z pÅ™edznamenánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2835"/>
+ <location filename="../QMenuStrings.cpp" line="3809"/>
<source>&Double Sharp</source>
<translation>&Dvojitý křÞek</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2836"/>
+ <location filename="../QMenuStrings.cpp" line="3810"/>
<source>D&ouble Flat</source>
<translation>&Dvojité bé</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2837"/>
+ <location filename="../QMenuStrings.cpp" line="3811"/>
<source>&Clefs</source>
<translation>Notov̩ &kl̀e</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2838"/>
+ <location filename="../QMenuStrings.cpp" line="3812"/>
<source>&Treble Clef</source>
<translation>&Houslový klÃÄ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2839"/>
+ <location filename="../QMenuStrings.cpp" line="3813"/>
<source>&Alto Clef</source>
<translation>&Violový klÃÄ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2840"/>
+ <location filename="../QMenuStrings.cpp" line="3814"/>
<source>Te&nor Clef</source>
<translation>&Tenorový klÃÄ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2841"/>
+ <location filename="../QMenuStrings.cpp" line="3815"/>
<source>&Bass Clef</source>
<translation>&Basový klÃÄ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2846"/>
+ <location filename="../QMenuStrings.cpp" line="3820"/>
<source>&Text</source>
<translation>&Text</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2855"/>
+ <location filename="../QMenuStrings.cpp" line="3829"/>
<source>&Guitar Chord</source>
<translation>&Kytarový akord</translation>
</message>
<message>
- <source>Cursor &Up Staff</source>
- <translation type="obsolete">Posunout kurzor v osnovÄ› &nahoru</translation>
- </message>
- <message>
- <source>Cursor &Down Staff</source>
- <translation type="obsolete">Posunout kurzor v osnově &dolů</translation>
- </message>
- <message>
- <source>Cursor Pre&vious Segment</source>
- <translation type="obsolete">Kurzor na &předchozà segment</translation>
- </message>
- <message>
- <source>Cursor Ne&xt Segment</source>
- <translation type="obsolete">Kurzor na &následujÃcà segment</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1071"/>
- <location filename="../QMenuStrings.cpp" line="2979"/>
+ <location filename="../QMenuStrings.cpp" line="849"/>
+ <location filename="../QMenuStrings.cpp" line="3953"/>
<source>&Insert Note</source>
<translation>&Vložit notu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1379"/>
- <location filename="../QMenuStrings.cpp" line="3287"/>
+ <location filename="../QMenuStrings.cpp" line="1157"/>
+ <location filename="../QMenuStrings.cpp" line="4261"/>
<source>&Lower Octave</source>
<translation>&Nižšà oktáva</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3441"/>
+ <location filename="../QMenuStrings.cpp" line="4415"/>
<source>Insert Rest</source>
<translation>Vložit pomlku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3459"/>
+ <location filename="../QMenuStrings.cpp" line="4433"/>
<source>Triplet Insert Mo&de</source>
<translation>Zadávacà r&ežim pro trioly</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3477"/>
+ <location filename="../QMenuStrings.cpp" line="4451"/>
<source>Grace Insert &Mode</source>
<translation>Zadávacà reži&m pro ozdoby</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1950"/>
- <location filename="../QMenuStrings.cpp" line="3939"/>
+ <location filename="../QMenuStrings.cpp" line="2170"/>
+ <location filename="../QMenuStrings.cpp" line="2923"/>
<source>Show T&ools Toolbar</source>
<translation>Ukázat nástrojový pruh s ovládacÃmi &nástroji</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1951"/>
+ <location filename="../QMenuStrings.cpp" line="2924"/>
<source>Show &Accidentals Toolbar</source>
<translation>Ukázat nástrojový pruh pro &posuvky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1952"/>
+ <location filename="../QMenuStrings.cpp" line="2925"/>
<source>Show Cle&fs Toolbar</source>
<translation>Ukázat nástrojový pruh pro notové &klÃÄe</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1953"/>
+ <location filename="../QMenuStrings.cpp" line="2926"/>
<source>Show &Marks Toolbar</source>
<translation>Ukázat nástrojový pruh pro &znaÄky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1954"/>
+ <location filename="../QMenuStrings.cpp" line="2927"/>
<source>Show &Group Toolbar</source>
<translation>Ukázat nástrojový pruh pro &skupiny</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1956"/>
- <location filename="../QMenuStrings.cpp" line="3942"/>
+ <location filename="../QMenuStrings.cpp" line="2173"/>
+ <location filename="../QMenuStrings.cpp" line="2929"/>
<source>Show Trans&port Toolbar</source>
<translation>Ukázat nástrojový pruh pro pře&sun</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1957"/>
+ <location filename="../QMenuStrings.cpp" line="2930"/>
<source>Show &Layout Toolbar</source>
<translation>Ukázat nástrojový pruh pro &rozvrženÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3946"/>
+ <location filename="../QMenuStrings.cpp" line="2177"/>
<source>Show Cho&rd Name Ruler</source>
<translation>Ukázat pravÃtko s názvy &akordů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1965"/>
+ <location filename="../QMenuStrings.cpp" line="2938"/>
<source>Show Ra&w Note Ruler</source>
<translation>Ukázat pravÃtko z&drojových not</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1971"/>
+ <location filename="../QMenuStrings.cpp" line="2944"/>
<source>Show &Annotations</source>
<translation>Ukázat &vysvětlivky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1972"/>
+ <location filename="../QMenuStrings.cpp" line="2945"/>
<source>Show Lily&Pond Directives</source>
<translation>Ukázat pokyny Lily&Pond</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3678"/>
+ <location filename="../QMenuStrings.cpp" line="4652"/>
<source>Clefs Toolbar</source>
<translation>Nástrojový pruh pro notové klÃÄe</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3679"/>
+ <location filename="../QMenuStrings.cpp" line="4653"/>
<source>Accidentals Toolbar</source>
<translation>Nástrojový pruh pro posuvky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3682"/>
+ <location filename="../QMenuStrings.cpp" line="4656"/>
<source>Group Toolbar</source>
<translation>Nástrojový pruh pro skupinu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3681"/>
+ <location filename="../QMenuStrings.cpp" line="4655"/>
<source>Marks Toolbar</source>
<translation>Nástrojový pruh pro znaÄky pÅ™ednesu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="547"/>
+ <location filename="../QMenuStrings.cpp" line="325"/>
<source>Select &All Events</source>
<translation>Vybrat &všechny události</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="657"/>
+ <location filename="../QMenuStrings.cpp" line="435"/>
<source>Show To&ols</source>
<translation>Ukázat ná&stroje</translation>
</message>
<message>
- <source>&Events</source>
- <translation type="obsolete">&Události</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="855"/>
+ <location filename="../QMenuStrings.cpp" line="633"/>
<source>Remove &Triggers</source>
<translation>Odstranit sp&ouÅ¡tÄ›Äe</translation>
</message>
<message>
- <source>Pitch &Bend Sequence...</source>
- <translation type="obsolete">Pořadà &změn výšek tónů...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="658"/>
+ <location filename="../QMenuStrings.cpp" line="436"/>
<source>Show T&ransport Toolbar</source>
<translation>Ukázat nástrojový pruh s o&bslužným polem pro přesun</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1544"/>
- <location filename="../QMenuStrings.cpp" line="3480"/>
- <location filename="../QMenuStrings.cpp" line="4360"/>
+ <location filename="../QMenuStrings.cpp" line="1322"/>
+ <location filename="../QMenuStrings.cpp" line="2591"/>
+ <location filename="../QMenuStrings.cpp" line="4454"/>
<source>Rosegarden &Manual</source>
<translation>&PÅ™ÃruÄka k programu Rosegarden</translation>
</message>
<message>
- <source>Rosegarden &Mandbook</source>
- <translation type="obsolete">&PÅ™ÃruÄka k programu Rosegarden</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="286"/>
- <location filename="../QMenuStrings.cpp" line="574"/>
+ <location filename="../QMenuStrings.cpp" line="352"/>
+ <location filename="../QMenuStrings.cpp" line="1468"/>
<source>Preferences...</source>
<translation>Volby...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="665"/>
- <location filename="../QMenuStrings.cpp" line="1967"/>
+ <location filename="../QMenuStrings.cpp" line="443"/>
+ <location filename="../QMenuStrings.cpp" line="2940"/>
<source>Show &Velocity Ruler</source>
<translation>Ukázat pruh se zmÄ›nami v &sÃle tónu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="666"/>
- <location filename="../QMenuStrings.cpp" line="1968"/>
+ <location filename="../QMenuStrings.cpp" line="444"/>
+ <location filename="../QMenuStrings.cpp" line="2941"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Ukázat pravÃtko se &zmÄ›nami výšek tónů</translation>
</message>
<message>
- <source>Add &Control Ruler...</source>
- <translation type="obsolete">PÅ™idat &ovládacà pravÃtko...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="864"/>
+ <location filename="../QMenuStrings.cpp" line="642"/>
<source>Cursor Back and Se&lect</source>
<translation>Ukazovátko zpět a vy&brat</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1562"/>
- <location filename="../QMenuStrings.cpp" line="3685"/>
+ <location filename="../QMenuStrings.cpp" line="1340"/>
+ <location filename="../QMenuStrings.cpp" line="4659"/>
<source>Rulers Toolbar</source>
<translation>Nástrojový pruh s pravÃtky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1896"/>
+ <location filename="../QMenuStrings.cpp" line="2869"/>
<source>&Move to Staff Above...</source>
<translation>&Přesunout na osnovu výše...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1898"/>
+ <location filename="../QMenuStrings.cpp" line="2871"/>
<source>Move to Staff &Below...</source>
<translation>Přesunout na osnovu &nÞe...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1938"/>
- <location filename="../QMenuStrings.cpp" line="3934"/>
+ <location filename="../QMenuStrings.cpp" line="2165"/>
+ <location filename="../QMenuStrings.cpp" line="2911"/>
<source>&Preferences...</source>
<translation>&Volby...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1958"/>
+ <location filename="../QMenuStrings.cpp" line="2931"/>
<source>Show La&yer Toolbar</source>
<translation>Ukázat nástrojový pruh s v&rstvami</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1959"/>
+ <location filename="../QMenuStrings.cpp" line="2932"/>
<source>Show &Rulers Toolbar</source>
<translation>Ukázat nástrojový pruh s &pravÃtky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1960"/>
+ <location filename="../QMenuStrings.cpp" line="2933"/>
<source>Show &Duration Toolbar</source>
<translation>Ukázat nástrojový pruh s &dobami trvánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1973"/>
+ <location filename="../QMenuStrings.cpp" line="2946"/>
<source>Dump staves (debug)</source>
<translation>Vypsat osnovy (ladÄ›nÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1974"/>
+ <location filename="../QMenuStrings.cpp" line="2947"/>
<source>Dump BarDataMap (debug)</source>
<translation>Vypsat mapu s daty o taktech (ladÄ›nÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1983"/>
- <location filename="../QMenuStrings.cpp" line="4074"/>
- <location filename="../QMenuStrings.cpp" line="4445"/>
+ <location filename="../QMenuStrings.cpp" line="1682"/>
+ <location filename="../QMenuStrings.cpp" line="2305"/>
+ <location filename="../QMenuStrings.cpp" line="2957"/>
<source>Open in &Pitch Tracker</source>
<translation>OtevÅ™Ãt sledovánà &výšky tónu</translation>
</message>
<message>
- <source>Add Clef Change in this link only...</source>
- <translation type="obsolete">PÅ™idat zmÄ›nu klÃÄe pouze v tomto odkazu...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="2000"/>
+ <location filename="../QMenuStrings.cpp" line="2974"/>
<source>Ctrl+Alt++</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2117"/>
+ <location filename="../QMenuStrings.cpp" line="3091"/>
<source>Classical</source>
<translation>Klasický</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2118"/>
+ <location filename="../QMenuStrings.cpp" line="3092"/>
<source>Cross</source>
<translation>KřÞ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2119"/>
+ <location filename="../QMenuStrings.cpp" line="3093"/>
<source>Mensural</source>
<translation>MenzurálnÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2268"/>
+ <location filename="../QMenuStrings.cpp" line="3242"/>
<source>Mark Selection as Auto-Generated</source>
<translation>OznaÄit výbÄ›r jako automaticky vytvoÅ™ený</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2584"/>
+ <location filename="../QMenuStrings.cpp" line="3558"/>
<source>Insert &Expression Controller Sequence...</source>
<translation>Vložit poÅ™adà ovládacÃho prvku &výrazu...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2810"/>
+ <location filename="../QMenuStrings.cpp" line="3784"/>
<source>Select but Don't Follow Ties</source>
<translation>Vybrat ale nesledovat ligatury</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2943"/>
+ <location filename="../QMenuStrings.cpp" line="3917"/>
<source>Switch to &Notes</source>
<translation>PÅ™epnout na ¬y</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2952"/>
+ <location filename="../QMenuStrings.cpp" line="3926"/>
<source>Switch to &Rests</source>
<translation>Přepnout na &pomlky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2961"/>
+ <location filename="../QMenuStrings.cpp" line="3935"/>
<source>To&ggle Dot on</source>
<translation>&Zapnout teÄky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2970"/>
+ <location filename="../QMenuStrings.cpp" line="3944"/>
<source>To&ggle Dot off</source>
<translation>&Vypnout teÄky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3468"/>
+ <location filename="../QMenuStrings.cpp" line="4442"/>
<source>Tuplet Insert Mo&de</source>
<translation>R&ežim vkládánà rytmických notových skupin</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3475"/>
+ <location filename="../QMenuStrings.cpp" line="4449"/>
<source>;</source>
<comment>keyboard shortcut</comment>
<translation>;</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3502"/>
+ <location filename="../QMenuStrings.cpp" line="4476"/>
<source>Double Whole Note (5)</source>
<translation>Dvoucelá nota (5)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3508"/>
+ <location filename="../QMenuStrings.cpp" line="4482"/>
<source>Whole Note (1)</source>
<translation>Celá nota (1)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3514"/>
+ <location filename="../QMenuStrings.cpp" line="4488"/>
<source>Half Note (2)</source>
<translation>Půlová nota (2)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3520"/>
+ <location filename="../QMenuStrings.cpp" line="4494"/>
<source>Quarter Note (4)</source>
<translation>Čtvrťová nota (4)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3526"/>
+ <location filename="../QMenuStrings.cpp" line="4500"/>
<source>Eighth Note (8)</source>
<translation>Osminová nota (8)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3532"/>
+ <location filename="../QMenuStrings.cpp" line="4506"/>
<source>Sixteenth Note (6)</source>
<translation>Šestnáctinová nota (6)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3538"/>
+ <location filename="../QMenuStrings.cpp" line="4512"/>
<source>Thirty-Second Note (3)</source>
<translation>Dvaatřicetinová nota (3)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3544"/>
+ <location filename="../QMenuStrings.cpp" line="4518"/>
<source>Sixty-Fourth Note (0)</source>
<translation>Čtyřiašedesátinová nota (0)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3550"/>
+ <location filename="../QMenuStrings.cpp" line="4524"/>
<source>Dotted Double Whole Note</source>
<translation>TeÄkovaná dvoucelá nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3556"/>
+ <location filename="../QMenuStrings.cpp" line="4530"/>
<source>Dotted Whole Note</source>
<translation>TeÄkovaná celá nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3562"/>
+ <location filename="../QMenuStrings.cpp" line="4536"/>
<source>Dotted Half Note</source>
<translation>TeÄkovaná půlová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3568"/>
+ <location filename="../QMenuStrings.cpp" line="4542"/>
<source>Dotted Quarter Note</source>
<translation>TeÄkovaná ÄtvrÅ¥ová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3574"/>
+ <location filename="../QMenuStrings.cpp" line="4548"/>
<source>Dotted Eighth Note</source>
<translation>TeÄkovaná osminová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3580"/>
+ <location filename="../QMenuStrings.cpp" line="4554"/>
<source>Dotted Sixteenth Note</source>
<translation>TeÄkovaná Å¡estnáctinová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3586"/>
+ <location filename="../QMenuStrings.cpp" line="4560"/>
<source>Dotted Thirty-Second Note</source>
<translation>TeÄkovaná dvaatÅ™icetinová nota</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3592"/>
+ <location filename="../QMenuStrings.cpp" line="4566"/>
<source>Double Whole Rest (5)</source>
<translation>Dvojitá celá pomlka (5)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3598"/>
+ <location filename="../QMenuStrings.cpp" line="4572"/>
<source>Whole Rest (1)</source>
<translation>Celá pomlka (1)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3604"/>
+ <location filename="../QMenuStrings.cpp" line="4578"/>
<source>Half Rest (2)</source>
<translation>Půlová pomlka (2)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3610"/>
+ <location filename="../QMenuStrings.cpp" line="4584"/>
<source>Quarter Rest (4)</source>
<translation>Čtvrťová pomlka (4)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3616"/>
+ <location filename="../QMenuStrings.cpp" line="4590"/>
<source>Eighth Rest (8)</source>
<translation>Osminová pomlka (8)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3622"/>
+ <location filename="../QMenuStrings.cpp" line="4596"/>
<source>Sixteenth Rest (6)</source>
<translation>Šestnáctinová pomlka (6)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3628"/>
+ <location filename="../QMenuStrings.cpp" line="4602"/>
<source>Thirty-Second Rest (3)</source>
<translation>Dvaatřicetinová pomlka (3)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3634"/>
+ <location filename="../QMenuStrings.cpp" line="4608"/>
<source>Sixty-Fourth Rest (0)</source>
<translation>Čtyřiašedesátinová pomlka (0)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3640"/>
+ <location filename="../QMenuStrings.cpp" line="4614"/>
<source>Dotted Double Whole Rest</source>
<translation>TeÄkovaná dvojitá celá pomlka</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3646"/>
+ <location filename="../QMenuStrings.cpp" line="4620"/>
<source>Dotted Whole Rest</source>
<translation>TeÄkovaná celá pomlka</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3652"/>
+ <location filename="../QMenuStrings.cpp" line="4626"/>
<source>Dotted Half Rest</source>
<translation>TeÄkovaná půlová pomlka</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3658"/>
+ <location filename="../QMenuStrings.cpp" line="4632"/>
<source>Dotted Quarter Rest</source>
<translation>TeÄkovaná ÄtvrÅ¥ová pomlka</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3664"/>
+ <location filename="../QMenuStrings.cpp" line="4638"/>
<source>Dotted Eighth Rest</source>
<translation>TeÄkovaná osminová pomlka</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3670"/>
+ <location filename="../QMenuStrings.cpp" line="4644"/>
<source>Dotted Sixteenth Rest</source>
<translation>TeÄkovaná Å¡estnáctinová pomlka</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3676"/>
+ <location filename="../QMenuStrings.cpp" line="4650"/>
<source>Dotted Thirty-Second Rest</source>
<translation>TeÄkovaná dvaatÅ™icetinová pomlka</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3683"/>
+ <location filename="../QMenuStrings.cpp" line="4657"/>
<source>Layout Toolbar</source>
<translation>Nástrojový pruh pro uspořádánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3684"/>
+ <location filename="../QMenuStrings.cpp" line="4658"/>
<source>Layer Toolbar</source>
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3686"/>
+ <location filename="../QMenuStrings.cpp" line="4660"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3687"/>
+ <location filename="../QMenuStrings.cpp" line="4661"/>
<source>&Interpret Active Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3688"/>
+ <location filename="../QMenuStrings.cpp" line="4662"/>
<source>Interpret &Text Dynamics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3693"/>
+ <location filename="../QMenuStrings.cpp" line="4667"/>
<source>Adjust velocity to follow text dynamics (f, p, mf...)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3695"/>
+ <location filename="../QMenuStrings.cpp" line="4669"/>
<source>Interpret &Hairpins</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3700"/>
+ <location filename="../QMenuStrings.cpp" line="4674"/>
<source>Adjust velocity to follow hairpin dynamics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3702"/>
+ <location filename="../QMenuStrings.cpp" line="4676"/>
<source>Interpret &Slurs and Marks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3707"/>
+ <location filename="../QMenuStrings.cpp" line="4681"/>
<source>Articulate slurs, staccato, tenuto, etc.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3709"/>
+ <location filename="../QMenuStrings.cpp" line="4683"/>
<source>Interpret &Beats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3714"/>
+ <location filename="../QMenuStrings.cpp" line="4688"/>
<source>Place accents on certain beats according to the time signature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3716"/>
+ <location filename="../QMenuStrings.cpp" line="239"/>
<source>Switch to Insert Tool</source>
<translation>PÅ™epnout na nástroj pro vkládánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3718"/>
+ <location filename="../QMenuStrings.cpp" line="241"/>
<source>Collapse Rests</source>
<translation>Sjednotit pomlky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3719"/>
+ <location filename="../QMenuStrings.cpp" line="242"/>
<source>Respell as Flat</source>
<translation>Provést enharmonickou zámÄ›nu s béÄkem</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3720"/>
+ <location filename="../QMenuStrings.cpp" line="243"/>
<source>Respell as Sharp</source>
<translation>Provést enharmonickou zámÄ›nu s křÞkem</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3721"/>
+ <location filename="../QMenuStrings.cpp" line="244"/>
<source>Respell as Natural</source>
<translation>Provést enharmonickou zámÄ›nu bez pÅ™edznamenánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3722"/>
+ <location filename="../QMenuStrings.cpp" line="245"/>
<source>Collapse Notes</source>
<translation>Sjednotit noty</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3723"/>
+ <location filename="../QMenuStrings.cpp" line="246"/>
<source>Interpret</source>
<translation>Ztvárnit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3724"/>
+ <location filename="../QMenuStrings.cpp" line="247"/>
<source>Move to Staff Above</source>
<translation>Přesunout na osnovu výše</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3725"/>
+ <location filename="../QMenuStrings.cpp" line="248"/>
<source>Move to Staff Below</source>
<translation>Přesunout na osnovu nÞe</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3726"/>
+ <location filename="../QMenuStrings.cpp" line="249"/>
<source>Make Invisible</source>
<translation>Zneviditelnit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3727"/>
+ <location filename="../QMenuStrings.cpp" line="250"/>
<source>Make Visible</source>
<translation>Zviditelnit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3734"/>
+ <location filename="../QMenuStrings.cpp" line="1347"/>
<source>Auto-Beam when appropriate</source>
<translation>Automatické trámce tam, kde je to vhodné</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3735"/>
+ <location filename="../QMenuStrings.cpp" line="1348"/>
<source>No Accidental</source>
<translation>Bez posuvky</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3736"/>
+ <location filename="../QMenuStrings.cpp" line="1349"/>
<source>Follow Previous Accidental</source>
<translation>Následovat předchozà posuvku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3737"/>
+ <location filename="../QMenuStrings.cpp" line="1350"/>
<source>Sharp</source>
<translation>KřÞek</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3738"/>
+ <location filename="../QMenuStrings.cpp" line="1351"/>
<source>Flat</source>
<translation>BéÄko</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3739"/>
+ <location filename="../QMenuStrings.cpp" line="1352"/>
<source>Natural</source>
<translation>Bez pÅ™edznamenánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3740"/>
+ <location filename="../QMenuStrings.cpp" line="1353"/>
<source>Double Sharp</source>
<translation>Dvojitý křÞek</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3741"/>
+ <location filename="../QMenuStrings.cpp" line="1354"/>
<source>Double Flat</source>
<translation>Dvojité bé</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3743"/>
+ <location filename="../QMenuStrings.cpp" line="1974"/>
<source>&New</source>
<translation>&Nový</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3752"/>
+ <location filename="../QMenuStrings.cpp" line="1983"/>
<source>&Import</source>
<translation>&Zavést</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Zavést soubor s &projektem programu Rosegarden...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Zavést soubor &MIDI...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="3756"/>
+ <location filename="../QMenuStrings.cpp" line="1987"/>
<source>Import &Hydrogen file...</source>
<translation>Zavést soubor &Hydrogen...</translation>
</message>
<message>
- <source>Import MusicXM&L file...</source>
- <translation type="obsolete">Zavést soubor MusicXM&L...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="3758"/>
+ <location filename="../QMenuStrings.cpp" line="1989"/>
<source>&Merge</source>
<translation>&Připojit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3759"/>
+ <location filename="../QMenuStrings.cpp" line="1990"/>
<source>Merge &File...</source>
<translation>Připojit &soubor...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Připojit soubor &MIDI...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="3762"/>
+ <location filename="../QMenuStrings.cpp" line="1993"/>
<source>Merge &Hydrogen file...</source>
<translation>Připojit soubor &Hydrogen...</translation>
</message>
<message>
- <source>Merge MusicXM&L file...</source>
- <translation type="obsolete">Připojit soubor MusicXM&L...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="3764"/>
+ <location filename="../QMenuStrings.cpp" line="1995"/>
<source>&Export</source>
<translation>&Vyvést</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Vyvést jako soubor s &projektem programu Rosegarden...</translation>
- </message>
- <message>
- <source>Export &Lilypond file...</source>
- <translation type="obsolete">Vyvést jako soubor ve formátu &LilyPond...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Vyvést jako soubor &MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Vyvést jako soubor s notovým zápisem pro &Csound...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Vyvést jako soubor M&up...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Vyvést jako hudebnà soubor XML (Music&XML)...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="3771"/>
+ <location filename="../QMenuStrings.cpp" line="2002"/>
<source>&Open...</source>
<translation>&OtevÅ™Ãt...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3780"/>
+ <location filename="../QMenuStrings.cpp" line="2011"/>
<source>Open &Recent</source>
<translation>OtevÅ™Ãt &nedávný</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Uložit &jako...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="3799"/>
+ <location filename="../QMenuStrings.cpp" line="2030"/>
<source>Save as &Template...</source>
<translation>Uložit jako před&lohu...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3800"/>
+ <location filename="../QMenuStrings.cpp" line="2031"/>
<source>Re&vert</source>
<translation>&Vrátit</translation>
</message>
<message>
- <source>Prin&t preview...</source>
- <translation type="obsolete">Náhled t&isku...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="3803"/>
+ <location filename="../QMenuStrings.cpp" line="2034"/>
<source>Manage A&udio Files</source>
<translation>Správa zv&ukových souborů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3804"/>
+ <location filename="../QMenuStrings.cpp" line="2035"/>
<source>Play&list</source>
<translation>Seznam &skladeb</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3814"/>
+ <location filename="../QMenuStrings.cpp" line="2045"/>
<source>&Quit</source>
<translation>&UkonÄit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3887"/>
+ <location filename="../QMenuStrings.cpp" line="2118"/>
<source>Cut &Range</source>
<translation>Vyjmout &oblast</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3896"/>
+ <location filename="../QMenuStrings.cpp" line="2127"/>
<source>Cop&y Range</source>
<translation>Ko&pÃrovat oblast</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3905"/>
+ <location filename="../QMenuStrings.cpp" line="2136"/>
<source>Pa&ste Range</source>
<translation>V&ložit oblast</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3914"/>
+ <location filename="../QMenuStrings.cpp" line="2145"/>
<source>&Insert Range...</source>
<translation>&Vložit oblast...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3925"/>
+ <location filename="../QMenuStrings.cpp" line="2156"/>
<source>Select &All Segments</source>
<translation>Vybrat &vÅ¡echny Äásti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3936"/>
+ <location filename="../QMenuStrings.cpp" line="2167"/>
<source>Document P&roperties...</source>
<translation>&Vlastnosti dokumentu...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3973"/>
+ <location filename="../QMenuStrings.cpp" line="2204"/>
<source>&Open Tempo and Time Signature Editor</source>
<translation>OtevÅ™Ãt editor pro temp&o a taktové oznaÄenÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3974"/>
+ <location filename="../QMenuStrings.cpp" line="2205"/>
<source>Set &Tempo to Audio Segment Duration</source>
<translation>Nastavit &tempo na dobu trvánà zvukové Äásti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3975"/>
+ <location filename="../QMenuStrings.cpp" line="2206"/>
<source>Set Tempos from &Beat Segment</source>
<translation>Nastavit tempa z Äásti &doby</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3977"/>
+ <location filename="../QMenuStrings.cpp" line="2208"/>
<source>Change &Composition Start and End...</source>
<translation>ZmÄ›nit zaÄátek a konec &skladby...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3978"/>
+ <location filename="../QMenuStrings.cpp" line="2209"/>
<source>Edit Mar&kers...</source>
<translation>Upravit zn&aÄky...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3987"/>
+ <location filename="../QMenuStrings.cpp" line="2218"/>
<source>Edit Document P&roperties...</source>
<translation>Upravit vlas&tnosti dokumentu...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3988"/>
+ <location filename="../QMenuStrings.cpp" line="2219"/>
<source>&Set Quick Marker at Playback Position</source>
<translation>&UmÃstit rychlou znaÄku v poloze pÅ™ehrávánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2754"/>
- <location filename="../QMenuStrings.cpp" line="3997"/>
+ <location filename="../QMenuStrings.cpp" line="2228"/>
+ <location filename="../QMenuStrings.cpp" line="3728"/>
<source>&Jump to Quick Marker</source>
<translation>&SkoÄit k rychlé znaÄce</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4006"/>
+ <location filename="../QMenuStrings.cpp" line="2237"/>
<source>&Studio</source>
<translation>&Studio</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4007"/>
+ <location filename="../QMenuStrings.cpp" line="2238"/>
<source>&Audio Mixer</source>
<translation>Zv&ukový směšovaÄ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4009"/>
+ <location filename="../QMenuStrings.cpp" line="2240"/>
<source>Manage MIDI &Devices</source>
<translation>Správa zaÅ™Ãzenà MI&DI</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4010"/>
+ <location filename="../QMenuStrings.cpp" line="2241"/>
<source>Manage S&ynth Plugins</source>
<translation>Správa pÅ™Ãdavných modulů s&yntetizéru</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4011"/>
+ <location filename="../QMenuStrings.cpp" line="2242"/>
<source>Manage &Metronome</source>
<translation>Správa &metronomu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4012"/>
+ <location filename="../QMenuStrings.cpp" line="2243"/>
<source>Modify MIDI &Filters</source>
<translation>Upravit &filtry MIDI</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4013"/>
+ <location filename="../QMenuStrings.cpp" line="2244"/>
<source>MIDI &Thru Routing</source>
<translation>Vedenà MIDI &přes</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4014"/>
+ <location filename="../QMenuStrings.cpp" line="2245"/>
<source>&Reset MIDI Network</source>
<translation>Provést &pÅ™enastavenà sÃtÄ› MIDI</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4015"/>
+ <location filename="../QMenuStrings.cpp" line="2246"/>
<source>Im&port Studio from File...</source>
<translation>Za&vést studio ze souboru...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4016"/>
+ <location filename="../QMenuStrings.cpp" line="2247"/>
<source>&Import Default Studio</source>
<translation>&Zavést výchozà studio</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4017"/>
+ <location filename="../QMenuStrings.cpp" line="2248"/>
<source>&Save Current Document as Default Studio</source>
<translation>&Uložit souÄasný dokument jako výchozà studio</translation>
</message>
<message>
- <source>Se&gments</source>
- <translation type="obsolete">Čás&ti</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="4019"/>
+ <location filename="../QMenuStrings.cpp" line="2250"/>
<source>Toggle Repeat</source>
<translation>Zapnout/Vypnout opakovánÃ</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">OtevÅ™Ãt ve &výchozÃm editoru</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="4083"/>
- <location filename="../QMenuStrings.cpp" line="4535"/>
+ <location filename="../QMenuStrings.cpp" line="1772"/>
+ <location filename="../QMenuStrings.cpp" line="2314"/>
<source>R&elabel...</source>
<translation>&Znovu oznaÄit...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4093"/>
- <location filename="../QMenuStrings.cpp" line="4526"/>
+ <location filename="../QMenuStrings.cpp" line="1763"/>
+ <location filename="../QMenuStrings.cpp" line="2324"/>
<source>Repe&at Last Quantize</source>
<translation>Opakovat poslednà kv&antizaci</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4104"/>
+ <location filename="../QMenuStrings.cpp" line="2335"/>
<source>Stretch &or Squash...</source>
<translation>Prodloužit &nebo zkrátit...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="697"/>
- <location filename="../QMenuStrings.cpp" line="1989"/>
- <location filename="../QMenuStrings.cpp" line="4106"/>
+ <location filename="../QMenuStrings.cpp" line="475"/>
+ <location filename="../QMenuStrings.cpp" line="2337"/>
+ <location filename="../QMenuStrings.cpp" line="2963"/>
<source>Set Start &Time...</source>
<translation>Nastavit poÄáteÄnà Ä&as...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="698"/>
- <location filename="../QMenuStrings.cpp" line="1990"/>
- <location filename="../QMenuStrings.cpp" line="4107"/>
+ <location filename="../QMenuStrings.cpp" line="476"/>
+ <location filename="../QMenuStrings.cpp" line="2338"/>
+ <location filename="../QMenuStrings.cpp" line="2964"/>
<source>Set &Duration...</source>
<translation>Nastavit &dobu trvánÃ...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3753"/>
+ <location filename="../QMenuStrings.cpp" line="1984"/>
<source>Import Rosegarden &Project File...</source>
<translation>Zavést soubor s &projektem Rosegarden...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3754"/>
+ <location filename="../QMenuStrings.cpp" line="1985"/>
<source>Import &MIDI File...</source>
<translation>Zavést soubor &MIDI...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3755"/>
+ <location filename="../QMenuStrings.cpp" line="1986"/>
<source>Import &X11 Rosegarden File...</source>
<translation>Zavést soubor &Rosegarden X11...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3757"/>
+ <location filename="../QMenuStrings.cpp" line="1988"/>
<source>Import MusicXM&L File...</source>
<translation>Zavést soubor MusicXM&L...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3760"/>
+ <location filename="../QMenuStrings.cpp" line="1991"/>
<source>Merge &MIDI File...</source>
<translation>Připojit soubor &MIDI...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3761"/>
+ <location filename="../QMenuStrings.cpp" line="1992"/>
<source>Merge &X11 Rosegarden File...</source>
<translation>Připojit soubor &Rosegarden X11...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3763"/>
+ <location filename="../QMenuStrings.cpp" line="1994"/>
<source>Merge MusicXM&L File...</source>
<translation>Připojit soubor MusicXM&L...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3765"/>
+ <location filename="../QMenuStrings.cpp" line="1996"/>
<source>Export Rosegarden &Project File...</source>
<translation>Vyvést jako soubor s &projektem Rosegarden...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3766"/>
+ <location filename="../QMenuStrings.cpp" line="1997"/>
<source>Export &LilyPond File...</source>
<translation>Vyvést jako soubor ve formátu &LilyPond...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3767"/>
+ <location filename="../QMenuStrings.cpp" line="1998"/>
<source>Export &MIDI File...</source>
<translation>Vyvést jako soubor &MIDI...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3768"/>
+ <location filename="../QMenuStrings.cpp" line="1999"/>
<source>Export &Csound Score File...</source>
<translation>Vyvést jako soubor s notovým zápisem pro &Csound...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3769"/>
+ <location filename="../QMenuStrings.cpp" line="2000"/>
<source>Export M&up File...</source>
<translation>Vyvést jako soubor M&up...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3770"/>
+ <location filename="../QMenuStrings.cpp" line="2001"/>
<source>Export Music&XML File...</source>
<translation>Vyvést jako soubor Music&XML...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3790"/>
+ <location filename="../QMenuStrings.cpp" line="2021"/>
<source>Save &as...</source>
<translation>Uložit &jako...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3976"/>
+ <location filename="../QMenuStrings.cpp" line="2207"/>
<source>Fit Existing Beats to Beat Segment</source>
<translation>UmÃstit stávajÃcà doby do Äásti s dobami</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4029"/>
- <location filename="../QMenuStrings.cpp" line="4400"/>
+ <location filename="../QMenuStrings.cpp" line="1637"/>
+ <location filename="../QMenuStrings.cpp" line="2260"/>
<source>Open in &Default Editor</source>
<translation>OtevÅ™Ãt ve &výchozÃm editoru</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4126"/>
- <location filename="../QMenuStrings.cpp" line="4508"/>
+ <location filename="../QMenuStrings.cpp" line="1745"/>
+ <location filename="../QMenuStrings.cpp" line="2357"/>
<source>Join</source>
<translation>Spojit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4135"/>
+ <location filename="../QMenuStrings.cpp" line="2366"/>
<source>&Split</source>
<translation>&Rozdělit</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4136"/>
+ <location filename="../QMenuStrings.cpp" line="2367"/>
<source>&Split on Silence</source>
<translation>&RozdÄ›lit pÅ™i odmlÄenà se</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4137"/>
+ <location filename="../QMenuStrings.cpp" line="2368"/>
<source>Split by &Pitch...</source>
<translation>Rozdělit podle &výšky tónu...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4138"/>
+ <location filename="../QMenuStrings.cpp" line="2369"/>
<source>Split by &Recording Source...</source>
<translation>RozdÄ›lit podle nahrávacÃho zd&roje...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4139"/>
+ <location filename="../QMenuStrings.cpp" line="2370"/>
<source> Split &at Time...</source>
<translation>RozdÄ›lit &v Äase...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4140"/>
+ <location filename="../QMenuStrings.cpp" line="2371"/>
<source>Turn Re&peats into Copies</source>
<translation>Převést o&pakovánà na kopie</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4143"/>
+ <location filename="../QMenuStrings.cpp" line="2374"/>
<source>&Update all Figurations</source>
<translation>&Aktualizovat všechny figurace</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4144"/>
+ <location filename="../QMenuStrings.cpp" line="2375"/>
<source>Manage Tri&ggered Segments</source>
<translation>Správa spouÅ¡tÄ›ných Äás&tÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4145"/>
+ <location filename="../QMenuStrings.cpp" line="2376"/>
<source>Trac&ks</source>
<translation>S&topy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4146"/>
+ <location filename="../QMenuStrings.cpp" line="2377"/>
<source>Add &Track</source>
<translation>Přidat s&topu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4155"/>
+ <location filename="../QMenuStrings.cpp" line="2386"/>
<source>&Add Tracks...</source>
<translation>&Přidat stopy...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4164"/>
+ <location filename="../QMenuStrings.cpp" line="2395"/>
<source>D&elete Track</source>
<translation>&Odstranit stopu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4173"/>
+ <location filename="../QMenuStrings.cpp" line="2404"/>
<source>Move Track &Down</source>
<translation>Přesunout stopu &dolů</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4182"/>
+ <location filename="../QMenuStrings.cpp" line="2413"/>
<source>Mo&ve Track Up</source>
<translation>Přesunout stopu &nahoru</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4191"/>
+ <location filename="../QMenuStrings.cpp" line="2422"/>
<source>Select &Next Track</source>
<translation>Vybrat &dalšà stopu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4200"/>
+ <location filename="../QMenuStrings.cpp" line="2431"/>
<source>Select &Previous Track</source>
<translation>Vybrat &předchozà stopu</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4209"/>
+ <location filename="../QMenuStrings.cpp" line="2440"/>
<source>Mute or Unmute Tra&ck</source>
<translation>Ztlumit nebo zrušit ztlumenà s&topy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4218"/>
+ <location filename="../QMenuStrings.cpp" line="2449"/>
<source>Arm &or Un-arm Track for Record</source>
<translation>UrÄit stopu pro nahrávánà neb&o zruÅ¡it toto urÄenÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4227"/>
+ <location filename="../QMenuStrings.cpp" line="2458"/>
<source>&Unmute all Tracks</source>
<translation>&Zrušit ztlumenà pro všechny stopy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4228"/>
+ <location filename="../QMenuStrings.cpp" line="2459"/>
<source>&Mute all Tracks</source>
<translation>Ztlu&mit všechny stopy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4229"/>
+ <location filename="../QMenuStrings.cpp" line="2460"/>
<source>Set &Instrument</source>
<translation>Nastavit &nástroj</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4230"/>
+ <location filename="../QMenuStrings.cpp" line="2461"/>
<source>&Remap Instruments...</source>
<translation>Znovu &přiřadit nástroje...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4268"/>
- <location filename="../QMenuStrings.cpp" line="4573"/>
+ <location filename="../QMenuStrings.cpp" line="1810"/>
+ <location filename="../QMenuStrings.cpp" line="2499"/>
<source>&Resize</source>
<translation>&Změnit velikost</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4332"/>
+ <location filename="../QMenuStrings.cpp" line="2563"/>
<source>P&unch in Record</source>
<translation>&PÅ™eruÅ¡enà nahrávánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="291"/>
- <location filename="../QMenuStrings.cpp" line="656"/>
- <location filename="../QMenuStrings.cpp" line="1949"/>
- <location filename="../QMenuStrings.cpp" line="3938"/>
+ <location filename="../QMenuStrings.cpp" line="434"/>
+ <location filename="../QMenuStrings.cpp" line="1473"/>
+ <location filename="../QMenuStrings.cpp" line="2169"/>
+ <location filename="../QMenuStrings.cpp" line="2922"/>
<source>Show Main &Toolbar</source>
<translation>Ukázat &hlavnà nástrojový pruh</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3940"/>
+ <location filename="../QMenuStrings.cpp" line="2171"/>
<source>Show Trac&ks Toolbar</source>
<translation>Ukázat nástrojový pruh pro &stopy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3941"/>
+ <location filename="../QMenuStrings.cpp" line="2172"/>
<source>Show &Editors Toolbar</source>
<translation>Ukázat nástrojový pruh pro &editory</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3943"/>
+ <location filename="../QMenuStrings.cpp" line="2174"/>
<source>Show &Zoom Toolbar</source>
<translation>Ukázat nástrojový pruh pro &zmÄ›nu pÅ™iblÞenÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="292"/>
- <location filename="../QMenuStrings.cpp" line="661"/>
- <location filename="../QMenuStrings.cpp" line="1962"/>
- <location filename="../QMenuStrings.cpp" line="3969"/>
+ <location filename="../QMenuStrings.cpp" line="439"/>
+ <location filename="../QMenuStrings.cpp" line="1474"/>
+ <location filename="../QMenuStrings.cpp" line="2200"/>
+ <location filename="../QMenuStrings.cpp" line="2935"/>
<source>Show St&atusbar</source>
<translation>Ukázat stavo&vý řádek</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3945"/>
+ <location filename="../QMenuStrings.cpp" line="2176"/>
<source>Show Playback Position R&uler</source>
<translation>Ukázat pravÃtko vyjadÅ™ujÃcà polohu &pÅ™ehrávánÃ</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Zavést soubor &Rosegarden X11...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Připojit soubor &Rosegarden X11...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="4008"/>
+ <location filename="../QMenuStrings.cpp" line="2239"/>
<source>MIDI Mi&xer</source>
<translation>Směšo&vaÄ MIDI</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3947"/>
+ <location filename="../QMenuStrings.cpp" line="2178"/>
<source>Show Te&mpo Ruler</source>
<translation>Ukázat pravÃtko s &tempem</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2950"/>
- <location filename="../QMenuStrings.cpp" line="2959"/>
+ <location filename="../QMenuStrings.cpp" line="3924"/>
+ <location filename="../QMenuStrings.cpp" line="3933"/>
<source>Y</source>
<comment>keyboard shortcut</comment>
<translation>Z</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2968"/>
- <location filename="../QMenuStrings.cpp" line="2977"/>
+ <location filename="../QMenuStrings.cpp" line="3942"/>
+ <location filename="../QMenuStrings.cpp" line="3951"/>
<source>.</source>
<comment>keyboard shortcut</comment>
<translation>.</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3448"/>
- <location filename="../QMenuStrings.cpp" line="3964"/>
+ <location filename="../QMenuStrings.cpp" line="2195"/>
+ <location filename="../QMenuStrings.cpp" line="4422"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation>P</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3466"/>
- <location filename="../QMenuStrings.cpp" line="4656"/>
+ <location filename="../QMenuStrings.cpp" line="120"/>
+ <location filename="../QMenuStrings.cpp" line="4440"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3778"/>
+ <location filename="../QMenuStrings.cpp" line="2009"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+O</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3801"/>
+ <location filename="../QMenuStrings.cpp" line="2032"/>
<source>Prin&t Preview...</source>
<translation>Náhled t&isku...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3821"/>
+ <location filename="../QMenuStrings.cpp" line="2052"/>
<source>Ctrl+Q</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3869"/>
+ <location filename="../QMenuStrings.cpp" line="2100"/>
<source>Paste as &Links</source>
<translation>Vložit jako &odkazy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3876"/>
+ <location filename="../QMenuStrings.cpp" line="2107"/>
<source>Ctrl+Alt+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt+V</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3912"/>
- <location filename="../QMenuStrings.cpp" line="4753"/>
+ <location filename="../QMenuStrings.cpp" line="2143"/>
+ <location filename="../QMenuStrings.cpp" line="2756"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3921"/>
+ <location filename="../QMenuStrings.cpp" line="2152"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Ins</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3923"/>
+ <location filename="../QMenuStrings.cpp" line="2154"/>
<source>Paste Tempos and Time Signatures</source>
<translation>Vložit tempa a taktová oznaÄenÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3924"/>
+ <location filename="../QMenuStrings.cpp" line="2155"/>
<source>Clear Range of Tempos</source>
<translation>Smazat rozsah temp</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3948"/>
+ <location filename="../QMenuStrings.cpp" line="2179"/>
<source>Show Tra&nsport</source>
<translation>Ukázat o&bslužné pole</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3955"/>
+ <location filename="../QMenuStrings.cpp" line="2186"/>
<source>T</source>
<comment>keyboard shortcut</comment>
<translation>T</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3957"/>
+ <location filename="../QMenuStrings.cpp" line="2188"/>
<source>Show Special &Parameters</source>
<translation>Ukázat zvláštnà ¶metry</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3966"/>
+ <location filename="../QMenuStrings.cpp" line="2197"/>
<source>Show Segment Pre&views</source>
<translation>Ukázat &náhledy na Äásti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3967"/>
+ <location filename="../QMenuStrings.cpp" line="2198"/>
<source>Sh&ow Segment Labels</source>
<translation>Ukázat &oznaÄenà ÄástÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3968"/>
+ <location filename="../QMenuStrings.cpp" line="2199"/>
<source>Show Track &Labels</source>
<translation>Ukázat &oznaÄenà stop</translation>
</message>
<message>
- <source>Fit existing beats to beat segment</source>
- <translation type="obsolete">UmÃstit stávajÃcà doby do Äásti s dobami</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1926"/>
- <location filename="../QMenuStrings.cpp" line="3985"/>
+ <location filename="../QMenuStrings.cpp" line="2216"/>
+ <location filename="../QMenuStrings.cpp" line="2899"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2761"/>
- <location filename="../QMenuStrings.cpp" line="4004"/>
+ <location filename="../QMenuStrings.cpp" line="2235"/>
+ <location filename="../QMenuStrings.cpp" line="3735"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4026"/>
+ <location filename="../QMenuStrings.cpp" line="2257"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4036"/>
- <location filename="../QMenuStrings.cpp" line="4407"/>
+ <location filename="../QMenuStrings.cpp" line="1644"/>
+ <location filename="../QMenuStrings.cpp" line="2267"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>Return</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4105"/>
+ <location filename="../QMenuStrings.cpp" line="2336"/>
<source>Create &Anacrusis...</source>
<translation>VytvoÅ™it &pÅ™edtaktÃ...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4133"/>
- <location filename="../QMenuStrings.cpp" line="4515"/>
+ <location filename="../QMenuStrings.cpp" line="1752"/>
+ <location filename="../QMenuStrings.cpp" line="2364"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4141"/>
+ <location filename="../QMenuStrings.cpp" line="2372"/>
<source>Turn Li&nks into Copies</source>
<translation>PÅ™evést &propojenà do kopiÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4142"/>
+ <location filename="../QMenuStrings.cpp" line="2373"/>
<source>E&xpand Block Chord Segments by Figuration</source>
<translation>Ro&zbalit Äásti s blokovými akordy podle figurace</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4162"/>
+ <location filename="../QMenuStrings.cpp" line="2393"/>
<source>Ctrl+Shift+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+T</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4171"/>
+ <location filename="../QMenuStrings.cpp" line="2402"/>
<source>Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+D</translation>
</message>
<message>
- <source>Enter, Media Play, Ctrl+Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Enter, Media Play (Přehrát), Ctrl+Return</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="4303"/>
+ <location filename="../QMenuStrings.cpp" line="2534"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
<translation>Insert, Media Stop (Zastavit)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4312"/>
+ <location filename="../QMenuStrings.cpp" line="2543"/>
<source>PgUp, Media Previous</source>
<comment>keyboard shortcut</comment>
<translation>PgUp, Media Previous (PÅ™edchozÃ)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4321"/>
+ <location filename="../QMenuStrings.cpp" line="2552"/>
<source>PgDown, Media Next</source>
<comment>keyboard shortcut</comment>
<translation>PgDown, Media Next (DalÅ¡Ã)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4330"/>
+ <location filename="../QMenuStrings.cpp" line="2561"/>
<source>Media Record</source>
<comment>keyboard shortcut</comment>
<translation>Media Record (Nahrávat)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4339"/>
+ <location filename="../QMenuStrings.cpp" line="2570"/>
<source>Space</source>
<comment>keyboard shortcut</comment>
<translation>Space (MezernÃk)</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4369"/>
+ <location filename="../QMenuStrings.cpp" line="2600"/>
<source>&Rosegarden Tutorials</source>
<translation>Návody pro &Rosegarden</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4374"/>
+ <location filename="../QMenuStrings.cpp" line="2605"/>
<source>Main Toolbar</source>
<translation>Hlavnà nástrojový pruh</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4378"/>
+ <location filename="../QMenuStrings.cpp" line="2609"/>
<source>Tracks Toolbar</source>
<translation>Nástrojový pruh pro stopy</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4379"/>
+ <location filename="../QMenuStrings.cpp" line="2610"/>
<source>Editors Toolbar</source>
<translation>Nástrojový pruh pro editory</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2745"/>
- <location filename="../QMenuStrings.cpp" line="4381"/>
+ <location filename="../QMenuStrings.cpp" line="2612"/>
+ <location filename="../QMenuStrings.cpp" line="3719"/>
<source>Rewind to Beginning</source>
<translation>PÅ™etoÄit na zaÄátek</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2752"/>
- <location filename="../QMenuStrings.cpp" line="4390"/>
+ <location filename="../QMenuStrings.cpp" line="2621"/>
+ <location filename="../QMenuStrings.cpp" line="3726"/>
<source>Fast Forward to End</source>
<translation>PÅ™etáÄet rychle na konec</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Vyvést jako soubor ve formátu &LilyPond...</translation>
- </message>
- <message>
- <location filename="../QMenuStrings.cpp" line="1557"/>
- <location filename="../QMenuStrings.cpp" line="3493"/>
- <location filename="../QMenuStrings.cpp" line="4373"/>
+ <location filename="../QMenuStrings.cpp" line="1335"/>
+ <location filename="../QMenuStrings.cpp" line="2604"/>
+ <location filename="../QMenuStrings.cpp" line="4467"/>
<source>&Support Rosegarden</source>
<translation>&Podpora programu Rosegarden</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4294"/>
+ <location filename="../QMenuStrings.cpp" line="2525"/>
<source>Ctrl+Enter, Enter, Media Play, Ctrl+Return</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Enter, Enter, Media Play, Ctrl+Return</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4594"/>
+ <location filename="../QMenuStrings.cpp" line="2676"/>
<source>Insert Tempo Change</source>
<translation>Vložit změnu tempa</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4595"/>
+ <location filename="../QMenuStrings.cpp" line="2677"/>
<source>Insert Tempo Change at Playback Position</source>
<translation>Vložit zmÄ›nu tempa v poloze pÅ™ehrávánÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4596"/>
+ <location filename="../QMenuStrings.cpp" line="2678"/>
<source>Delete Tempo Change</source>
<translation>Odstranit změnu tempa</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4597"/>
+ <location filename="../QMenuStrings.cpp" line="2679"/>
<source>Ramp Tempo to Next Tempo</source>
<translation>RovnomÄ›rný pÅ™echod z dosavadnÃho na následujÃcà tempo</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4598"/>
+ <location filename="../QMenuStrings.cpp" line="2680"/>
<source>Un-Ramp Tempo</source>
<translation>Zrušit změnu tempa</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4599"/>
+ <location filename="../QMenuStrings.cpp" line="2681"/>
<source>Edit Tempo...</source>
<translation>Upravit tempo...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4600"/>
+ <location filename="../QMenuStrings.cpp" line="2682"/>
<source>Edit Time Signature...</source>
<translation>Upravit taktové oznaÄenÃ...</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4601"/>
+ <location filename="../QMenuStrings.cpp" line="2683"/>
<source>Open Tempo and Time Signature Editor</source>
<translation>OtevÅ™Ãt editor tempa a taktového oznaÄenÃ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4667"/>
+ <location filename="../QMenuStrings.cpp" line="131"/>
<source>&Edit Item</source>
<translation>&Upravit položku</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4676"/>
+ <location filename="../QMenuStrings.cpp" line="140"/>
<source>Select &All</source>
<translation>Vybrat &vše</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4685"/>
+ <location filename="../QMenuStrings.cpp" line="149"/>
<source>&Clear Selection</source>
<translation>&Smazat výběr</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4694"/>
+ <location filename="../QMenuStrings.cpp" line="158"/>
<source>&Preferences</source>
<translation>&Volby</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4746"/>
+ <location filename="../QMenuStrings.cpp" line="2749"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>&Vložit jako novou spouÅ¡tÄ›nou Äást</translation>
</message>
<message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">Omezený typ vkládánà vyžaduje dostatek volného mÃsta (obsahujÃcà pouze pomlky) na mÃstÄ› vloženÃ, aby se do nÄ›j vÅ¡echny události veÅ¡ly.
-Nebylo nalezeno dost mÃsta.
-Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch typů vkládánà pod možnostà "Vložit" v nabÃdce Upravit. Pokud chcete, můžete také zmÄ›nit výchozà typ vkládánà na jiný než Omezený.</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NoteFont.cpp" line="58"/>
<source>No sizes listed for font "%1"</source>
<translation>Neuvedeny žádné velikosti pro pÃsmo "%1"</translation>
@@ -5784,7 +5393,7 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>Basový</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2120"/>
+ <location filename="../QMenuStrings.cpp" line="3094"/>
<location filename="../InstrumentStrings.cpp" line="286"/>
<source>Triangle</source>
<translation>TrojúhelnÃkový</translation>
@@ -7565,86 +7174,6 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>Výstřel z pistole</translation>
</message>
<message>
- <source>Cb</source>
- <translation type="obsolete">Cb</translation>
- </message>
- <message>
- <source>C</source>
- <translation type="obsolete">C</translation>
- </message>
- <message>
- <source>C#</source>
- <translation type="obsolete">C#</translation>
- </message>
- <message>
- <source>Db</source>
- <translation type="obsolete">Db</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">D</translation>
- </message>
- <message>
- <source>Eb</source>
- <translation type="obsolete">Eb</translation>
- </message>
- <message>
- <source>E</source>
- <translation type="obsolete">E</translation>
- </message>
- <message>
- <source>E#</source>
- <translation type="obsolete">E#</translation>
- </message>
- <message>
- <source>Fb</source>
- <translation type="obsolete">Fb</translation>
- </message>
- <message>
- <source>D#</source>
- <translation type="obsolete">D#</translation>
- </message>
- <message>
- <source>F</source>
- <translation type="obsolete">F</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">F#</translation>
- </message>
- <message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">G#</translation>
- </message>
- <message>
- <source>Ab</source>
- <translation type="obsolete">Ab</translation>
- </message>
- <message>
- <source>A#</source>
- <translation type="obsolete">A#</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A</translation>
- </message>
- <message>
- <source>Bb</source>
- <translation type="obsolete">Bb</translation>
- </message>
- <message>
- <source>B</source>
- <translation type="obsolete">H</translation>
- </message>
- <message>
- <source>B#</source>
- <translation type="obsolete">H#</translation>
- </message>
- <message>
<location filename="../AutoloadStrings.cpp" line="41"/>
<source>General MIDI Device</source>
<translation>Obecné zaÅ™Ãzenà MIDI</translation>
@@ -8830,16 +8359,16 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation><žádné></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="684"/>
<location filename="../../src/base/Studio.cpp" line="61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="535"/>
<location filename="../AutoloadStrings.cpp" line="40"/>
<source>Synth plugin</source>
<translation>Syntetizátorový pÅ™Ãdavný modul</translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="721"/>
<location filename="../../src/base/Studio.cpp" line="58"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="707"/>
<location filename="../AutoloadStrings.cpp" line="39"/>
<source>Audio</source>
<translation>Zvuk</translation>
@@ -10935,10 +10464,6 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>Obecné</translation>
</message>
<message>
- <source>Blue pastel</source>
- <translation type="obsolete">Modrá pastelová</translation>
- </message>
- <message>
<location filename="../AutoloadStrings.cpp" line="727"/>
<source>Red pastel</source>
<translation>Červená pastelová</translation>
@@ -10984,20 +10509,15 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>Neznámá</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="766"/>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="898"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="716"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="847"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="643"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="650"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -11012,10 +10532,10 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 Ovládacà prvek %2 %3</translation>
</message>
@@ -11030,25 +10550,21 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/application/main.cpp" line="791"/>
+ <location filename="../../src/gui/application/main.cpp" line="798"/>
<source>Welcome!</source>
<translation>VÃtejte!</translation>
</message>
<message>
- <location filename="../../src/gui/application/main.cpp" line="807"/>
+ <location filename="../../src/gui/application/main.cpp" line="814"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-en</translation>
</message>
<message>
- <location filename="../../src/gui/application/main.cpp" line="808"/>
+ <location filename="../../src/gui/application/main.cpp" line="815"/>
<source><h2>Welcome to Rosegarden!</h2><p>Welcome to the Rosegarden audio and MIDI sequencer and musical notation editor.</p><ul><li>If you have not already done so, you may wish to install some DSSI synth plugins, or a separate synth program such as QSynth. Rosegarden does not synthesize sounds from MIDI on its own, so without these you will hear nothing.</li><li>Rosegarden uses the JACK audio server for recording and playback of audio, and for playback from DSSI synth plugins. These features will only be available if the JACK server is running.</li><li>Rosegarden has comprehensive documentation: see the <a style="color:gold" href="http://rosegardenmusic.com">Rosegarden website</a> for the <a style="color:gold" href="%1">manual</a>, <a style="color:gold" href="http://www.rosegardenmusic.com/tutorials/">tutorials</a>, and other information!</li></ul><p>Rosegarden was brought to you by a team of volunteers across the world. To learn more, go to the <a style="color:gold" href="http://www.rosegardenmusic.com/">Rosegarden website</a>.</p></source>
<translation><h2>VÃtejte v Rosegardenu!</h2><p>VÃtejte ve zvukovém a MIDI sekvenceru a hudebnÃm editoru notového zápisu Rosegarden.</p><ul><li>Pokud jste tak jeÅ¡tÄ› neuÄinil, budete jistÄ› chtÃt nainstalovat nÄ›jaké syntetizátorové pÅ™Ãdavné moduly DSSI, nebo samostatný syntetizátorový program, napÅ™Ãklad QSynth. Rosegarden sám o sobÄ› nesyntetizuje zvuky z MIDI, takže bez uvedených programů neuslyÅ¡Ãte zhola nic.</li><li>Rosegarden použÃvá pro nahrávánà a pÅ™ehrávánà zvuku zvukový server JACK, a pro pÅ™ehrávánà z DSSI syntetizátorové pÅ™Ãdavné moduly. Tyto funkce budou dostupné jen tehdy, když server JACK bude běžet.</li><li>Rosegarden má úplnou dokumentaci: podÃvejte se na <a style="color:gold" href="http://rosegardenmusic.com">stránky programu Rosegarden</a> na <a style="color:gold" href="%1">pÅ™ÃruÄku</a>, <a style="color:gold" href="http://www.rosegardenmusic.com/tutorials/">návody</a> a dalÅ¡Ã informace!</li></ul><p>Rosegarden vám pÅ™inášà družstvo dobrovolnÃků z celého svÄ›ta. Abyste se dozvÄ›dÄ›l vÃc, jdÄ›te na <a style="color:gold" href="http://www.rosegardenmusic.com/">stránky programu Rosegarden</a>.</p></translation>
</message>
<message>
- <source><h2>Welcome to Rosegarden!</h2><p>Welcome to the Rosegarden audio and MIDI sequencer and musical notation editor.</p><ul><li>If you have not already done so, you may wish to install some DSSI synth plugins, or a separate synth program such as QSynth. Rosegarden does not synthesize sounds from MIDI on its own, so without these you will hear nothing.</li><li>Rosegarden uses the JACK audio server for recording and playback of audio, and for playback from DSSI synth plugins. These features will only be available if the JACK server is running.</li><li>Rosegarden has comprehensive documentation: see the <a style="color:gold" href="http://rosegardenmusic.com>Rosegarden website</a> for the <a style="color:gold" href="http://www.rosegardenmusic.com/doc/en/">handbook</a>, <a style="color:gold" href="http://www.rosegardenmusic.com/tutorials/">tutorials</a>, and other information!</li></ul><p>Rosegarden was brought to you by a team of volunteers across the world. To learn more, go to the <a style="color:gold" href="http://www.rosegardenmusic.com/">Rosegarden website</a>.</p></source>
- <translation type="obsolete"><h2>VÃtejte v Rosegardenu!</h2><p>VÃtejte ve zvukovém a MIDI sekvenceru Rosegarden a hudebnÃm editoru notového zápisu.</p><ul><li>Pokud jste tak jeÅ¡tÄ› neuÄinil, budete jistÄ› chtÃt nainstalovat nÄ›jaké syntetizátorové pÅ™Ãdavné moduly DSSI, nebo samostatný syntetizátorový program, napÅ™Ãklad QSynth. Rosegarden sám o sobÄ› nesyntetizuje zvuky z MIDI, takže bez uvedených programů neuslyÅ¡Ãte zhola nic.</li><li>Rosegarden použÃvá pro nahrávánà a pÅ™ehrávánà zvuku zvukový server JACK, a pro pÅ™ehrávánà z DSSI syntetizátorové pÅ™Ãdavné moduly. Tyto funkce budou dostupné jen tehdy, když server JACK bude běžet.</li><li>Rosegarden má úplnou dokumentaci: podÃvejte se na <a style="color:gold" href="http://rosegardenmusic.com>Rosegarden website</a> for the <a style="color:gold" href="http://www.rosegardenmusic.com/doc/en/">pÅ™ÃruÄku</a>, <a style="color:gold" href="http://www.rosegardenmusic.com/tutorials/">návody</a>, a dalÅ¡Ã informace!</li></ul><p>Rosegarden vám pÅ™inášà družstvo dobrovolnÃků z celého svÄ›ta. Abyste se dozvÄ›dÄ›l vÃc, jdÄ›te na <a style="color:gold" href="http://www.rosegardenmusic.com/">stránky programu Rosegarden</a>.</p></translation>
- </message>
- <message>
<location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="511"/>
<source>Audio subsystem is not available - can't record audio</source>
<translation>Zvukový směšovacà podsystém nenà dostupný - zvuk nelze nahrávat</translation>
@@ -11059,7 +10575,7 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation><qt><p>Pro nahrávánà nebyly uvedeny v Äinnost žádné stopy.</p><p>OdjistÄ›te, prosÃm, alespoň jednu z nahrávacÃch LED diod <img src=":pixmaps/tooltip/record-leds.png"> a zkuste to znovu</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="789"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="791"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>NepodaÅ™ilo se spustit nahrávánà zvuku.</p><p>Platnou nahrávacà cestu nastavte, prosÃm, v <b>Skladba -> Upravit vlastnosti dokumentu... -> Zvuk</b></p></qt></translation>
</message>
@@ -11098,40 +10614,52 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>Neplatný zvukový soubor</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>Data v 'dlouhém' formátu majà v proudu MIDI nesprávnou délku</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="133"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="100"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>Data v 'int' formátu majà v proudu MIDI nesprávnou délku</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="153"/>
- <location filename="../../src/sound/MidiFile.cpp" line="200"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="120"/>
<source>End of MIDI file encountered while reading</source>
<translation>PÅ™i Ätenà byl dosažen konec souboru MIDI</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="157"/>
- <location filename="../../src/sound/MidiFile.cpp" line="216"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="127"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation>Pokus o zÃskánà vÃce bytů ze stopy, než bylo oÄekáváno</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="178"/>
- <location filename="../../src/sound/MidiFile.cpp" line="236"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="142"/>
<source>Attempt to read past MIDI file end</source>
<translation>Pokus o Ätenà po konci souboru MIDI</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="525"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="228"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/sound/MidiFile.cpp" line="296"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="301"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/sound/MidiFile.cpp" line="312"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>Nalezen neplatný kód události</translation>
+ <translation type="obsolete">Nalezen neplatný kód události</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="539"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="405"/>
<source>Running status used for first event in track</source>
<translation>Pro prvnà událost ve stopě byl použit provoznà stav ('Running')</translation>
</message>
@@ -11294,7 +10822,7 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>PÅ™Ãdavný modul syntetizátoru</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="179"/>
<source>This event is tied to another event.</source>
<translation>Tato událost je svázána s jinou událostÃ.</translation>
</message>
@@ -11375,6 +10903,58 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<source>Update Figurations</source>
<translation>Aktualizovat figurace</translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Program LilyPond nedovoluje použÃvat v názvech souborů mezery nebo zpÄ›tná lomÃtka.
+
+Chcete použÃt
+
+ %1
+
+ namÃsto tÄ›chto znaků?</translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="641"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="810"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished">Uloženà v jiném formátu se pozdařilo, ale skladba byla prázdná.</translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="852"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished">Uloženà neztlumených stop v jiném formátu se nezdaÅ™ilo. Nejsou žádné neztlumené stopy nebo v nich nejsou žádné Äásti.</translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="858"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished">Uloženà vybrané stopy v jiném formátu se nezdaÅ™il. Ve vybrané stopÄ› nejsou žádné Äásti.</translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="863"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished">Uloženà vybrané Äásti v jiném formátu se nezdaÅ™il. Nejsou vybrány žádné Äásti.</translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="2732"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">VarovánÃ: byl zde zkrácen pÅ™ÃliÅ¡ dlouhý takt</translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="2743"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">VarovánÃ: takt je pÅ™ÃliÅ¡ krátký, bude doplnÄ›n pomlkami</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11390,24 +10970,8 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
</message>
<message>
<location filename="../../src/gui/dialogs/AboutDialog.cpp" line="54"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation><p>Autorské právo 2000-2014 skupina vývojářů programu Rosgarden</p><p>Verze: %1 Verze Qt: %2<br>KlÃÄ: %3</p><p>Rosegarden byl vyvÃjen skupinou dobrovolnÃků z celého svÄ›ta. Seznam pÅ™ispÄ›vatelů je k prohlédnutà na <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>. <br>DalÅ¡Ã informace o Rosegardenu jsou dostupné na <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>PovolenÃ: GNU General Public License Version 2 nebo pozdÄ›jÅ¡Ã</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="obsolete"><p>Copyright 2000-2012 Vývojářský tým programu Rosgarden</p><p>Verze: %1 Verze Qt: %2<br>KlÃÄ: %3</p><p>Rosegarden byl vyvÃjen skupinou dobrovolnÃků z celého svÄ›ta. Seznam pÅ™ispÄ›vatelů je k prohlédnutà na <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>. <br>DalÅ¡Ã informace o Rosegardenu jsou dostupné na <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>PovolenÃ: GNU General Public License Version 2 nebo pozdÄ›jÅ¡Ã</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2011 Vývojářský tým programu Rosgarden</p><p>Verze: %1 Verze Qt: %2<br>Schlüssel: %3</p><p>Rosegarden byl vyvÃjen skupinou dobrovolnÃků. Seznam se zůÄastnÄ›nými je k prohlédnutà na <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>. <br>DalÅ¡Ã informace o Rosegardenu jsou dostupné na href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2009 Vývojářský tým programu Rosgarden</p><p>Verze: %1 Verze Qt: %2<br>KlÃÄ: %3</p><p>Rosegarden byl vyvÃjen skupinou dobrovolnÃků. Seznam se zůÄastnÄ›nými je k prohlédnutà na <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>. <br>DalÅ¡Ã informace o Rosegardenu jsou dostupné na <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licence: GNU General Public License Version 2</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2009 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2009 Vývojářský tým programu Rosgarden</p><p>Verze: %1 Verze Qt: %2<br>Schlüssel: %3</p><p>Rosegarden byl vyvÃjen skupinou dobrovolnÃků. Seznam se zůÄastnÄ›nými je k prohlédnutà na <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>. <br>DalÅ¡Ã informace o Rosegardenu jsou dostupné na <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licence: GNU General Public License Version 2</p></translation>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <translation type="unfinished"><p>Copyright 2000-2012 Vývojářský tým programu Rosgarden</p><p>Verze: %1 Verze Qt: %2<br>KlÃÄ: %3</p><p>Rosegarden byl vyvÃjen skupinou dobrovolnÃků z celého svÄ›ta. Seznam pÅ™ispÄ›vatelů je k prohlédnutà na <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>. <br>DalÅ¡Ã informace o Rosegardenu jsou dostupné na <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>PovolenÃ: GNU General Public License Version 2 nebo pozdÄ›jÅ¡Ã</p> {2000-2015 ?} {1 ?} {2<?} {3<?} {2 ?}</translation>
</message>
</context>
<context>
@@ -11468,72 +11032,72 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="108"/>
<source>Can't add identical overlapping indications</source>
<translation>Nelze pÅ™idat dvÄ› stejná pÅ™ekrývajÃcà se oznaÄenÃ</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="221"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="242"/>
<source>Add S&lur</source>
<translation>Přidat &legato</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="223"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="244"/>
<source>Add &Phrasing Slur</source>
<translation>Přidat &frázovacà legato</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="225"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="246"/>
<source>Add Double-Octave Up</source>
<translation>Přidat dvojitou oktávu nahoru</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="227"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="248"/>
<source>Add Octave &Up</source>
<translation>Přidat oktávu &nahoru</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="229"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="250"/>
<source>Add Octave &Down</source>
<translation>Přidat oktávu &dolů</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="231"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="252"/>
<source>Add Double Octave Down</source>
<translation>Přidat dvojitou oktávu dolů</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="236"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="257"/>
<source>Add &Crescendo</source>
<translation>Přidat &crescendo</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="238"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="259"/>
<source>Add &Decrescendo</source>
<translation>Přidat &decrescendo</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="240"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="261"/>
<source>Add &Glissando</source>
<translation>Přidat &glissando</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="242"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="263"/>
<source>Add Tri&ll With Line</source>
<translation>Přidat try&lek s linkou</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="244"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="265"/>
<source>Add Parameter Chord</source>
<translation>Přidat akord parametru</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="246"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="267"/>
<source>Add Figuration</source>
<translation>Přidat figuraci</translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="249"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="270"/>
<source>Add &%1%2</source>
<translation>Přidat &%1%2</translation>
</message>
@@ -11968,14 +11532,6 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>ProbÃhá pÅ™evod zvukového souboru...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">ProbÃhá pÅ™evzorkovánà zvukového souboru...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">ProbÃhá pÅ™evod a pÅ™evzorkovánà zvukového souboru...</translation>
- </message>
- <message>
<location filename="../../src/sound/AudioFileManager.cpp" line="666"/>
<source>Importing audio file...</source>
<translation>ProbÃhá zavedenà zvukového souboru...</translation>
@@ -11989,7 +11545,7 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="85"/>
<source>Click to rename this instrument</source>
<translation>Klepněte kvůli přejmenovánà tohoto nástroje</translation>
</message>
@@ -11999,14 +11555,14 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>KlepnÄ›te na tlaÄÃtko výše kvůli pÅ™ejmenovánà tohoto nástroje</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="200"/>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="378"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="203"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="389"/>
<source><no synth></source>
<translation><žádný syntetizátor></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="203"/>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="382"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="206"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="393"/>
<source><no plugin></source>
<translation><žádný pÅ™Ãdavný modul></translation>
</message>
@@ -12059,22 +11615,6 @@ Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch ty
<translation>Soubor</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><žádné zvukové soubory></translation>
- </message>
- <message>
- <source>Please select an audio item in the list!</source>
- <translation type="obsolete">Vyberte, prosÃm, nÄ›jaký zvukový záznam ze seznamu!</translation>
- </message>
- <message>
- <source>Error: Selection is empty!</source>
- <translation type="obsolete">Chyba: Výběr je prázdný!</translation>
- </message>
- <message>
- <source>Choose a name to save this file as </source>
- <translation type="obsolete">Vybrat název pro uloženà souboru</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/AudioManagerDialog.cpp" line="514"/>
<source>Save File As</source>
<translation>Uložit soubor jako</translation>
@@ -12201,10 +11741,6 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<translation>Zadat nový popisek</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">ProbÃhá zavedenà zvukového souboru</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/AudioManagerDialog.cpp" line="1175"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>Zavádà se zvukový soubor, který je třeba převést nebo převzorkovat</translation>
@@ -12239,112 +11775,104 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="282"/>
<source>Audio Mixer</source>
<translation>Zvukový směšovaÄ</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="305"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="314"/>
<source>Record input source</source>
<translation>Záznamový vstupnà zdroj</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="315"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="324"/>
<source>Output destination</source>
<translation>Výstupnà cÃlové zaÅ™ÃzenÃ</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="328"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="477"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="337"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="478"/>
<source>Pan</source>
<translation>Vyváženà (Pan)</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="336"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="337"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="484"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="345"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="346"/>
<location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="485"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="486"/>
<source>Audio level</source>
<translation>Úroveň hlasitosti</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="344"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="353"/>
<source>Mono or stereo</source>
<translation>Mono nebo stereo</translation>
</message>
<message>
- <source>Mute</source>
- <translation type="obsolete">Ztlumit</translation>
- </message>
- <message>
- <source>Solo</source>
- <translation type="obsolete">Sólo</translation>
- </message>
- <message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="352"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="361"/>
<source>Arm recording</source>
<translation>Připravit záznam</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="363"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="496"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="639"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="696"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="881"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="372"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="497"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="645"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="702"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="887"/>
<source><none></source>
<translation><žádný></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="365"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="498"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="374"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="499"/>
<source>Click to load an audio plugin</source>
<translation>KlepnÄ›te pro nahránà zvukového pÅ™Ãdavného modulu</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="376"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="385"/>
<source>Click to rename this instrument</source>
<translation>Klepněte kvůli přejmenovánà tohoto nástroje</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="392"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="401"/>
<source>Audio %1</source>
<translation>Zvuk %1</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="401"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="410"/>
<source>Synth %1</source>
<translation>Syntetizátor %1</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="410"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="419"/>
<source>Click the button above to rename this instrument</source>
<translation>KlepnÄ›te na tlaÄÃtko výše kvůli pÅ™ejmenovánà tohoto nástroje</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="506"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="507"/>
<source>Sub %1</source>
<translation>ŘÃzený sekvencer %1</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="547"/>
<location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="548"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="549"/>
<source>Audio master output level</source>
<translation>Zvuková Å™ÃdÃcà výstupnà úroveň</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="550"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="551"/>
<source>Master</source>
<translation>ŘÃdÃcà sekvencer</translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="640"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="697"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="882"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="646"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="703"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="888"/>
<source><no plugin></source>
<translation><žádný pÅ™Ãdavný modul></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="1728"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="1708"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</translation>
</message>
@@ -12786,10 +12314,6 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<translation>Správa bank a programů MIDI</translation>
</message>
<message>
- <source>Reset</source>
- <translation type="obsolete">Reset</translation>
- </message>
- <message>
<location filename="../../src/gui/studio/BankEditorDialog.cpp" line="123"/>
<source>Device and Banks</source>
<translation>ZaÅ™Ãzenà a banky</translation>
@@ -12927,85 +12451,81 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<translation>SkuteÄnÄ› chcete odstranit tuto banku?</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1232"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1238"/>
<source>Really delete this key mapping?</source>
<translation>SkuteÄnÄ› chcete odstranit tuto tabulku pÅ™iÅ™azenà kláves k tóninÄ›?</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1284"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1290"/>
<source>Really delete all banks for </source>
<translation>SkuteÄnÄ› chcete odstranit vÅ¡echny banky pro </translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1567"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1573"/>
<source>Import Banks from Device in File</source>
<translation>Zavést banky ze zaÅ™Ãzenà v souboru</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1568"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1574"/>
<source>Rosegarden Device files</source>
<translation>Soubory zaÅ™Ãzenà programu Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1569"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1575"/>
<source>Rosegarden files</source>
<translation>Soubory programu Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1570"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1576"/>
<source>Sound fonts</source>
<translation>Zvuková pÃsma</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1571"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1577"/>
<source>LinuxSampler configuration files</source>
<translation>Soubory s nastavenÃm programu LinuxSampler</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1572"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1578"/>
<source>All files</source>
<translation>VÅ¡echny soubory</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1590"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1596"/>
<source>Some internal error: cannot locate selected device</source>
<translation>VnitÅ™nà chyba: Vybrané zaÅ™Ãzenà nelze najÃt</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1600"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1606"/>
<source>Some internal error: no device selected</source>
<translation>VnitÅ™nà chyba: Nevybráno žádné zaÅ™ÃzenÃ</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1762"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1768"/>
<source>Export Device as...</source>
<translation>Vyvést zaÅ™Ãzenà jako...</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1784"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1790"/>
<source>You have specified a directory</source>
<translation>Zadali jste adresář</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1794"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1800"/>
<source>The specified file exists. Overwrite?</source>
<translation>Zadaný soubor již existuje. Chcete jej přepsat?</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1823"/>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1827"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1829"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1833"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1864"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1870"/>
<source>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</translation>
</message>
- <message>
- <source>Unsaved Changes</source>
- <translation type="obsolete">Neuložené změny</translation>
- </message>
</context>
<context>
<name>Rosegarden::BeamCommand</name>
@@ -13115,21 +12635,131 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
</message>
</context>
<context>
- <name>Rosegarden::ChordNameRuler</name>
+ <name>Rosegarden::CheckForParallelsDialog</name>
<message>
- <source><qt><p>Chord name ruler. This ruler analyzes your harmonies and attempts to guess what chords your composition contains. These chords cannot be printed or manipulated, and this is only a reference for your information.</p><p>Turn it on and off from the Settings->Rulers menu.</p></qt></source>
- <translation type="obsolete"><qt><p>PravÃtko s názvy akordů. Toto pravÃtko provádà rozbor souzvuků a pokouÅ¡Ã se urÄit, které akordy vaÅ¡e skladba obsahuje. Tyto akordy nelze vytisknout nebo zmÄ›nit, a jde pouze o doporuÄenà pro vaÅ¡i informaci.</p><p>Lze je zapnout a vypnout pÅ™es NastavenÃ->NabÃdka pravÃtek.</p></qt></translation>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="89"/>
- <source><qt><p>Chord name ruler. This ruler analyzes your harmonies and attempts to guess what chords your composition contains. These chords cannot be printed or manipulated, and this is only a reference for your information.</p><p>Turn it on and off with the <b>View -> Rulers</b> menu.</p></qt></source>
- <translation><qt><p>PravÃtko s názvy akordů. Toto pravÃtko provádà rozbor souzvuků a pokouÅ¡Ã se urÄit, které akordy vaÅ¡e skladba obsahuje. Tyto akordy nelze vytisknout nebo zmÄ›nit, a jde pouze o doporuÄenà pro vaÅ¡i informaci.</p><p>Lze je zapnout a vypnout pÅ™es nabÃdku <b>Pohled -> PravÃtka</b>.</p></qt></translation>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="74"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ClearTriggersCommand</name>
<message>
- <location filename="../../src/commands/edit/ClearTriggersCommand.h" line="46"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="85"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="93"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="94"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="95"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="96"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="302"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="490"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="302"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="490"/>
+ <source> </source>
+ <translation type="unfinished"> </translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="302"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="490"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="622"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="302"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="490"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="622"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="336"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="488"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="617"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="619"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="637"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="641"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="645"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="649"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="653"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="657"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChordNameRuler</name>
+ <message>
+ <location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="89"/>
+ <source><qt><p>Chord name ruler. This ruler analyzes your harmonies and attempts to guess what chords your composition contains. These chords cannot be printed or manipulated, and this is only a reference for your information.</p><p>Turn it on and off with the <b>View -> Rulers</b> menu.</p></qt></source>
+ <translation><qt><p>PravÃtko s názvy akordů. Toto pravÃtko provádà rozbor souzvuků a pokouÅ¡Ã se urÄit, které akordy vaÅ¡e skladba obsahuje. Tyto akordy nelze vytisknout nebo zmÄ›nit, a jde pouze o doporuÄenà pro vaÅ¡i informaci.</p><p>Lze je zapnout a vypnout pÅ™es nabÃdku <b>Pohled -> PravÃtka</b>.</p></qt></translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ClearTriggersCommand</name>
+ <message>
+ <location filename="../../src/commands/edit/ClearTriggersCommand.h" line="46"/>
<source>&Clear Triggers</source>
<translation>&Vymazat spouÅ¡tÄ›cà znaÄky</translation>
</message>
@@ -13323,10 +12953,6 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<source>New</source>
<translation>Nový</translation>
</message>
- <message>
- <source>Please select an item in the list!</source>
- <translation type="obsolete">Vyberte, prosÃm, nÄ›jaký záznam ze seznamu!</translation>
- </message>
</context>
<context>
<name>Rosegarden::ColourTable</name>
@@ -13446,7 +13072,7 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13454,11 +13080,6 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<context>
<name>Rosegarden::ConfigureDialog</name>
<message>
- <source>Configure Rosegarden</source>
- <extracomment>QDialog(parent) //, tr("Configure Rosegarden"), name)</extracomment>
- <translation type="obsolete">Nastavenà aplikace Rosegarden</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/ConfigureDialog.cpp" line="48"/>
<source>Rosegarden - Preferences</source>
<translation>Nastavenà programu Rosegarden</translation>
@@ -13471,10 +13092,6 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<source>Configure Rosegarden</source>
<translation>Nastavenà programu Rosegarden</translation>
</message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:configureDialogBase-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:configureDialogBase-en</translation>
- </message>
</context>
<context>
<name>Rosegarden::ControlChangeCommand</name>
@@ -13680,7 +13297,7 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="330"/>
<source>Velocity</source>
<translation>Rychlost</translation>
</message>
@@ -13696,27 +13313,28 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="284"/>
<source>Unsupported Event Type</source>
<translation>Nepodporovaný typ události</translation>
</message>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="298"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="294"/>
<source>Pitch Bend</source>
<translation>Změna výšky tónu</translation>
</message>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="303"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="299"/>
<source>Controller Events</source>
<translation>Události ovládacÃho prvku</translation>
</message>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="445"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="437"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="459"/>
<source>Insert Line of Controllers</source>
<translation>Vložit řádek s ovládacÃmi prvky</translation>
</message>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="585"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="578"/>
<source>Controller Event Number</source>
<translation>ÄŒÃslo události ovládacÃho prvku</translation>
</message>
@@ -13724,7 +13342,7 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="63"/>
<source>&Copy</source>
<translation>&KopÃrovat</translation>
</message>
@@ -13734,12 +13352,12 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<translation>(výňatek)</translation>
</message>
<message>
- <location filename="../../src/commands/edit/CopyCommand.cpp" line="56"/>
+ <location filename="../../src/commands/edit/CopyCommand.cpp" line="57"/>
<source>(copied)</source>
<translation>(zkopÃrováno)</translation>
</message>
<message>
- <location filename="../../src/commands/edit/CopyCommand.cpp" line="64"/>
+ <location filename="../../src/commands/edit/CopyCommand.cpp" line="65"/>
<source>Copy Range</source>
<translation>KopÃrovat oblast</translation>
</message>
@@ -13804,7 +13422,7 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="51"/>
<source>Cu&t</source>
<translation>Vyjmou&t</translation>
</message>
@@ -13844,10 +13462,6 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">PÅ™Ãkaz k opÄ›tovnému spojenÃ</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="322"/>
<source>Delete Range</source>
<translation>Odstranit oblast</translation>
@@ -13872,62 +13486,26 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="73"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="72"/>
<source>[ No port ]</source>
<translation>[ Žádná pÅ™Ãpojka ]</translation>
</message>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="802"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="813"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="829"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="792"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="803"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="819"/>
<source>New Device</source>
<translation>Nové zaÅ™ÃzenÃ</translation>
</message>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="926"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="916"/>
<source>http://rosegardenmusic.com/wiki/doc:device-manager-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:device-manager-en</translation>
</message>
- <message>
- <source>Help for the Midi Devices-Manager Dialog</source>
- <translation type="obsolete">NápovÄ›da pro dialog ke správÄ› zaÅ™Ãzenà MIDI</translation>
- </message>
- <message>
- <source>This is Rosegardens central connection station. Create and connect your Midi Devices here! </source>
- <translation type="obsolete">Toto je ústÅ™ednà spojovacà jednotka programu Rosegarden. Zde vytvářejte a pÅ™ipojujte svá zaÅ™Ãzenà MIDI!</translation>
- </message>
</context>
<context>
<name>Rosegarden::DiatonicPitchChooser</name>
<message>
- <source>C</source>
- <translation type="obsolete">C</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">D</translation>
- </message>
- <message>
- <source>E</source>
- <translation type="obsolete">E</translation>
- </message>
- <message>
- <source>F</source>
- <translation type="obsolete">F</translation>
- </message>
- <message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A</translation>
- </message>
- <message>
- <source>B</source>
- <translation type="obsolete">H</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/DiatonicPitchChooser.cpp" line="59"/>
<source>C</source>
<comment>note name</comment>
@@ -14203,137 +13781,6 @@ Vyberte ty, které chcete z pevného disku trvale odstranit.
</message>
</context>
<context>
- <name>Rosegarden::EditView</name>
- <message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 Ovládacà prvek %2 %3</translation>
- </message>
- <message>
- <source>Pitch Bend</source>
- <translation type="obsolete">Ohýbánà výšky tónu</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Nepodporovaný typ události</translation>
- </message>
- <message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <source>VIII</source>
- <translation type="obsolete">VIII</translation>
- </message>
- <message>
- <source>%1 flat</source>
- <translation type="obsolete">%1 béÄko</translation>
- </message>
- <message>
- <source>%1 sharp</source>
- <translation type="obsolete">%1 křÞek</translation>
- </message>
- <message>
- <source>&Insert Note</source>
- <translation type="obsolete">&Vložit notu</translation>
- </message>
- <message>
- <source>&Upper Octave</source>
- <translation type="obsolete">&Vyššà oktáva</translation>
- </message>
- <message>
- <source>&Lower Octave</source>
- <translation type="obsolete">&Nižšà oktáva</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Zobrazené odhadované oznaÄenà taktu</translation>
- </message>
- <message>
- <source>Halving durations...</source>
- <translation type="obsolete">ProbÃhá půlenà dob trvánÃ...</translation>
- </message>
- <message>
- <source>Doubling durations...</source>
- <translation type="obsolete">ProbÃhá násobenà dob trvánà dvÄ›ma...</translation>
- </message>
- <message>
- <source>Rescaling...</source>
- <translation type="obsolete">ProbÃhá zmÄ›na délky...</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Transponovat</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Zadejte o kolik půltónů:</translation>
- </message>
- <message>
- <source>Transposing...</source>
- <translation type="obsolete">ProbÃhá transpozice...</translation>
- </message>
- <message>
- <source>Transposing up one semitone...</source>
- <translation type="obsolete">ProbÃhá transpozice o půl tónu výš...</translation>
- </message>
- <message>
- <source>Transposing up one octave...</source>
- <translation type="obsolete">ProbÃhá transpozice o oktávu výš...</translation>
- </message>
- <message>
- <source>Transposing down one semitone...</source>
- <translation type="obsolete">ProbÃhá transpozice o půl tónu nÞ...</translation>
- </message>
- <message>
- <source>Transposing down one octave...</source>
- <translation type="obsolete">ProbÃhá transpozice o oktávu nÞ...</translation>
- </message>
- <message>
- <source>Inverting...</source>
- <translation type="obsolete">ProbÃhá invertovánÃ...</translation>
- </message>
- <message>
- <source>Retrograding...</source>
- <translation type="obsolete">ProbÃhá návrat zpÄ›t...</translation>
- </message>
- <message>
- <source>Retrograde inverting...</source>
- <translation type="obsolete">ProbÃhá zpÄ›tné invertovánÃ...</translation>
- </message>
- <message>
- <source>Jogging left...</source>
- <translation type="obsolete">ProbÃhá krokový posun vlevo...</translation>
- </message>
- <message>
- <source>Jogging right...</source>
- <translation type="obsolete">ProbÃhá krokový posun vpravo...</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::EditViewBase</name>
<message>
<location filename="../../src/gui/general/EditViewBase.cpp" line="222"/>
@@ -14672,46 +14119,10 @@ Mohlo by to způsobit problémy, pokud by takto byla pozdÄ›ji potlaÄena nÄ›jak
<translation>Vzor</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Ploché - nastavit %1 na hodnotu</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">StÅ™Ãdavé - nastavit %1 stÅ™ÃdavÄ› na nejvÄ›tÅ¡Ã a nejmenÅ¡Ã pÅ™i stÅ™Ãdánà událostÃ</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo - nastavit %1 na zvÄ›tÅ¡ujÃcà se od nejmenÅ¡Ãho po nejvÄ›tÅ¡Ã</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo - nastavit %1 na zmenÅ¡ujÃcà se od nejvÄ›tÅ¡Ãho po nejmenÅ¡Ã</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">VyzvánÄ›nà - nastavit %1 na stÅ™Ãdánà od nejvÄ›tÅ¡Ãho po nejmenÅ¡Ã s ukonÄenÃm na nule</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/EventParameterDialog.cpp" line="47"/>
<source>Value</source>
<translation>Hodnota</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Prvnà hodnota</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Druhá hodnota</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">NÃzká hodnota</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Vysoká hodnota</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14971,18 +14382,6 @@ Mohlo by to způsobit problémy, pokud by takto byla pozdÄ›ji potlaÄena nÄ›jak
<source>http://rosegardenmusic.com/wiki/doc:eventView-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:eventView-en</translation>
</message>
- <message>
- <source>%1 - Triggered Segment: %2</source>
- <translation type="obsolete">%1 - Spouštěný segment: %2</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - Event List</source>
- <translation type="obsolete">%1 - Stopa segmentu #%2 - Seznam událostÃ</translation>
- </message>
- <message>
- <source>%1 - %2 Segments - Event List</source>
- <translation type="obsolete">%1 - %2 Segmenty - Seznam událostÃ</translation>
- </message>
</context>
<context>
<name>Rosegarden::ExpandFigurationCommand</name>
@@ -15118,22 +14517,6 @@ Chcete se pokusit nalézt soubor ruÄnÄ› nebo se má pÅ™eskoÄit?</translation>
<translation>Stahuje se %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Připojenà k FTP serveru se nezdařilo</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Přihlášenà se nezdařilo</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Změna na správný adresář se nepodařila</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">FTP stahovánà zrušeno</translation>
- </message>
- <message>
<location filename="../../src/gui/general/FileSource.cpp" line="732"/>
<source>Download cancelled</source>
<translation>Stahovánà zrušeno</translation>
@@ -15229,10 +14612,6 @@ Chcete se pokusit nalézt soubor ruÄnÄ› nebo se má pÅ™eskoÄit?</translation>
<translation>Zobrazovacà výkon</translation>
</message>
<message>
- <source>Normal</source>
- <translation type="obsolete">NormálnÃ</translation>
- </message>
- <message>
<location filename="../../src/gui/configuration/GeneralConfigurationPage.cpp" line="89"/>
<source>Safe</source>
<translation>BezpeÄné</translation>
@@ -15405,10 +14784,6 @@ Chcete se pokusit nalézt soubor ruÄnÄ› nebo se má pÅ™eskoÄit?</translation>
<translation>Aby se zmÄ›na vzhledu projevila, musÃte Rosegarden spustit znovu.</translation>
</message>
<message>
- <source>KPrinter (KDE3)</source>
- <translation type="obsolete">KPrinter (KDE3)</translation>
- </message>
- <message>
<location filename="../../src/gui/configuration/GeneralConfigurationPage.cpp" line="266"/>
<source>Note name style</source>
<translation>Styl názvu noty</translation>
@@ -15434,10 +14809,6 @@ Chcete se pokusit nalézt soubor ruÄnÄ› nebo se má pÅ™eskoÄit?</translation>
<translation>Hlavnà okno</translation>
</message>
<message>
- <source>Matrix</source>
- <translation type="obsolete">Tabulka</translation>
- </message>
- <message>
<location filename="../../src/gui/configuration/GeneralConfigurationPage.cpp" line="292"/>
<source>Notation</source>
<translation>Notace</translation>
@@ -15473,10 +14844,6 @@ Chcete se pokusit nalézt soubor ruÄnÄ› nebo se má pÅ™eskoÄit?</translation>
<translation>Adobe Acrobat Reader (nÄ›co stojÃ)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location filename="../../src/gui/configuration/GeneralConfigurationPage.cpp" line="352"/>
<source>Used to preview generated LilyPond output</source>
<translation>PoužÃvá se pro náhled vytvoÅ™eného výstupu programu LilyPond</translation>
@@ -15487,10 +14854,6 @@ Chcete se pokusit nalézt soubor ruÄnÄ› nebo se má pÅ™eskoÄit?</translation>
<translation>Pomocný program pro tisk z pÅ™Ãkazové řádky</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">KPrinter (KDE 3)</translation>
- </message>
- <message>
<location filename="../../src/gui/configuration/GeneralConfigurationPage.cpp" line="362"/>
<source>Gtk-LP (GNOME)</source>
<translation>Gtk-LP (GNOME)</translation>
@@ -15506,10 +14869,6 @@ Chcete se pokusit nalézt soubor ruÄnÄ› nebo se má pÅ™eskoÄit?</translation>
<translation>lp (bez uživatelského rozhranÃ)</translation>
</message>
<message>
- <source>HPLIP (QT4)</source>
- <translation type="obsolete">HPLIP (QT4)</translation>
- </message>
- <message>
<location filename="../../src/gui/configuration/GeneralConfigurationPage.cpp" line="366"/>
<source>Used to print generated LilyPond output without previewing it</source>
<translation>PoužÃvá se pro tisk vytvoÅ™eného výstupu programu LilyPond, aniž by se provedl jeho náhled</translation>
@@ -15552,13 +14911,6 @@ Chcete se pokusit nalézt soubor ruÄnÄ› nebo se má pÅ™eskoÄit?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Guitar::Fingering</name>
- <message>
- <source>couldn't parse fingering '%1' in '%2'</source>
- <translation type="obsolete">nebylo možné naÄÃst prstoklad '%1' v '%2'</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::GuitarChordEditorDialog</name>
<message>
<location filename="../../src/gui/editors/guitar/GuitarChordEditorDialog.cpp" line="40"/>
@@ -15782,24 +15134,6 @@ Chcete se pokusit nalézt soubor ruÄnÄ› nebo se má pÅ™eskoÄit?</translation>
<context>
<name>Rosegarden::IdentifyTextCodecDialog</name>
<message>
- <source>Choose Text Encoding</source>
- <translation type="obsolete">Vybrat kódovánà textu</translation>
- </message>
- <message>
- <source>
-This file contains text in an unknown language encoding.
-
-Please select one of the following estimated text encodings
-for use with the text in this file:
-</source>
- <translation type="obsolete">
-Tento soubor obsahuje text v neznámém jazykovém kódovánÃ.
-
-Zvolte jedno z následujÃcÃch pÅ™edpokládaných kódovánà textu,
-které bude použito na text v tomto souboru:
-</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/IdentifyTextCodecDialog.cpp" line="69"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
@@ -16101,7 +15435,7 @@ Vzor textu ze souboru:</translation>
<translation>Parametry nástroje</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterBox.cpp" line="153"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterBox.cpp" line="129"/>
<source>Track</source>
<translation>Stopa</translation>
</message>
@@ -16109,7 +15443,7 @@ Vzor textu ze souboru:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="69"/>
<source>none</source>
<translation>Žádný</translation>
</message>
@@ -16496,52 +15830,8 @@ Vzor textu ze souboru:</translation>
</message>
</context>
<context>
- <name>Rosegarden::LatencyConfigurationPage</name>
- <message>
- <source>Latency</source>
- <translation type="obsolete">Prodleva</translation>
- </message>
- <message>
- <source>Sequencer Latency</source>
- <translation type="obsolete">Prodleva sekvenceru</translation>
- </message>
- <message>
- <source>JACK latency</source>
- <translation type="obsolete">Prodleva serveru JACK</translation>
- </message>
+ <name>Rosegarden::LilyPondExporter</name>
<message>
- <source>Use the "Fetch JACK latencies" button to discover the latency values set at
-the sequencer. It's recommended that you use the returned values but it's also
-possible to override them manually using the sliders. Note that if you change
-your JACK server parameters you should always fetch the latency values again.
-The latency values will be stored by Rosegarden for use next time.</source>
- <translation type="obsolete">Pomocà tlaÄÃtka "NaÄÃst prodlevy JACK" zjistÃte hodnoty prodlev nastavené na
-sekvenceru. DoporuÄujeme použÃt tyto vrácené hodnoty. Je vÅ¡ak také možné
-hodnoty ruÄnÄ› pÅ™epsat pomocà posuvnÃků. UvÄ›domte si, že pokud zmÄ›nÃte
-parametry serveru JACK, mÄ›li byste vždy naÄÃst hodnoty prodlev znovu.
-Hodnoty prodlev budou aplikacà Rosegarden uloženy pro dalÅ¡Ã použitÃ.</translation>
- </message>
- <message>
- <source>JACK playback latency (in ms)</source>
- <translation type="obsolete">Prodleva přehrávánà přes JACK (ms)</translation>
- </message>
- <message>
- <source>JACK record latency (in ms)</source>
- <translation type="obsolete">Prodleva záznamu přes JACK (ms)</translation>
- </message>
- <message>
- <source>Fetch JACK latencies</source>
- <translation type="obsolete">NaÄÃst prodlevy serveru JACK</translation>
- </message>
- <message>
- <source>JACK Latency</source>
- <translation type="obsolete">Prodleva serveru JACK</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::LilyPondExporter</name>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -16549,7 +15839,7 @@ Would you like to use
%1
instead?</source>
- <translation>Program LilyPond nedovoluje použÃvat v názvech souborů mezery nebo zpÄ›tná lomÃtka.
+ <translation type="obsolete">Program LilyPond nedovoluje použÃvat v názvech souborů mezery nebo zpÄ›tná lomÃtka.
Chcete použÃt
@@ -16558,39 +15848,32 @@ Chcete použÃt
namÃsto tÄ›chto znaků?</translation>
</message>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="641"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation>Uloženà v jiném formátu se nezdaÅ™ilo. Soubor nebylo možné otevÅ™Ãt pro zápis.</translation>
+ <translation type="obsolete">Uloženà v jiném formátu se nezdaÅ™ilo. Soubor nebylo možné otevÅ™Ãt pro zápis.</translation>
</message>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="810"/>
<source>Export succeeded, but the composition was empty.</source>
- <translation>Uloženà v jiném formátu se pozdařilo, ale skladba byla prázdná.</translation>
+ <translation type="obsolete">Uloženà v jiném formátu se pozdařilo, ale skladba byla prázdná.</translation>
</message>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="852"/>
<source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation>Uloženà neztlumených stop v jiném formátu se nezdaÅ™ilo. Nejsou žádné neztlumené stopy nebo v nich nejsou žádné Äásti.</translation>
+ <translation type="obsolete">Uloženà neztlumených stop v jiném formátu se nezdaÅ™ilo. Nejsou žádné neztlumené stopy nebo v nich nejsou žádné Äásti.</translation>
</message>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="858"/>
<source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation>Uloženà vybrané stopy v jiném formátu se nezdaÅ™il. Ve vybrané stopÄ› nejsou žádné Äásti.</translation>
+ <translation type="obsolete">Uloženà vybrané stopy v jiném formátu se nezdaÅ™il. Ve vybrané stopÄ› nejsou žádné Äásti.</translation>
</message>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="863"/>
<source>Export of selected segments failed. No segments are selected.</source>
- <translation>Uloženà vybrané Äásti v jiném formátu se nezdaÅ™il. Nejsou vybrány žádné Äásti.</translation>
+ <translation type="obsolete">Uloženà vybrané Äásti v jiném formátu se nezdaÅ™il. Nejsou vybrány žádné Äásti.</translation>
</message>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="2686"/>
<source>warning: overlong bar truncated here</source>
- <translation>VarovánÃ: byl zde zkrácen pÅ™ÃliÅ¡ dlouhý takt</translation>
+ <translation type="obsolete">VarovánÃ: byl zde zkrácen pÅ™ÃliÅ¡ dlouhý takt</translation>
</message>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="2697"/>
<source>warning: bar too short, padding with rests</source>
- <translation>VarovánÃ: takt je pÅ™ÃliÅ¡ krátký, bude doplnÄ›n pomlkami</translation>
+ <translation type="obsolete">VarovánÃ: takt je pÅ™ÃliÅ¡ krátký, bude doplnÄ›n pomlkami</translation>
</message>
</context>
<context>
@@ -16616,23 +15899,11 @@ Chcete použÃt
<translation>Základnà možnosti</translation>
</message>
<message>
- <source><qt>Choose which tracks to export.</qt></source>
- <translation type="obsolete"><qt>Vybrat stopy, které se majà vyvést.</qt></translation>
- </message>
- <message>
- <source>Selected tracks</source>
- <translation type="obsolete">Vybrané stopy</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="127"/>
<source>Compatibility level</source>
<translation>Úroveň sluÄitelnosti</translation>
</message>
<message>
- <source><qt>Set the LilyPond version you have installed. Rosegarden only caters for stable releases of LilyPond.</qt></source>
- <translation type="obsolete"><qt>Nastavte verzi programu LilyPond, kterou jste nainstaloval. Rosegarden se dá použÃvat pouze se stabilnÃmi verzemi LilyPondu.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="132"/>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="133"/>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="134"/>
@@ -16667,10 +15938,6 @@ Chcete použÃt
<translation>Velikost papÃru</translation>
</message>
<message>
- <source><qt>Set the paper size.</qt></source>
- <translation type="obsolete"><qt>Nastavit velikost papÃru.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="145"/>
<source>A3</source>
<translation>A3</translation>
@@ -16716,18 +15983,6 @@ Chcete použÃt
<translation>na Å¡ÃÅ™ku</translation>
</message>
<message>
- <source><qt>Check this if you want your score set in landscape.</qt></source>
- <translation type="obsolete"><qt>Zvolte, pokud chcete, aby se váš notový zápis na papÃru objevil natoÄen na Å¡ÃÅ™ku.</qt></translation>
- </message>
- <message>
- <source>Specific options</source>
- <translation type="obsolete">Zvláštnà volby</translation>
- </message>
- <message>
- <source><qt>Set different score mark options.</qt></source>
- <translation type="obsolete"><qt>Nastavit různé volby pro znaÄky v notovém zápisus.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="350"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-lilypondoptions-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-lilypondoptions-en</translation>
@@ -16839,10 +16094,6 @@ Chcete použÃt
<translation>Tisknout krátké názvy osnov</translation>
</message>
<message>
- <source><qt>Useful for large, complex scores, this prints the short name every time there is a line break in the score, making it easier to follow which line belongs to which instrument across pages</qt></source>
- <translation type="obsolete"><qt>UžiteÄné pro rozsáhlé, složité notové zápisy. Vytiskne krátký název pokaždé, když je v notovém zápisu zalomenà řádku, ÄÃmž je snadnÄ›jÅ¡Ã sledovat, který řádek patřà na stranách ke kterému nástroji.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="246"/>
<source><qt><p>Useful for multi-page scores: this may prevent ugly final pages</p></qt></source>
<translation><qt><p>UžiteÄné u notových zápisů s vÃce stranami: zabránà oÅ¡klivým stranám na konci.</p></qt></translation>
@@ -16913,28 +16164,16 @@ Chcete použÃt
<translation type="unfinished"></translation>
</message>
<message>
- <source><qt>Choose how often to show Tempo Marks in your score.</qt></source>
- <translation type="obsolete"><qt>Vybrat poÄet znaÄek s tempem v notovém zápisu.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="210"/>
<source>Export lyrics</source>
<translation>Vyvést text pÃsnÄ›</translation>
</message>
<message>
- <source><qt>Set the position of the <b>lyrics/words</b> in relation to the notes.</qt></source>
- <translation type="obsolete"><qt>Nastavit polohu <b>textu pÃsnÄ›/slov</b> ve vztahu k notám.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="221"/>
<source>Export beamings</source>
<translation>Vyvést trámce</translation>
</message>
<message>
- <source><qt>Check to export Rosegarden beamings to your score.</qt></source>
- <translation type="obsolete"><qt>Zaškrtněte, aby Rosegarden vyvedl trámce do vašeho notového zápisu.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="228"/>
<source>Export track staff brackets</source>
<translation>Vyvést závorky osnovy této stopy</translation>
@@ -16990,19 +16229,11 @@ Chcete použÃt
<translation>Vykládat texty u akordů jako názvy akordů u hlavnÃho listu</translation>
</message>
<message>
- <source><qt>If you have only one staff in this score, you wouldn't want to export brackets.</qt></source>
- <translation type="obsolete"><qt>V pÅ™ÃpadÄ› že je v notovém zápisu pouze jedna osnova, nemÄ›ly by se závorky radÄ›ji vyvádÄ›t.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="241"/>
<source><qt><p>There is a tutorial on how to use this feature at http://www.rosegardenmusic.com/tutorials/supplemental/chordnames/index.html</p></qt></source>
<translation><qt><p>Pro použÃvánà této funkce je návod na http://www.rosegardenmusic.com/tutorials/supplemental/chordnames/index.html</p></qt></translation>
</message>
<message>
- <source><qt><p>Useful for multipage scores: this will prevent ugly final pages.</p></qt></source>
- <translation type="obsolete"><qt><p>UžiteÄné u notových zápisů s vÃce stranami: zabránà oÅ¡klivým stranám na konci.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="249"/>
<source>No markers</source>
<translation>Žádné znaÄky</translation>
@@ -17141,10 +16372,6 @@ Chcete použÃt
<translation><b>%1</b> spuštěn...</translation>
</message>
<message>
- <source><qt><p>LilyPond processed the file successfully, but <b>%1</b> did not run!</p><p>Please configure a valid %2 under <b>Settings -> Configure Rosegarden -> General -> External Applications</b> and try again.</p><p>Processing terminated due to fatal errors.</p></qt></source>
- <translation type="obsolete"><qt><p>LilyPond provedl zpracovánà souboru úspěšnÄ›, ale <b>%1</b> neběžel!</p><p>Nastavte, prosÃm, platný %2 pod <b>Nastavenà -> Nastavit Rosegarden -> Obecné -> VnÄ›jÅ¡Ã programy</b> a zkuste to znovu.</p><p>Provedenà ukonÄeno kvůli nepÅ™Ãjemným chybám.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/general/LilyPondProcessor.cpp" line="278"/>
<source>file printer</source>
<translation>Tisk do souboru</translation>
@@ -17158,10 +16385,6 @@ Chcete použÃt
<context>
<name>Rosegarden::LoopRuler</name>
<message>
- <source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Double-click to start playback.</p></qt></source>
- <translation type="obsolete"><qt><p>KlepnÄ›te a táhnÄ›te pro pÅ™emÃstÄ›nà ukazatele polohy pÅ™ehrávánÃ.</p><p>Shift-klepnutà a taženà pro nastavenà oblasti pro opakovánà a úpravy.</p><p>Shift-klepnutà pro smazánà opakovánà nebo oblasti.</p><p>Dvojité klepnutà pro spuÅ¡tÄ›nà pÅ™ehrávánÃ.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/rulers/LoopRuler.cpp" line="80"/>
<source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Ctrl-click and drag to move the playback pointer with snap to beat.</p><p>Double-click to start playback.</p></qt></source>
<translation><qt><p>KlepnÄ›te a táhnÄ›te pro pÅ™emÃstÄ›nà ukazatele polohy pÅ™ehrávánÃ.</p><p>Shift-klepnutà a taženà pro nastavenà oblasti pro opakovánà a úpravy.</p><p>Shift-klepnutà pro smazánà opakovánà nebo oblasti.</p><p>Ctrl-klepnutà a taženà pro pÅ™emÃstÄ›nà ukazatele polohy pÅ™ehrávánà se zapadnutÃm do doby.</p><p>Dvojité klepnutà pro spuÅ¡tÄ›nà pÅ™ehrávánÃ.</p></qt></translation>
@@ -17358,129 +16581,92 @@ bude obvykle spojeno zpoždÄ›nà zaÄátku pÅ™ehrávánÃ, protože se bude nap
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <source><qt>Set the MIDI bank from which programs will be selected upon loading a new file or (if so configured) at the start of playback</qt></source>
- <translation type="obsolete"><qt>Nastavit banku MIDI, ze které budou vybrány programy pÅ™i nahrávánà nového souboru nebo (v pÅ™ÃpadÄ›, že by tak byl Rosegarden nastaven) pÅ™i spuÅ¡tÄ›nà pÅ™ehrávánÃ</qt></translation>
- </message>
- <message>
- <source><qt><p>Set the MIDI channel number.</p><p>Before changing this, consider switching to a different instrument instead. Instruments #1 through #16 match MIDI channels 1 through 16 by default. You may change this relationship using this control if you wish, but this can lead to confusion</p></qt></source>
- <translation type="obsolete"><qt><p>Nastavit ÄÃslo kanálu MIDI.</p><p>PÅ™edtÃm, než se toto zmÄ›nÃ, zvažte mÃsto toho pÅ™epnutà na jiný nástroj. Nástroje od #1 po #16 odpovÃdajà ve výchozÃm nastavenà kanálům MIDI od 1 po 16. Pokud budete chtÃt, můžete zde, pomocà tohoto ovládacÃho prvku, tento vztah zmÄ›nit. Ale toto by mohl vést k zmatenÃ</p></qt></translation>
- </message>
- <message>
- <source><qt>Set the MIDI program or "patch"</p><p>This will be transmitted upon loading a new file and (if Rosegarden is so configured) at the start of playback</p></qt></source>
- <translation type="obsolete"><qt>Nastavit program MIDI nebo "cestu"</p><p>Toto bude zmÄ›nÄ›no pÅ™i nahránà nového souboru a (v pÅ™ÃpadÄ›, že by tak byl Rosegarden nastaven) pÅ™i spuÅ¡tÄ›nà pÅ™ehrávánÃ</p></qt></translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="191"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="194"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation><qt>Nastavit obměny programu výše, pokud jsou dostupné ve studiu.</qt></translation>
</message>
<message>
- <source><qt>Enable the control to the right</qt></source>
- <translation type="obsolete"><qt>Zapnout ovladaÄ na pravé stranÄ›</qt></translation>
- </message>
- <message>
- <source><qt><p>Check this to tell Rosegarden that this is a percussion instrument. This allows you access to any percussion key maps and/or Roland-style drum kits you may have configured in the studio</p></qt></source>
- <translation type="obsolete"><qt><p>ZapnÄ›te tuto volbu, abyste tÃm povÄ›dÄ›l Rosegardenu, že toto je nástroj bicÃch. Toto vám umožnà pÅ™Ãstup k jakémukoli pÅ™iÅ™azenà kláves bicÃch a/nebo bicÃm ve stylu Roland, které by vámi byly nastaveny ve studiu</p></qt></translation>
- </message>
- <message>
- <source>auto</source>
- <translation type="obsolete">Automaticky</translation>
- </message>
- <message>
- <source>fixed</source>
- <translation type="obsolete">Pevný</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="139"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="142"/>
<source><qt>Set the MIDI bank from which to select programs</qt></source>
<translation><qt>Stanovit banku MIDI, ze které se majà vybÃrat programy</qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="165"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="168"/>
<source><qt>Set the MIDI program or "patch"</p></qt></source>
<translation><qt>Stanovit program MIDI nebo "patch"</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="111"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="114"/>
<source><qt><p>Check this to tell Rosegarden that this is a percussion instrument. This allows you access to any percussion key maps and drum kits you may have configured in the studio</p></qt></source>
<translation><qt><p>ZapnÄ›te tuto volbu, abyste tÃm povÄ›dÄ›l Rosegardenu, že toto je nástroj bicÃch. Toto vám umožnà pÅ™Ãstup k jakémukoli pÅ™iÅ™azenà kláves bicÃch a bicÃm, které by vámi byly nastaveny ve studiu</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="204"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="207"/>
<source><qt><p><i>Auto</i>, allocate channel automatically; <i>Fixed</i>, fix channel to instrument number</p></qt></source>
<translation><qt><p><i>Automaticky</i>, pÅ™idÄ›lit kanál automaticky; <i>Pevný</i>, pÅ™ipevnit kanál k ÄÃslu nástroje</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="117"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="120"/>
<source>Bank</source>
<translation>Banka</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="176"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="179"/>
<source>Variation</source>
<translation>RozdÃl</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="150"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="153"/>
<source>Program</source>
<translation>Program</translation>
</message>
<message>
- <source>Channel out</source>
- <translation type="obsolete">Výstupnà kanál</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="104"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="107"/>
<source>Percussion</source>
<translation>BicÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="124"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="127"/>
<source><qt>Send bank select</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="157"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="160"/>
<source><qt>Send program change</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="183"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="186"/>
<source><qt>Send bank select for variation</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="202"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="205"/>
<source>Channel</source>
<translation>Kanál</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="214"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="217"/>
<source>Auto</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="215"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="218"/>
<source>Fixed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="225"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="228"/>
<source><qt>Use program changes from an external source to manipulate these controls (only valid for the currently-active track) [Shift + P]</qt></source>
<translation><qt>PoužÃt zmÄ›ny programu z vnÄ›jÅ¡Ãho zdroje kvůli zmÄ›nÄ› tohoto ovládacÃho prvku (platà pouze pro souÄasnÄ› Äinnou stopu) [Shift + P]</qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="223"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="226"/>
<source>Receive external</source>
<translation>PÅ™Ãjem od vnÄ›jÅ¡Ãho</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="300"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="300"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="314"/>
<source>No connection</source>
<translation>Nenà pÅ™ipojenÃ</translation>
</message>
@@ -17618,10 +16804,6 @@ bude obvykle spojeno zpoždÄ›nà zaÄátku pÅ™ehrávánÃ, protože se bude nap
<translation>Takty, doby a vedlejšà doby</translation>
</message>
<message>
- <source>Bars, beats, and divisions</source>
- <translation type="obsolete">Taktové Äáry, doby a figurace</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/ManageMetronomeDialog.cpp" line="143"/>
<source>Bar velocity</source>
<translation>SÃla tónu taktu</translation>
@@ -17702,16 +16884,21 @@ bude obvykle spojeno zpoždÄ›nà zaÄátku pÅ™ehrávánÃ, protože se bude nap
<translation>ProbÃhá záznam</translation>
</message>
<message>
- <source>Synth plugin </source>
- <translation type="obsolete">PÅ™Ãdavné moduly syntetizátorů</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/ManageMetronomeDialog.cpp" line="318"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="81"/>
@@ -17917,47 +17104,47 @@ PoklepánÃm otevÅ™ete editor znaÄek.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Podržte tlaÄÃtko Shift, abyste se vyhnuli pÅ™ichytávánà na mřÞku dob</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="304"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="305"/>
<source>Copy and Move Event</source>
<translation>KopÃrovat a pÅ™esunout událost</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="306"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="307"/>
<source>Copy and Move Events</source>
<translation>KopÃrovat a pÅ™esunout události</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="310"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="311"/>
<source>Move Event</source>
<translation>Přesunout událost</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="312"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="313"/>
<source>Move Events</source>
<translation>Přesunout události</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="413"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="414"/>
<source>Click and drag to move a note; hold Ctrl as well to copy it</source>
<translation>KlepnutÃm a taženÃm pÅ™esunete notu; podržÃte-li tlaÄÃtko Ctrl, můžete notu také kopÃrovat</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="415"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="416"/>
<source>Click and drag to copy a note</source>
<translation>KlepnutÃm a taženÃm zkopÃrujete notu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="419"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="420"/>
<source>Click and drag to move selected notes; hold Ctrl as well to copy</source>
<translation>KlepnutÃm a taženÃm pÅ™esunete vybrané noty; podržÃte-li tlaÄÃtko Ctrl, můžete noty také kopÃrovat</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="421"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="422"/>
<source>Click and drag to copy selected notes</source>
<translation>KlepnutÃm a taženÃm zkopÃrujete vybrané noty</translation>
</message>
@@ -18081,12 +17268,12 @@ PoklepánÃm otevÅ™ete editor znaÄek.</translation>
<translation>ZmÄ›nit sÃly tónů</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixVelocity.cpp" line="257"/>
+ <location filename="../../src/gui/editors/matrix/MatrixVelocity.cpp" line="260"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>KlepnutÃm a taženÃm pÅ™izpůsobÃte sÃlu tónu vybraných not</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixVelocity.cpp" line="259"/>
+ <location filename="../../src/gui/editors/matrix/MatrixVelocity.cpp" line="262"/>
<source>Click and drag to scale velocity of note</source>
<translation>KlepnutÃm a taženÃm pÅ™izpůsobÃte sÃlu tónu noty</translation>
</message>
@@ -18094,79 +17281,11 @@ PoklepánÃm otevÅ™ete editor znaÄek.</translation>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <source>Instrument Parameters</source>
- <translation type="obsolete">Parametry nástroje</translation>
- </message>
- <message>
- <source>Couldn't apply piano roll layout</source>
- <translation type="obsolete">Nebylo možné použÃt rozloženà klavÃrnÃho válce</translation>
- </message>
- <message>
- <source> No selection </source>
- <translation type="obsolete"> Žádný výběr </translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">ProbÃhá kvantizace...</translation>
- </message>
- <message>
- <source>Collapsing notes...</source>
- <translation type="obsolete">ProbÃhá sjednocovánà not...</translation>
- </message>
- <message>
- <source>Making legato...</source>
- <translation type="obsolete">ProbÃhá vytvářenà legata...</translation>
- </message>
- <message>
- <source>Note: %1 (%2.%3s)</source>
- <translation type="obsolete">Nota: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>%1 (%2)</source>
- <translation type="obsolete">%1 (%2)</translation>
- </message>
- <message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">ÄŒas: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">ProbÃhá vyjmutà výbÄ›ru do schránky...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">ProbÃhá kopÃrovánà výbÄ›ru do schránky...</translation>
- </message>
- <message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">Schránka je prázdná</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">ProbÃhá vkládánà obsahu schránky...</translation>
- </message>
- <message>
- <source>Couldn't paste at this point</source>
- <translation type="obsolete">Nebylo možné provést vloženà na tomto mÃstÄ›</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">ProbÃhá odstranÄ›nà výbÄ›ru...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1829"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1830"/>
<source>Unknown note insert action %1</source>
<translation>Krok vloženà neznámé noty %1</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">ProbÃhá vloženà noty</translation>
- </message>
- <message>
- <source>Unquantizing...</source>
- <translation type="obsolete">ProbÃhá ruÅ¡enà kvantizace...</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="326"/>
<source><untitled></source>
<translation><bez názvu></translation>
@@ -18191,18 +17310,6 @@ PoklepánÃm otevÅ™ete editor znaÄek.</translation>
</translation>
</message>
<message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 Ovládacà prvek %2 %3</translation>
- </message>
- <message>
- <source>Pitch Bend</source>
- <translation type="obsolete">Ohýbánà výšky tónu</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Nepodporovaný typ události</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="603"/>
<source> Grid: </source>
<translation> MřÞka: </translation>
@@ -18243,78 +17350,53 @@ PoklepánÃm otevÅ™ete editor znaÄek.</translation>
<translation>Vypnuto</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1552"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1554"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:matrix-en</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1559"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1561"/>
<source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
<translation>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1566"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1568"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1579"/>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1734"/>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1829"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1581"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1830"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="2211"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="2212"/>
<source>Estimated key signature shown</source>
<translation>Ukazuje se zjiÅ¡tÄ›né pÅ™edznamenánÃ</translation>
</message>
<message>
- <source> Zoom: </source>
- <translation type="obsolete"> Zoom: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1347"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1349"/>
<source>Estimated time signature shown</source>
<translation>Ukazuje se odhadované oznaÄenà taktu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1435"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1437"/>
<source>Transpose</source>
<translation>Převést</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1436"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1438"/>
<source>By number of semitones: </source>
<translation>Zadejte poÄet půltónů, o které se má pÅ™evádÄ›t:</translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">ProbÃhá zvÄ›tÅ¡ovánà rychlostÃ...</translation>
- </message>
- <message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">ProbÃhá zmenÅ¡ovánà rychlostÃ...</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Nastavit rychlosti událostÃ</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">ProbÃhá nastavovánà rychlostÃ...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1116"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1118"/>
<source>Trigger Segment</source>
<translation>Spustit Äást</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1126"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1128"/>
<source>Remove Triggers</source>
<translation>Odebrat spouÅ¡tÄ›cà znaÄky</translation>
</message>
@@ -18323,57 +17405,36 @@ PoklepánÃm otevÅ™ete editor znaÄek.</translation>
<source>Matrix</source>
<translation>Tabulka</translation>
</message>
- <message>
- <source>Percussion</source>
- <translation type="obsolete">BicÃ</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - %3</source>
- <translation type="obsolete">%1 - Stopa segmentu #%2 - %3</translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">%1 - VÅ¡echny segmenty - %2</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1734"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Nelze vložit notu: nebyla vybrána doba trvánà v mřÞce</translation>
- </message>
- <message>
- <source> Chord </source>
- <translation type="obsolete"> Akord</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="194"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="196"/>
<source>Zoom</source>
<translation>ZvÄ›tÅ¡enÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="210"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="212"/>
<source>Horizontal Zoom</source>
<translation>Vodorovné zvÄ›tÅ¡enÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="222"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="224"/>
<source>Vertical Zoom</source>
<translation>Svislé zvÄ›tÅ¡enÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="235"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="237"/>
<source>Reset Zoom</source>
<translation>Nastavit znovu zvÄ›tÅ¡enÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1329"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1366"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>OtáÄet koleÄkem kvůli zmÄ›nÄ› Äinné Äásti</qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1330"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1367"/>
<source><qt>Segment: "%1"<br>Track: %2 "%3"</qt></source>
<translation><qt>Část: "%1"<br>Stopa: %2 "%3"</qt></translation>
</message>
@@ -18475,13 +17536,6 @@ PoklepánÃm otevÅ™ete editor znaÄek.</translation>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">Tabulka přiřazenà kláves v tónině</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="53"/>
@@ -18498,22 +17552,22 @@ PoklepánÃm otevÅ™ete editor znaÄek.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="129"/>
<source>MIDI Mixer</source>
<translation>SměšovaÄ MIDI</translation>
</message>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="157"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="169"/>
<source>Volume</source>
<translation>Hlasitost</translation>
</message>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="162"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="174"/>
<source>Instrument</source>
<translation>Nástroj</translation>
</message>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="692"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="691"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</translation>
</message>
@@ -18752,333 +17806,51 @@ PoklepánÃm otevÅ™ete editor znaÄek.</translation>
</message>
<message>
<location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="152"/>
- <source><qt>Choose which bracket will create a grand staff system</qt></source>
- <translation><qt>Vyberte, která závorka vytvořà osnovu velké osnovy</qt></translation>
- </message>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="161"/>
- <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
- <translation><qt><p>Vyvedenà bicÃch je stále pokusné.</p>Bicà lze vyvést "jako noty" nebo "jako." bicà nástroje. PÅ™i vyvádÄ›nà "jako noty" se se stopou bicÃch pracuje jako s obvyklou stopou.</p><p>Pokud je stopa vyvádÄ›na "jako bicà nástroje" bude vyvedena jako Äást bicÃch MusicXML. Protože Rosegarden nemá notový zápis bicÃch, pokusà se vyvedenà MusicXML o pÅ™evedenà stopy s bicÃmi na notový zápis bicÃch. Tato volby je pořád <b>pokusná</b>.</p></qt></translation>
- </message>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="167"/>
- <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
- <translation><qt><p>NÄ›které pÅ™evádÄ›cà nástroje (jako tenorový barytonový saxofon) pÅ™evádÄ›jà pÅ™es vÃce než jednu oktávu. Pro tak rozsáhlé pÅ™evody vyžadujà nÄ›které nástroje prvek pro "<posun oktávy>", zatÃmco jiné nástroje tento prvek vůbec nepodporujÃ.</p><p>PÅ™i zavádÄ›nà souboru MusicXML do jiného nástroje, ověřte pÅ™evádÄ›cà nástroje opatrnÄ› jak v koncertnà tak v do not zapsané výšce. Pokud to nenà správnÄ›, může pomoci pÅ™epnutà této volby.</p></qt></translation>
- </message>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="138"/>
- <source>MusicXML type</source>
- <translation>Typ MusicXML</translation>
- </message>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="148"/>
- <source>None</source>
- <translation>Žádný</translation>
- </message>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="155"/>
- <source>Don't export percussion tracks</source>
- <translation>NevyvádÄ›t stopy s bicÃmi</translation>
- </message>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="163"/>
- <source>Use "<octave-shift>" for transposing instruments</source>
- <translation>PoužÃt "<posun oktávy>" pro pÅ™evádÄ›cà nástroje</translation>
- </message>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="208"/>
- <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
- <translation>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NameSetEditor</name>
- <message>
- <source>Librarian</source>
- <translation type="obsolete">KnihovnÃk</translation>
- </message>
- <message>
- <source>Name</source>
- <translation type="obsolete">Jméno</translation>
- </message>
- <message>
- <source>Email</source>
- <translation type="obsolete">E-mail</translation>
- </message>
- <message>
- <source>The librarian maintains the Rosegarden device data for this device.
-If you've made modifications to suit your own device, it might be worth
-liaising with the librarian in order to publish your information for the benefit
-of others.</source>
- <translation type="obsolete">KnihovnÃk udržuje data o zaÅ™Ãzenà aplikace Rosegarden pro toto zaÅ™ÃzenÃ.
-Pokud jste provedli úpravy dat tak, aby vyhovovala vaÅ¡emu zaÅ™ÃzenÃ, bylo by dobré
-tyto úpravy sdÄ›lit knihovnÃkovi, aby je mohl publikovat pro využitÃ
-dalÅ¡Ãmi uživateli.</translation>
- </message>
- <message>
- <location filename="../../src/gui/studio/NameSetEditor.cpp" line="67"/>
- <source>Provided by</source>
- <translation>Poskytnuto</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewMatrixView</name>
- <message>
- <source>Matrix</source>
- <translation type="obsolete">Matice</translation>
- </message>
- <message>
- <source><untitled></source>
- <translation type="obsolete"><bez názvu></translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">%1 - VÅ¡echny segmenty - %2</translation>
- </message>
- <message>
- <source> Grid: </source>
- <translation type="obsolete"> Rastr: </translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Žádný</translation>
- </message>
- <message>
- <source>Unit</source>
- <translation type="obsolete">Jednotka</translation>
- </message>
- <message>
- <source>Beat</source>
- <translation type="obsolete">Doba</translation>
- </message>
- <message>
- <source>Bar</source>
- <translation type="obsolete">Taktová Äára</translation>
- </message>
- <message>
- <source> Velocity: </source>
- <translation type="obsolete"> Rychlost:</translation>
- </message>
- <message>
- <source> Quantize: </source>
- <translation type="obsolete"> Kvantizovat: </translation>
- </message>
- <message>
- <source> Zoom: </source>
- <translation type="obsolete"> Zoom: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Nastavit rychlosti událostÃ</translation>
- </message>
- <message>
- <source>Trigger Segment</source>
- <translation type="obsolete">Spouštěcà segment</translation>
- </message>
- <message>
- <source>Remove Triggers</source>
- <translation type="obsolete">Odebrat spouÅ¡tÄ›cà znaÄky</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Zobrazené odhadované oznaÄenà taktu</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Transponovat</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Zadejte o kolik půltónů:</translation>
- </message>
- <message>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="obsolete">Nelze vložit notu: nebyla vybrána doba trvánà v rastru</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewNotationView</name>
- <message>
- <source>Note &Font</source>
- <translation type="obsolete">Notové &pÃsmo</translation>
- </message>
- <message>
- <source>Si&ze</source>
- <translation type="obsolete">V&elikost</translation>
- </message>
- <message>
- <source>S&pacing</source>
- <translation type="obsolete">&Rozestupy</translation>
- </message>
- <message>
- <source> Font: </source>
- <translation type="obsolete"> PÃsmo: </translation>
- </message>
- <message>
- <source>Unknown font "%1", using default</source>
- <translation type="obsolete">PÃsmo "%1" je neznámé, použije se výchozÃ</translation>
- </message>
- <message>
- <source> Size: </source>
- <translation type="obsolete"> Velikost: </translation>
- </message>
- <message>
- <source> Spacing: </source>
- <translation type="obsolete"> Rozestupy: </translation>
- </message>
- <message>
- <source>LilyPond Preview Options</source>
- <translation type="obsolete">Možnosti zobrazenà náhledu pro aplikaci LilyPond</translation>
- </message>
- <message>
- <source>LilyPond preview options</source>
- <translation type="obsolete">Možnosti zobrazenà náhledu pro aplikaci LilyPond</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Export selhal. Soubor nebylo možné otevÅ™Ãt pro zápis.</translation>
- </message>
- <message>
- <source>Unknown font action %1</source>
- <translation type="obsolete">Akce s neznámým pÃsmem - %1</translation>
- </message>
- <message>
- <source>Unknown font size action %1</source>
- <translation type="obsolete">Akce s neznámou velikostà pÃsma - %1</translation>
- </message>
- <message>
- <source>Unknown spacing action %1</source>
- <translation type="obsolete">Akce s neznámými rozestupy - %1</translation>
- </message>
- <message>
- <source>Can't paste multiple Segments into one</source>
- <translation type="obsolete">Nelze vložit několik segmentů do jednoho</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
- <message>
- <source>Couldn't paste at this point.</source>
- <translation type="obsolete">Nebylo možné provést vloženà na tomto mÃstÄ›.</translation>
- </message>
- <message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">Omezený typ vkládánà vyžaduje dostatek volného mÃsta (obsahujÃcà pouze pomlky) na mÃstÄ› vloženÃ, aby se do nÄ›j vÅ¡echny události veÅ¡ly.
-Nebylo nalezeno dost mÃsta.
-Chcete-li i pÅ™esto provést vloženÃ, zvažte použità jednoho z dalÅ¡Ãch typů vkládánà pod možnostà "Vložit" v nabÃdce Upravit. Pokud chcete, můžete také zmÄ›nit výchozà typ vkládánà na jiný než Omezený.</translation>
- </message>
- <message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">Schránka je prázdná</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">ProbÃhá vkládánà obsahu schránky...</translation>
- </message>
- <message>
- <source>Raising velocities...</source>
- <translation type="obsolete">ProbÃhá zvÄ›tÅ¡ovánà rychlostÃ...</translation>
- </message>
- <message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">ProbÃhá zmenÅ¡ovánà rychlostÃ...</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Nastavit rychlosti událostÃ</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">ProbÃhá nastavovánà rychlostÃ...</translation>
- </message>
- <message>
- <source>Unknown note insert action %1</source>
- <translation type="obsolete">Akce vloženà neznámé noty %1</translation>
- </message>
- <message>
- <source>Inserting note</source>
- <translation type="obsolete">ProbÃhá vloženà noty</translation>
- </message>
- <message>
- <source>Ornament track %1 bar %2</source>
- <translation type="obsolete">Melodická ozdoba - stopa %1, taktová Äára %2</translation>
- </message>
- <message>
- <source>Ornament bar %1</source>
- <translation type="obsolete">Taktová Äára melodické ozdoby %1</translation>
- </message>
- <message>
- <source>Make Ornament</source>
- <translation type="obsolete">Vytvořit melodickou ozdobu</translation>
- </message>
- <message>
- <source>Use Ornament</source>
- <translation type="obsolete">PoužÃt melodickou ozdobu</translation>
- </message>
- <message>
- <source>Remove Ornaments</source>
- <translation type="obsolete">Odstranit melodické ozdoby</translation>
- </message>
- <message>
- <source>Estimated key signature shown</source>
- <translation type="obsolete">Zobrazené odhadované pÅ™edznamenánÃ</translation>
- </message>
- <message>
- <source>Sustain</source>
- <translation type="obsolete">Držet tón</translation>
- </message>
- <message>
- <source>There is no sustain controller defined for this device.
-Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
- <translation type="obsolete">Pro toto zaÅ™Ãzenà nenà definován žádný ovládacà prvek pro drženà tónu.
-UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› konfigurováno v dialogu Správa zaÅ™Ãzenà MIDI v hlavnÃm oknÄ›.</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Zobrazené odhadované oznaÄenà taktu</translation>
- </message>
- <message>
- <source>Can't insert note: No note duration selected</source>
- <translation type="obsolete">Nelze vložit notu. Nebyla vybrána doba trvánà noty</translation>
+ <source><qt>Choose which bracket will create a grand staff system</qt></source>
+ <translation><qt>Vyberte, která závorka vytvořà osnovu velké osnovy</qt></translation>
</message>
<message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">ÄŒas: %1 (%2.%3s)</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="161"/>
+ <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
+ <translation><qt><p>Vyvedenà bicÃch je stále pokusné.</p>Bicà lze vyvést "jako noty" nebo "jako." bicà nástroje. PÅ™i vyvádÄ›nà "jako noty" se se stopou bicÃch pracuje jako s obvyklou stopou.</p><p>Pokud je stopa vyvádÄ›na "jako bicà nástroje" bude vyvedena jako Äást bicÃch MusicXML. Protože Rosegarden nemá notový zápis bicÃch, pokusà se vyvedenà MusicXML o pÅ™evedenà stopy s bicÃmi na notový zápis bicÃch. Tato volby je pořád <b>pokusná</b>.</p></qt></translation>
</message>
<message>
- <source>%1 - Segment Track #%2 - Notation</source>
- <translation type="obsolete">%1 - Stopa segmentu #%2 - Notový zápis</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="167"/>
+ <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
+ <translation><qt><p>NÄ›které pÅ™evádÄ›cà nástroje (jako tenorový barytonový saxofon) pÅ™evádÄ›jà pÅ™es vÃce než jednu oktávu. Pro tak rozsáhlé pÅ™evody vyžadujà nÄ›které nástroje prvek pro "<posun oktávy>", zatÃmco jiné nástroje tento prvek vůbec nepodporujÃ.</p><p>PÅ™i zavádÄ›nà souboru MusicXML do jiného nástroje, ověřte pÅ™evádÄ›cà nástroje opatrnÄ› jak v koncertnà tak v do not zapsané výšce. Pokud to nenà správnÄ›, může pomoci pÅ™epnutà této volby.</p></qt></translation>
</message>
<message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">%1 - Všechny segmenty - Notový zápis</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="138"/>
+ <source>MusicXML type</source>
+ <translation>Typ MusicXML</translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Triola</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="148"/>
+ <source>None</source>
+ <translation>Žádný</translation>
</message>
<message>
- <source>Chord</source>
- <translation type="obsolete">Akord</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="155"/>
+ <source>Don't export percussion tracks</source>
+ <translation>NevyvádÄ›t stopy s bicÃmi</translation>
</message>
<message>
- <source>Grace</source>
- <translation type="obsolete">Respektovat</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="163"/>
+ <source>Use "<octave-shift>" for transposing instruments</source>
+ <translation>PoužÃt "<posun oktávy>" pro pÅ™evádÄ›cà nástroje</translation>
</message>
<message>
- <source>Transpose</source>
- <translation type="obsolete">Transponovat</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="208"/>
+ <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
+ <translation>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::NameSetEditor</name>
<message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Zadejte o kolik půltónů:</translation>
+ <location filename="../../src/gui/studio/NameSetEditor.cpp" line="67"/>
+ <source>Provided by</source>
+ <translation>Poskytnuto</translation>
</message>
</context>
<context>
@@ -19092,322 +17864,306 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› konfigurováno v dialogu Správa zaÅ™
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="52"/>
<location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="53"/>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="54"/>
<source>Notation</source>
<translation>Zápis</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="80"/>
<source>Default layout mode</source>
<translation>Výchozà režim rozvrženÃ</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="86"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="85"/>
<source>Linear layout</source>
<translation>Čárové rozvrženÃ</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="87"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="86"/>
<source>Continuous page layout</source>
<translation>Rozvrženà na jednu nepřetržitou stranu</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="88"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="87"/>
<source>Multiple page layout</source>
<translation>Rozvrženà na vÃce stran</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="96"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="95"/>
<source>Default spacing</source>
<translation>Výchozà rozestupy</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="109"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="108"/>
<source>%1 % (normal)</source>
<translation>%1 % (normálnÃ)</translation>
</message>
<message>
- <source>Default duration factor</source>
- <translation type="obsolete">Výchozà faktor doby trvánÃ</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Žádný</translation>
- </message>
- <message>
- <source>Full</source>
- <translation type="obsolete">Úplná</translation>
- </message>
- <message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="121"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="120"/>
<source>Show track headers (linear layout only)</source>
<translation>Ukázat hlaviÄky stop (pouze Äárové rozvrženÃ)</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="128"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="127"/>
<source>Never</source>
<translation>Nikdy</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="129"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="128"/>
<source>When needed</source>
<translation>V pÅ™ÃpadÄ› potÅ™eby</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="130"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="129"/>
<source>Always</source>
<translation>Vždy</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="138"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="137"/>
<source>"Always" and "Never" mean what they usually mean
"When needed" means "when staves are too many to all fit in the current window"</source>
<translation>"Vždy" a "Nikdy" znamená to, co obvykle
"V pÅ™ÃpadÄ› potÅ™eby" znamená "je-li pÅ™ÃliÅ¡ mnoho osnov k tomu, aby se veÅ¡ly do souÄasného okna"</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="151"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="150"/>
<source>Show non-notation events as question marks</source>
<translation>Ukázat události ne-notové povahy jako otaznÃky</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="162"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="161"/>
<source>Show notation-quantized notes in a different color</source>
<translation>Ukázat kvantizované noty notace jinou barvou</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="173"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="172"/>
<source>Show "invisible" events in grey</source>
<translation>Ukázat "neviditelné" události šedou barvou</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="184"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="183"/>
<source>Show notes outside suggested playable range in red</source>
<translation>Ukázat noty mimo navržený hratelný rozsah ÄervenÄ›</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="195"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="194"/>
<source>Highlight superimposed notes with a halo effect</source>
<translation>Zvýraznit pÅ™ekrývajÃcà se noty efektem kola (halo)</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="209"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="208"/>
<source>When recording MIDI, split-and-tie long notes at barlines</source>
<translation>PÅ™i nahrávánà pÅ™es MIDI, rozdÄ›lujte a svazujte dlouhé noty na taktových Äarách</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="225"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="224"/>
<source>Layout</source>
<translation>RozvrženÃ</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="238"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="237"/>
<source>Default note style for new notes</source>
<translation>Výchozà styl not pro nové noty</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="270"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="269"/>
<source>When inserting notes...</source>
<translation>Při vkládánà not...</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="278"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="277"/>
<source>Split notes into ties to make durations match</source>
<translation>RozdÄ›lit noty ligaturou tak, aby odpovÃdaly doby trvánÃ</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="279"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="278"/>
<source>Ignore existing durations</source>
<translation>PÅ™ehlÞet stávajÃcà doby trvánÃ</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="289"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="288"/>
<source>Auto-beam on insert when appropriate</source>
<translation>Provést automatické spojenà trámcem při vkládánà tam, kde je to vhodné</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="302"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="301"/>
<source>Tie notes at barlines automatically</source>
<translation>Svázat noty ligaturou na taktových Äárách automaticky</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="316"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="315"/>
<source>Collapse rests after erase</source>
<translation>Sjednotit pomlky po vymazánÃ</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="328"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="327"/>
<source>Default paste type</source>
<translation>Výchozà typ vloženÃ</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="352"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="351"/>
<source>Editing</source>
<translation>Úpravy</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="364"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="363"/>
<source>Accidentals in one octave...</source>
<translation>Posuvky v jedné oktávě...</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="367"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="366"/>
<source>Affect only that octave</source>
<translation>Ovlivnà pouze tuto oktávu</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="368"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="367"/>
<source>Require cautionaries in other octaves</source>
<translation>Vyžadovat varovné posuvky v dalÅ¡Ãch oktávách</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="369"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="368"/>
<source>Affect all subsequent octaves</source>
<translation>Ovlivnà vÅ¡echny následujÃcà oktávy</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="377"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="376"/>
<source>Accidentals in one bar...</source>
<translation>Posuvky v jedné taktové Äáře...</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="380"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="379"/>
<source>Affect only that bar</source>
<translation>Ovlivnà pouze tuto taktovou Äáru</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="381"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="380"/>
<source>Require cautionary resets in following bar</source>
<translation>Vyžadovat varovná nová nastavenà na následujÃcà taktové Äáře</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="382"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="381"/>
<source>Require explicit resets in following bar</source>
<translation>Vyžadovat výslovné odrážky na následujÃcà taktové Äáře</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="390"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="389"/>
<source>Key signature cancellation style</source>
<translation>Styl ruÅ¡enà pÅ™edznamenánÃ</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="393"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="392"/>
<source>Cancel only when entering C major or A minor</source>
<translation>Zrušit pouze při zadávánà C dur nebo A moll</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="394"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="393"/>
<source>Cancel whenever removing sharps or flats</source>
<translation>ZruÅ¡it pÅ™i každém odstraňovánà křÞků nebo béÄek</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="395"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="394"/>
<source>Cancel always</source>
<translation>Zrušit pokaždé</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="406"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="405"/>
<source>Accidentals</source>
<translation>Posuvky</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="417"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="416"/>
<source>Notation font</source>
<translation>PÃsmo notace</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="423"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="422"/>
<source>View</source>
<translation>Pohled</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="444"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="443"/>
<source>Origin:</source>
<translation>Původ:</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="448"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="447"/>
<source>Copyright:</source>
<translation>Autorské právo:</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="452"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="451"/>
<source>Mapped by:</source>
<translation>Přiřazeno:</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="456"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="455"/>
<source>Type:</source>
<translation>Typ:</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="482"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="481"/>
<source>Font size for single-staff views</source>
<translation>Velikost pÃsma pro zobrazenà s jednou osnovou</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="491"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="490"/>
<source>Font size for multi-staff views</source>
<translation>Velikost pÃsma pro zobrazenà s vÃce osnovami</translation>
</message>
<message>
- <source>Font size for printing (pt)</source>
- <translation type="obsolete">Velikost pÃsma pro tisk (v bodech)</translation>
- </message>
- <message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="509"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="508"/>
<source>Text font</source>
<translation>PÃsmo textu</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="521"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="520"/>
<source>Sans-serif font</source>
<translation>PÃsmo Sans-serif</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="534"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="533"/>
<source>Font</source>
<translation>PÃsmo</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="551"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="550"/>
<source>Show repeated segments</source>
<translation>Ukázat opakované Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="564"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="563"/>
<source>Allow direct edition of repeated segments</source>
<translation>Povolit pÅ™Ãmé úpravy opakovaných ÄástÃ</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="577"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="576"/>
<source>Hide redundant clefs and keys</source>
<translation>Skrýt nadbyteÄné klÃÄe a tóniny</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="590"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="589"/>
<source>Distribute verses among repeated segments</source>
<translation>RozdÄ›lovat sloky mezi opakované Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="605"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="604"/>
<source>Segments</source>
<translation>Části</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="632"/>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="712"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="631"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="711"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="704"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="703"/>
<source>%1 (smooth)</source>
<translation>%1 (vyhlazený)</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="706"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="705"/>
<source>%1 (jaggy)</source>
<translation>%1 (nerovný)</translation>
</message>
@@ -19666,42 +18422,22 @@ Jedná se o chybu programu (program již pravdÄ›podobnÄ› v této chvÃli havarov
<context>
<name>Rosegarden::NotationView</name>
<message>
- <source>Close track headers</source>
- <translation type="obsolete">UzavÅ™Ãt hlaviÄky stop</translation>
- </message>
- <message>
- <source>Starting...</source>
- <translation type="obsolete">Spouštà se...</translation>
- </message>
- <message>
- <source>Preparing to print...</source>
- <translation type="obsolete">ProbÃhá pÅ™Ãprava tisku...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1025"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1028"/>
<source>Note &Font</source>
<translation>Notové &pÃsmo</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1053"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1056"/>
<source>Si&ze</source>
<translation>V&elikost</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1073"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1076"/>
<source>S&pacing</source>
<translation>&Rozestupy</translation>
</message>
- <message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Faktor doby &trvánÃ</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Žádný</translation>
- </message>
<message numerus="yes">
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1065"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1068"/>
<source>%n pixel(s)</source>
<translation>
<numerusform>obrazový bod</numerusform>
@@ -19710,185 +18446,89 @@ Jedná se o chybu programu (program již pravdÄ›podobnÄ› v této chvÃli havarov
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1215"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1220"/>
<source> Font: </source>
<translation> PÃsmo: </translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1250"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1255"/>
<source>Unknown font "%1", using default</source>
<translation>PÃsmo "%1" je neznámé, použije se výchozÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1258"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1263"/>
<source> Size: </source>
<translation> Velikost: </translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1282"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1287"/>
<source> Spacing: </source>
<translation> Rozestupy: </translation>
</message>
<message>
- <source> Ready.</source>
- <translation type="obsolete"> Připraven.</translation>
- </message>
- <message>
- <source>Laying out score...</source>
- <translation type="obsolete">ProbÃhá uspořádánà partitury...</translation>
- </message>
- <message>
- <source>Laying out staff %1...</source>
- <translation type="obsolete">ProbÃhá uspořádánà osnovy %1...</translation>
- </message>
- <message>
- <source>Reconciling staffs...</source>
- <translation type="obsolete">ProbÃhá vyrovnánà osnov...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1167"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1170"/>
<source> No selection </source>
<translation> Žádný výběr </translation>
</message>
<message>
- <source>Sizing and allocating canvas...</source>
- <translation type="obsolete">ProbÃhá nastavenà velikosti a pÅ™idÄ›lenà zobrazovacà plochy...</translation>
- </message>
- <message>
- <source>note</source>
- <translation type="obsolete">nota</translation>
- </message>
- <message>
- <source>rest</source>
- <translation type="obsolete">pomlka</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - Notation</source>
- <translation type="obsolete">%1 - Stopa segmentu #%2 - Notový zápis</translation>
- </message>
- <message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">%1 - Všechny segmenty - Notový zápis</translation>
- </message>
- <message>
- <source>Triplet</source>
- <translation type="obsolete">Triola</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3820"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3850"/>
<source>Chord</source>
<translation>Akord</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3821"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3851"/>
<source>Grace</source>
<translation>PÅ™Ãraz</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3828"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3832"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3836"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3858"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3862"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3866"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<message>
- <source>Hidden annotations</source>
- <translation type="obsolete">Skryté anotace</translation>
- </message>
- <message>
- <source>Hidden LilyPond directives</source>
- <translation type="obsolete">Skryté direktivy aplikace LilyPond</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1583"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1588"/>
<source>Unknown spacing action %1</source>
<translation>Krok s neznámými rozestupy - %1</translation>
</message>
<message>
- <source>Unknown proportion action %1</source>
- <translation type="obsolete">Akce s neznámými proporcemi - %1</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1532"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1537"/>
<source>Unknown font action %1</source>
<translation>Krok s neznámým pÃsmem - %1</translation>
</message>
<message>
- <source>Unknown font size %1</source>
- <translation type="obsolete">Neznámá velikost pÃsma - %1</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1558"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1563"/>
<source>Unknown font size action %1</source>
<translation>Krok s neznámou velikostà pÃsma - %1</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">ProbÃhá tisk...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Náhled...</translation>
- </message>
- <message>
- <source>Printing LilyPond file...</source>
- <translation type="obsolete">ProbÃhá tisk souboru aplikace LilyPond...</translation>
- </message>
- <message>
- <source>Failed to open a temporary file for LilyPond export.</source>
- <translation type="obsolete">NepodaÅ™ilo se otevÅ™Ãt doÄasný soubor pro export do aplikace LilyPond.</translation>
- </message>
- <message>
- <source>Previewing LilyPond file...</source>
- <translation type="obsolete">Zobrazuje se náhled souboru aplikace LilyPond...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1411"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1416"/>
<source>LilyPond Preview Options</source>
<translation>Možnosti zobrazenà náhledu pro program LilyPond</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1412"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1417"/>
<source>LilyPond preview options</source>
<translation>Možnosti zobrazenà náhledu pro program LilyPond</translation>
</message>
<message>
- <source>Exporting LilyPond file...</source>
- <translation type="obsolete">ProbÃhá export souboru aplikace LilyPond...</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Vyvedenà se nezdaÅ™ilo. Soubor nebylo možné otevÅ™Ãt pro zápis.</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">ProbÃhá vyjmutà výbÄ›ru do schránky...</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">ProbÃhá odstranÄ›nà výbÄ›ru...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">ProbÃhá kopÃrovánà výbÄ›ru do schránky...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1708"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1715"/>
<source>Clipboard is empty</source>
<translation>Schránka je prázdná</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1655"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1660"/>
<source>Can't paste multiple Segments into one</source>
<translation>Nelze vložit nÄ›kolik Äástà do jedné</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="871"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="874"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1164"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1167"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> událost vybrána </numerusform>
@@ -19897,200 +18537,167 @@ Jedná se o chybu programu (program již pravdÄ›podobnÄ› v této chvÃli havarov
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1250"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1423"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1475"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1532"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1558"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1583"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1686"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1742"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2640"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3369"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4199"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4468"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1255"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1428"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1480"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1537"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1563"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1588"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1691"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1749"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2649"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3379"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4490"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1433"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1438"/>
<source>Printing with LilyPond...</source>
<translation>ProbÃhá tisk s LilyPondem...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1451"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1456"/>
<source>Previewing with LilyPond...</source>
<translation>ProbÃhá náhled s LilyPondem...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1476"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1481"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>NepodaÅ™ilo se otevÅ™Ãt doÄasný soubor pro vyvedenà z LilyPondu.</p><p>PravdÄ›podobnÄ› to znamená, že ukládacà prostor na disku <pre>%1</pre>je zcela zaplnÄ›n.</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1689"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1745"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1695"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1753"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation><qt><p>Omezený typ vloženà vyžaduje dostatek prázdného prostoru (obsahuje pouze pomlky) v poloze vloženà kvůli drženà vÅ¡ech událostÃ, které se vložÃ.</p><p>Nebylo nalezeno dost mÃsta.</p><p>Jestliže pÅ™esto hodláte vloženà provést, zvažte, zda nepoužÃt jiný z typů vloženà z nabÃdky <b>Vložit...</b> v nabÃdce Úpravy. Pokud byste si to přál, můžete rovněž zmÄ›nit typ vloženà z Omezený na nÄ›jaký jiný.</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1712"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1719"/>
<source>Inserting clipboard contents...</source>
<translation>ProbÃhá vkládánà obsahu schránky...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1688"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1744"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1693"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1751"/>
<source>Couldn't paste at this point.</source>
<translation>Nebylo možné provést vloženà na tomto mÃstÄ›.</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4555"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4577"/>
<source>Move Events to Staff Above</source>
<translation>Přesunout události na osnovu výše</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1885"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1894"/>
<source>Raising velocities...</source>
<translation>ProbÃhá zvÄ›tÅ¡ovánà rychlostÃ...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1896"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1905"/>
<source>Lowering velocities...</source>
<translation>ProbÃhá zmenÅ¡ovánà rychlostÃ...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Nastavit rychlosti událostÃ</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">ProbÃhá nastavovánà rychlostÃ...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4713"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4735"/>
<source>Edit Text Event</source>
<translation>Upravit textovou událost</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4761"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4783"/>
<source>Normalizing rests...</source>
<translation>ProbÃhá normalizace pomlk...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4774"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4796"/>
<source>Collapsing notes...</source>
<translation>ProbÃhá sjednocovánà not...</translation>
</message>
<message>
- <source>No note duration selected</source>
- <translation type="obsolete">Nebyla vybrána doba trvánà noty</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2640"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2649"/>
<source>Unknown note insert action %1</source>
<translation>Krok vloženà neznámé noty %1</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2644"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2653"/>
<source>Inserting note</source>
<translation>ProbÃhá vloženà noty</translation>
</message>
<message>
- <source>No rest duration selected</source>
- <translation type="obsolete">Nebyla vybrána doba trvánà pomlky</translation>
- </message>
- <message>
- <source>No note or rest duration selected</source>
- <translation type="obsolete">Nebyla vybrána doba trvánà noty nebo pomlky</translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">ProbÃhá kvantizace...</translation>
- </message>
- <message>
- <source>Interpreting selection...</source>
- <translation type="obsolete">ProbÃhá interpretace výbÄ›ru...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4952"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4962"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4974"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4984"/>
<source>Adding dot...</source>
<translation>ProbÃhá pÅ™idánà teÄky...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3033"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3042"/>
<source>Ornament track %1 bar %2</source>
<translation>Melodická ozdoba - stopa %1, takt %2</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3035"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3044"/>
<source>Ornament bar %1</source>
<translation>Takt melodické ozdoby %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Vytvořit melodickou ozdobu</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3073"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3082"/>
<source>Use Ornament</source>
<translation>PoužÃt melodickou ozdobu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3084"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3093"/>
<source>Remove Ornaments</source>
<translation>Odstranit melodické ozdoby</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3120"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3129"/>
<source>Edit ornament inline</source>
<translation>Upravit ozdobu řadově</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3147"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3156"/>
<source>Show ornament expansion</source>
<translation>Ukázat rozklad ozdoby</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3180"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3189"/>
<source>Unadopt Segment</source>
<translation>ZruÅ¡it pÅ™ijetà Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3296"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3305"/>
<source>Estimated key signature shown</source>
<translation>Ukazuje se zjiÅ¡tÄ›né pÅ™edznamenánÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3353"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3362"/>
<source>Sustain</source>
<translation>Držet tón</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3369"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3379"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>Pro toto zaÅ™Ãzenà nenà urÄenn žádný ovládacà prvek pro drženà tónu.
UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzenà MIDI v hlavnÃm oknÄ›.</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3538"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3548"/>
<source>Estimated time signature shown</source>
<translation>Ukazuje se odhadované oznaÄenà taktu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3686"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3716"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - Stopa Äásti #%3 - Notový zápis</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3693"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3723"/>
<source>%1%2 - All Segments - Notation</source>
<translation>%1%2 - - VÅ¡echny Äásti - Notový zápis</translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3699"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3729"/>
<source>%1%2 - %n Segment(s) - Notation</source>
<translation>
<numerusform>%1%2 Äást - Notový zápis</numerusform>
@@ -20099,75 +18706,70 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3819"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3849"/>
<source>Tuplet</source>
<translation>Rytmická notová skupina</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3983"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4013"/>
<source>Transpose</source>
<translation>Převést</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3984"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4014"/>
<source>By number of semitones: </source>
<translation>Zadejte poÄet půltónů, o které se má pÅ™evádÄ›t:</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4363"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4385"/>
<source>Time: %1 (%2.%3s)</source>
<translation>ÄŒas: %1 (%2.%3s)</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4441"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4463"/>
<source>http://rosegardenmusic.com/wiki/doc:notation-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:notation-en</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4448"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4470"/>
<source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
<translation>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4455"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4477"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4556"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4578"/>
<source>Move Events to Staff Below</source>
<translation>Posunout události na notovou osnovu dole</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4635"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4657"/>
<source>Edit Generated region mark</source>
<translation>Upravit znaÄku vytvoÅ™ené oblasti</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4659"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4681"/>
<source>Updated tags for aborted edit</source>
<translation>Aktualizované znaÄky pro zruÅ¡enou úpravu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4977"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4999"/>
<source>Set Note Type...</source>
<translation>Nastavit typ noty...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="5001"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="5023"/>
<source>Set Note Type notation only...</source>
<translation>Nastavit typ noty pouze pro notový zápis...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="5021"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="5043"/>
<source>Cycling slashes...</source>
<translation>ToÄenà šikmých Äar...</translation>
</message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4199"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>Nelze vložit notu. Nebyla vybrána doba trvánà noty</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
@@ -20197,13 +18799,13 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation>UzavÅ™Ãt hlaviÄky stop</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1741"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1742"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1773"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1774"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>OtáÄet koleÄkem kvůli zmÄ›nÄ› Äinné Äásti</qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1743"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1775"/>
<source><qt>Segment: "%1"<br>Track: %2 "%3"</qt></source>
<translation><qt>Část: "%1"<br>Stopa: %2 "%3"</qt></translation>
</message>
@@ -20419,10 +19021,6 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">Pořadà změn výšek tónů</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="129"/>
<source>Preset</source>
<translation>Přednastavit</translation>
@@ -20433,10 +19031,6 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation>Přednastavit:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">Uživatel</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="67"/>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="754"/>
<source>%1 Sequence</source>
@@ -20659,23 +19253,11 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation>http://rosegardenmusic.com/wiki/doc:pitchbendsequencedialog-controllerbranch-en</translation>
</message>
<message>
- <source>User %1</source>
- <translation type="obsolete">Uživatel %1</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="160"/>
<source>Pre Bend</source>
<translation>Před oblouk</translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Hodnota (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Doba trvánà (%):</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="210"/>
<source>Ramp duration (%):</source>
<translation>Doba trvánà stoupánà (%):</translation>
@@ -20696,31 +19278,11 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation>Koncová hodnota (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">Rozkmit poÄátku vibrata (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">Rozkmit konce vibrata (%):</translation>
- </message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="198"/>
<source>Bend Sequence</source>
<translation>PoÅ™adà stoupánÃ</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Délka vlny vibrata:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">RozliÅ¡enÃ:</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="388"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Neplatný Äas konce. Vybral jste nÄ›jaké události?</translation>
@@ -21051,18 +19613,10 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<context>
<name>Rosegarden::ProgressDialog</name>
<message>
- <source>Processing...</source>
- <translation type="obsolete">ProbÃhá zpracovánÃ...</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/ProgressDialog.cpp" line="65"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
- <message>
- <source><qt><h3>Processing...</h3></qt></source>
- <translation type="obsolete"><qt><h3>Zpracovává se...</h3></qt></translation>
- </message>
</context>
<context>
<name>Rosegarden::ProjectPackager</name>
@@ -21128,10 +19682,6 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation><qt><p>Nelze vytvořit seznam se soubory.</p>%1</qt></translation>
</message>
<message>
- <source><qt><p>The <b>flac</b> command was not found.</p><p>FLAC is a lossless audio compression format used to reduce the size of Rosegarden project packages with no loss of audio quality. Please install FLAC and try again. This utility is typically available to most distros as a package called "flac".</p></source>
- <translation type="obsolete"><qt><p>PÅ™Ãkaz <b>flac</b> nebyl nalezen.</p><p>FLAC je formátem pro bezztrátovou kompresi zvuku použÃvaný pro omezenà velikosti balÃků s projekty programu Rosegarden, aniž by doÅ¡lo ke ztrátÄ› kvality. Nainstalujte, prosÃm, FLAC a zkuste to znovu. Tento program je pÅ™Ãtomen ve vÄ›tÅ¡inÄ› distribucà pod názvem "flac".</p></translation>
- </message>
- <message>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="585"/>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="791"/>
<source>Packing project...</source>
@@ -21159,19 +19709,11 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation><qt><p>ZÃskánà a rozluÅ¡tÄ›nà souborů se nezdaÅ™ilo. Stav ukonÄenà %1. Provádà se kontrola %2 kvůli řádkům konÄÃcÃm na "exit %1". Může to být užiteÄné pÅ™i hledánà a nalézánà pÅ™ÃÄin potÞÃ.</p>%3</qt></translation>
</message>
<message>
- <source><qt><p>Fatal error.</p><p>Processing aborted.</p></qt></source>
- <translation type="obsolete"><qt><p>NepÅ™Ãjemná chyba.</p><p>Provedenà zruÅ¡eno.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="127"/>
<source>Rosegarden - Fatal Processing Error</source>
<translation>Rosegarden - NepÅ™Ãjemná chyba pÅ™i provedenÃ</translation>
</message>
<message>
- <source><qt>Could not remove<br>%1<br><br>Processing aborted.</qt></source>
- <translation type="obsolete"><qt><p>Nepodařilo se odstranit</p>%1<p>Provedenà zrušeno.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="661"/>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="707"/>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="775"/>
@@ -21209,10 +19751,6 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation><qt><p>PÅ™Ãkaz <b>wvunpack</b> nebyl nalezen.</p><p>WavPack je formátem pro kompresi zvuku použÃvaný pro omezenà velikosti balÃků s projekty programu Rosegarden, aniž by doÅ¡lo ke ztrátÄ› kvality. Nainstalujte, prosÃm, WavPack a zkuste to znovu. Tento program je pÅ™Ãtomen ve vÄ›tÅ¡inÄ› distribucà pod názvem "wavpack".</p></translation>
</message>
<message>
- <source><qt><p>Could not create temporary working directory.</p><p>Processing aborted.</p></qt></source>
- <translation type="obsolete"><qt><p>NepodaÅ™ilo se vytvoÅ™it doÄasný pracovnà adresář</p><p>Provedenà zruÅ¡eno.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="625"/>
<source>Copying audio files...</source>
<translation>ProbÃhá kopÃrovánà zvukových souborů...</translation>
@@ -21245,44 +19783,16 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation>ProbÃhá kopÃrovánà dat pÅ™Ãdavného modulu a dalÅ¡Ãch souborů...</translation>
</message>
<message>
- <source><qt><p>Unable to write to temporary backend processing script %1.</p><p>Processing aborted.</p></qt></source>
- <translation type="obsolete"><qt><p>Nelze zapisovat do doÄasného skriptu %1.</p><p>Zpracovánà zruÅ¡eno.</p></qt></translation>
- </message>
- <message>
- <source><qt><p>Encoding and compressing files failed with exit status %1. Checking %2 for the line that ends with "exit %1" may be useful for diagnostic purposes.</p><p>Processing aborted.</p></qt></source>
- <translation type="obsolete"><qt><p>Zakódovánà a komprese souborů se nezdaÅ™ila. Stav ukonÄenà %1. Provádà se kontrola %2 kvůli řádkům konÄÃcÃm na "exit %1". Může to být užiteÄné pÅ™i hledánà a nalézánà pÅ™ÃÄin potÞÃ.</p><p>Zpracovánà zruÅ¡eno.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="934"/>
<source><qt><p>Unable to obtain list of files using tar.</p><p>Process exited with status code %1</p></qt></source>
<translation><qt><p>Nelze zÃskat seznam souborů použÃvajÃcÃch tar.</p><p>Proces byl ukonÄen s kódem stavu %1</p></qt></translation>
</message>
<message>
- <source><qt><p>Unable to read to temporary file list.</p><p>Processing aborted.</p></qt></source>
- <translation type="obsolete"><qt><p>Nelze ÄÃst ze seznamu s doÄasnými soubory.</p><p>Provedenà zruÅ¡eno.</p></qt></translation>
- </message>
- <message>
- <source><qt><p>Extracting and decoding files failed with exit status %1. Checking %2 for the line that ends with "exit %1" may be useful for diagnostic purposes.</p><p>Processing aborted.</p></qt></source>
- <translation type="obsolete"><qt><p>ZÃskánà a rozluÅ¡tÄ›nà souborů se nezdaÅ™ilo. Stav ukonÄenà %1. Provádà se kontrola %2 kvůli řádkům konÄÃcÃm na "exit %1". Může to být užiteÄné pÅ™i hledánà a nalézánà pÅ™ÃÄin potÞÃ.</p><p>Zpracovánà zruÅ¡eno.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="895"/>
<source>Unpacking project...</source>
<translation>Rozbaluje se projekt...</translation>
</message>
<message>
- <source><qt><p>Unable to read %1.</p><p>Processing aborted.</p></qt></source>
- <translation type="obsolete"><qt><p>Nelze ÄÃst %1.</p><p>Provedenà zruÅ¡eno.</p></qt></translation>
- </message>
- <message>
- <source><qt><p>Could not write<br>%1.</p><p>Processing aborted.</p></qt></source>
- <translation type="obsolete"><qt><p>Nepodařilo se zapsat</p>%1<p>Provedenà zrušeno.</p></qt></translation>
- </message>
- <message>
- <source><qt><p>Could not remove<br>%1.</p><p>Processing aborted.</p></qt></source>
- <translation type="obsolete"><qt><p>Nepodařilo se odstranit</p>%1<p>Provedenà zrušeno.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/general/ProjectPackager.cpp" line="989"/>
<source><qt><p>It appears that you have already unpacked this project package.</p><p>Would you like to load %1 now?</p></qt></source>
<translation><qt><p>Vypadá to na to, že jste již tento balÃk s projektem rozbalil.</p><p>Chcete nynà nahrát %1?</p></qt></translation>
@@ -21299,23 +19809,12 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">Ovládacà prvek %1</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="36"/>
<source>Quantize</source>
<translation>Kvantizovat</translation>
</message>
- <message>
- <source>Advanced</source>
- <translation type="obsolete">RozÅ¡ÃÅ™ené možnosti</translation>
- </message>
</context>
<context>
<name>Rosegarden::QuantizeParameters</name>
@@ -21397,7 +19896,7 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
</message>
<message>
<location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="109"/>
- <location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="249"/>
+ <location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="227"/>
<source>None</source>
<translation>Žádný</translation>
</message>
@@ -21447,10 +19946,6 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation>Po kvantizaci</translation>
</message>
<message>
- <source>Show advanced options</source>
- <translation type="obsolete">Zobrazit rozÅ¡ÃÅ™ené možnosti</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="152"/>
<source>Re-beam</source>
<translation>Znovu upravit trámce</translation>
@@ -21471,18 +19966,10 @@ UjistÄ›te se, že je zaÅ™Ãzenà správnÄ› nastaveno v dialogu Správa zaÅ™Ãzen
<translation>RozdÄ›lit-a-svázat ligaturou pÅ™ekrývajÃcà se akordy</translation>
</message>
<message>
- <location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="255"/>
+ <location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="233"/>
<source>Full quantize</source>
<translation>Úplná kvantizace</translation>
</message>
- <message>
- <source>Show Advanced Options</source>
- <translation type="obsolete">Zobrazit rozÅ¡ÃÅ™ené možnosti</translation>
- </message>
- <message>
- <source>Hide Advanced Options</source>
- <translation type="obsolete">Skrýt rozÅ¡ÃÅ™ené možnosti</translation>
- </message>
</context>
<context>
<name>Rosegarden::RawNoteRuler</name>
@@ -21780,10 +20267,6 @@ Formáty souborů mohou být z tohoto důvodu nesluÄitelné.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <source>Open Directory</source>
- <translation type="obsolete">OtevÅ™Ãt adresář</translation>
- </message>
- <message>
<location filename="../../src/document/RoseXmlHandler.cpp" line="1789"/>
<source>Loading plugins...</source>
<translation>ProbÃhá naÄÃtánà pÅ™Ãdavných modulů...</translation>
@@ -21800,12 +20283,6 @@ Formáty souborů mohou být z tohoto důvodu nesluÄitelné.</translation>
<context>
<name>Rosegarden::RosegardenDocument</name>
<message>
- <source>The current file has been modified.
-Do you want to save it?</source>
- <translation type="obsolete">Aktuálnà soubor byl změněn.
-Chcete jej uložit?</translation>
- </message>
- <message>
<location filename="../../src/document/RosegardenDocument.cpp" line="345"/>
<source>Rosegarden - Warning</source>
<translation>Rosegarden - VarovánÃ</translation>
@@ -21829,15 +20306,15 @@ Chcete jej uložit?</translation>
<location filename="../../src/document/RosegardenDocument.cpp" line="593"/>
<location filename="../../src/document/RosegardenDocument.cpp" line="638"/>
<location filename="../../src/document/RosegardenDocument.cpp" line="680"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1068"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1716"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1741"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1744"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1781"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1791"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1820"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1833"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2853"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1085"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1743"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1768"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1771"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1808"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1818"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1847"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1860"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2880"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -21923,27 +20400,32 @@ Vyberte kterékoli z těch, které chcete z pevného disku trvale odstranit.
<translation>Připojit</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1201"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1213"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1225"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>NepodaÅ™ilo se vytvoÅ™it doÄasný soubor v adresáři '%1': %2</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1212"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1236"/>
<source>Failure in temporary file handling for file '%1': %2</source>
<translation>Chyba pÅ™i zacházenà s doÄasným souborem '%1': %2</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1230"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1254"/>
<source>Failed to rename temporary output file '%1' to desired output file '%2'</source>
<translation>Chyba pÅ™i pÅ™ejmenovávánà doÄasného výstupnÃho souboru '%1' na požadovaný výstupnà soubor '%2'</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="3048"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="3076"/>
<source>Warning</source>
<translation>UpozornÄ›nÃ</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="3049"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="3077"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -21952,61 +20434,57 @@ Nastavte, prosÃm, platný adresář jako cestu ke zvukovému souboru ve Vlastno
Chcete cestu nastavit nynÃ?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Ukládá se soubor...</translation>
- </message>
- <message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1417"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1444"/>
<source>Error while writing on '%1'</source>
<translation>Chyba při zápisu do '%1'</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1471"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1498"/>
<source>Could not open file '%1' for writing</source>
<translation>NepodaÅ™ilo se otevÅ™Ãt soubor '%1' pro zápis</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1716"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1743"/>
<source>File load cancelled</source>
<translation>NaÄÃtánà souboru bylo zruÅ¡eno</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1741"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1768"/>
<source><h3>Audio and plugins not available</h3><p>This composition uses audio files or plugins, but Rosegarden is currently running without audio because the JACK audio server was not available on startup.</p><p>Please exit Rosegarden, start the JACK audio server and re-start Rosegarden if you wish to load this complete composition.</p><p><b>WARNING:</b> If you re-save this composition, all audio and plugin data and settings in it will be lost.</p></source>
<translation><h3>Zvuk a pÅ™Ãdavné moduly nejsou dostupné.</h3><p>Tato skladba použÃvá zvukové soubory nebo pÅ™Ãdavné moduly, avÅ¡ak program Rosegarden je teÄ spuÅ¡tÄ›na bez podpory zvuku, protože pÅ™i spuÅ¡tÄ›nà nebyl dostupný server JACK.</p><p>UkonÄete program Rosegarden, spusÅ¥te zvukový server JACK a znovuspusÅ¥te Rosegarden, pÅ™ejete-li si naÄÃst tuto úplnou skladbu. </p><p><b>VAROVÃNÃ:</b> Pokud tuto skladbu znovu uložÃte, bude ztracen veÅ¡kerý zvukový obsah i data pÅ™Ãdavných modulů s nastavenÃmi.</p></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1744"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1771"/>
<source><h3>Audio and plugins not available</h3><p>This composition uses audio files or plugins, but you are running a version of Rosegarden that was compiled without audio support.</p><p><b>WARNING:</b> If you re-save this composition from this version of Rosegarden, all audio and plugin data and settings in it will be lost.</p></source>
<translation><h3>Zvuk a pÅ™Ãdavné moduly nejsou dostupné</h3><p>Tato skladba použÃvá zvukové soubory nebo pÅ™Ãdavné moduly, avÅ¡ak vy použÃváte program Rosegarden, která byla sestavena bez podpory zvuku.</p><p><b>VAROVÃNÃ:</b> Pokud tuto skladbu znovu uložÃte, bude ztracen veÅ¡kerý zvukový obsah i data pÅ™Ãdavných modulů s nastavenÃmi.</p></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1781"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1808"/>
<source><h3>Incorrect audio sample rate</h3><p>This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).</p><p>Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.</p><p>Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.</p></source>
<translation><h3>Nesprávný vzorkovacà kmitoÄet zvuku</h3><p>Tato skladba obsahuje zvukové soubory, které byly nahrány nebo zavedeny pomocà zvukového serveru nastaveného na jiný vzorkovacà kmitoÄet (%1 Hz) - odliÅ¡ný od aktuálnÃho vzorkovacÃho kmitoÄtu serveru JACK (%2 Hz).</p><p>Program Rosegarden pÅ™ehraje tuto skladbu správnou rychlostÃ, ale jakékoli zvukové soubory v nà budou pravdÄ›podobnÄ› znÃt velmi nehezky.</p><p> Zvažte, zda nespustit server JACK se správným kmitoÄtem (%3 Hz) a nenaÄÃst tuto skladbu pÅ™ed jakoukoli dalÅ¡Ã pracà s nà znovu.</p></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1791"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1818"/>
<source><h3>Inconsistent audio sample rates</h3><p>This composition contains audio files at more than one sample rate.</p><p>Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.</p><p>Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.</p></source>
<translation><h3>Nedůsledný vzorkovacà kmitoÄet zvuku</h3><p>Tato skladba obsahuje zvukové soubory, které majà vÃce vzorkovacÃch kmitoÄtů.</p><p>Program Rosegarden je pÅ™ehraje správnou rychlostÃ, ale jakékoli zvukové soubory nahrané nebo zavedené s odliÅ¡nými kmitoÄty, než je souÄasný vzorkovacà kmitoÄet serveru JACK (%1 Hz), budou pravdÄ›podobnÄ› znÃt velmi nehezky.</p><p>VÃce informacà naleznete v dialogu správce zvukových souborů. Zvažte také možnost pÅ™evzorkovánà vÅ¡ech souborů, které majà nynà chybný kmitoÄet.</p></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1792"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1819"/>
<source>Inconsistent sample rates</source>
<translation>Nedůsledné vzorkovacà kmitoÄty</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1806"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1833"/>
<source><h3>Plugins not found</h3><p>The following audio plugins could not be loaded:</p><ul></source>
<translation><h3>PÅ™Ãdavné moduly nenalezeny</h3><p>NásledujÃcà pÅ™Ãdavné moduly nebylo možné naÄÃst: </p><ul></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1814"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1841"/>
<source><li>%1 (from %2)</li></source>
<translation><li>%1 (od %2)</li></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1828"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1855"/>
<source>This file contains one or more old element types that are now deprecated.
Support for these elements may disappear in future versions of Rosegarden.
We recommend you re-save this file from this version of Rosegarden to ensure that it can still be re-loaded in future versions.</source>
@@ -22015,22 +20493,18 @@ Podpora tÄ›chto prvků nemusà být v budoucÃch verzÃch programu Rosegarden do
DoporuÄujeme, abyste znovu uložili tento soubor v této verzi programu Rosegarden a zajistili si tak možnost naÄÃst jej v budoucÃch verzÃch.</translation>
</message>
<message>
- <source><qt><h2>Channels were remapped</h2><p>Beginning with version 10.02, Rosegarden no longer provides controls for changing the channel associated with each MIDI instrument. Instead, each instrument uses the same channel as its instrument number. For example, "MIDI Input System Device #12" always uses channel 12.</p><p>The file you just loaded contained instruments whose channels differed from the instrument numbers. These channels have been reassigned so that instrument #1 will always use channel 1, regardless of what channel it might have used previously. In most cases, you will experience no difference, but you may have to make some small changes to this file in order for it to play as intended. We recommend that you save this file in order to avoid seeing this warning in the future.</p><p>We apologize for any inconvenience.</p></qt></source>
- <translation type="obsolete"><qt><h2>Kanály byly vyznaÄeny znovu</h2><p>PoÄÃnaje verzà 10.02 Rosegarden nadále neposkytuje ovládacà prvky pro zmÄ›nu kanálu sdruženého s každým nástrojem MIDI. NamÃsto toho použÃvá každý nástroj tentýž kanál jako své ÄÃslo nástroje. NapÅ™Ãklad "MIDI vstupnà systémové zaÅ™Ãzenà 12" vždy použÃvá kanál 12.</p><p>Soubor, který jste pouze nahrál, obsahoval nástroje, jejichž kanály se liÅ¡ily od ÄÃsel nástrojů. tyto kanály byly znovu pÅ™iÅ™azeny, takže nástroj #1 bude vždy použÃvat kanál 1, bez ohledu na to, jaký kanál použÃval pÅ™edtÃm. Ve vÄ›tÅ¡inÄ› pÅ™Ãpadů, nezažijete žádný rozdÃl, ale možná musÃte s tÃmto souborem udÄ›lat nÄ›jaké malé zmÄ›ny, aby hrál tak, jak je zamýšleno. DoporuÄujeme, abyste tento soubor uložil, a tak se vyhnul pohledu na toto varovánà v budoucnosti.</p><p>Omlouváme se za jakékoli nepohodlÃ.</p></qt></translation>
- </message>
- <message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2478"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2505"/>
<source>Insert Recorded MIDI</source>
<translation>Vložit zaznamenané MIDI</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2605"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2689"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2632"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2716"/>
<source>(recorded)</source>
<translation>(nahráno)</translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2838"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2865"/>
<source>Generating audio preview...</source>
<translation>ProbÃhá vytvářenà náhledu na zvuk...</translation>
</message>
@@ -22038,93 +20512,79 @@ DoporuÄujeme, abyste znovu uložili tento soubor v této verzi programu Rosegar
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <source>No non-audio segments in composition</source>
- <translation type="obsolete">Ve skladbÄ› nejsou žádné nezvukové Äásti</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>VýbÄ›r musà obsahovat pouze zvukové nebo nezvukové Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="303"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="403"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="739"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="778"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="919"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="996"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1760"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1763"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1824"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1830"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1849"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="292"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="392"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="728"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="767"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="908"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="985"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1742"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1745"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1806"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1812"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1831"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="403"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="551"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="739"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="778"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="919"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="392"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="540"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="728"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="767"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="908"/>
<source>No non-audio segments selected</source>
<translation>Nebyly vybrány žádné nezvukové Äásti</translation>
</message>
<message>
- <source>You've not yet defined an audio editor for Rosegarden to use.
-See Settings -> Configure Rosegarden -> Audio.</source>
- <translation type="obsolete">Dosud jste nestanovil zvukový editor, který má aplikace Rosegarden použÃt.
-Viz Nastavenà -> Nastavenà aplikace Rosegarden -> Zvuk.</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="997"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="986"/>
<source>You've not yet defined an audio editor for Rosegarden to use.
See Edit -> Preferences -> Audio.</source>
<translation>Dosud jste nestanovil zvukový editor, který má program Rosegarden použÃt.
PodÃvejte se na Úpravy -> Nastavenà -> Zvuk.</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">ProbÃhá zavedenà vzdáleného zvukového souboru</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="558"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="547"/>
<source>Pitch Tracker can only contain 1 segment.</source>
<translation>Sledovánà výšky tónu může obsahovat pouze jednu Äást.</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1761"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1743"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation>Nelze přidat upuštěný soubor. Zvukový server JACK nenà dostupný.</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1764"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1746"/>
<source>Cannot add dropped file. This version of rosegarden was not built with audio support.</source>
<translation>Nelze přidat upuštěný soubor. Tato verze Rosegardenu nebyla sestavena s podporou pro zvuk.</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1792"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1774"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>probÃhá zavádÄ›nà zvukového souboru, který je tÅ™eba pÅ™evést a pÅ™evzorkovat</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1802"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1784"/>
<source>Adding audio file...</source>
<translation>ProbÃhá pÅ™idánà zvukového souboru...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1823"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1829"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1805"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1811"/>
<source>Can't add dropped file. </source>
<translation>Nelze přidat vyřazený soubor. </translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1836"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1818"/>
<source>Generating audio preview...</source>
<translation>ProbÃhá vytvářenà náhledu na zvuk...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1848"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1830"/>
<source>Try copying this file to a directory where you have write permission and re-add it</source>
<translation>Zkuste zkopÃrovat tento soubor do adresáře, ve kterém máte oprávnÄ›nà k zápisu,a vyzkouÅ¡ejte jej pÅ™idat znovu</translation>
</message>
@@ -22162,280 +20622,260 @@ PodÃvejte se na Úpravy -> Nastavenà -> Zvuk.</translation>
<translation>Spouštà se...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1018"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1006"/>
<source> Zoom: </source>
<translation> ZvÄ›tÅ¡enÃ: </translation>
</message>
<message>
- <source>status</source>
- <translation type="obsolete">stav</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1161"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1335"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1826"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2297"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1145"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1316"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1830"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2301"/>
<source>%1 - %2</source>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1523"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1527"/>
<source>File "%1" does not exist</source>
<translation>Soubor "%1" neexistuje</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1528"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1532"/>
<source>File "%1" is actually a directory</source>
<translation>Soubor "%1" je vlastně adresář</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1536"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1540"/>
<source>You do not have read permission for "%1"</source>
<translation>Nemáte oprávnÄ›nà ke Ätenà pro "%1"</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1626"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1630"/>
<source>An auto-save file for this document has been found
Do you want to open it instead ?</source>
<translation>Pro tento dokument byl nalezen automaticky uložený soubor
Chcete jej otevÅ™Ãt?</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1773"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6588"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1777"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6581"/>
<source>Untitled</source>
<translation>Bez názvu</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1786"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2120"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2286"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1790"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2124"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2290"/>
<source>Could not save document at %1
Error was : %2</source>
<translation>Nepodařilo se uložit dokument v %1
Chyba byla: %2</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1788"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2123"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2289"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1792"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2127"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2293"/>
<source>Could not save document at %1</source>
<translation>Nepodařilo se uložit dokument v %1</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1854"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1858"/>
<source>Opening a new application window...</source>
<translation>OtevÃrá se nové aplikaÄnà okno...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1865"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1869"/>
<source>Creating new document...</source>
<translation>Vytvářà se nový dokument...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1931"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1935"/>
<source>Malformed URL
%1</source>
<translation>Chybně formulovaná adresa URL
%1</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1980"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2086"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1984"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2090"/>
<source>Opening file...</source>
<translation>OtevÃrá se soubor...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2007"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8277"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2011"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8227"/>
<source>All supported files</source>
<translation>Všechny podporované soubory</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2008"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2042"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2257"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2012"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2046"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2261"/>
<source>Rosegarden files</source>
<translation>Soubory programu Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2009"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3958"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3994"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2013"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3962"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3998"/>
<source>MIDI files</source>
<translation>Soubory MIDI</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2010"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2043"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2263"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3907"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3959"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3995"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4263"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4299"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4506"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4542"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5187"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5226"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5265"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5299"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5333"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5446"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8278"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2014"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2047"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2267"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3911"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3963"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3999"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4261"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4297"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4504"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4540"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5185"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5224"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5258"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5292"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5326"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5439"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8228"/>
<source>All files</source>
<translation>VÅ¡echny soubory</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2006"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2041"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2010"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2045"/>
<source>Open File</source>
<translation>OtevÅ™Ãt soubor</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="945"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="934"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1895"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1899"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1951"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2061"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3924"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3976"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4012"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4280"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4316"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4523"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4559"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8291"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1955"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2065"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3928"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3980"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4016"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4278"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4314"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4521"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4557"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8241"/>
<source>Cannot open file %1</source>
<translation>Nelze otevÅ™Ãt soubor %1</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2103"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2107"/>
<source>Saving file...</source>
<translation>Ukládá se soubor...</translation>
</message>
<message>
- <source>Save File</source>
- <translation type="obsolete">Uložit soubor</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2214"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2218"/>
<source><qt>Sorry.<br>"%1" is not a valid filename.</qt></source>
<translation><qt>Promiňte.<br>"%1" nenà platným souborovým názvem.</qt></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2222"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2226"/>
<source>You have specified a folder/directory.</source>
<translation>Zadal jste složku/adresář.</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2230"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2234"/>
<source>The specified file exists. Overwrite?</source>
<translation>Zadaný soubor již existuje. Chcete jej přepsat?</translation>
</message>
<message>
- <source>Saving file%1with a new filename...</source>
- <translation type="obsolete">ProbÃhá ukládánà souboru %1 pod novým názvem...</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2257"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2261"/>
<source>Rosegarden templates</source>
<translation>Předlohy programu Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2263"/>
<source>Save as template...</source>
<translation>Uložit jako předlohu...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2263"/>
<source>Save as...</source>
<translation>Uložit jako...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2313"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2317"/>
<source>Closing file...</source>
<translation>ZavÃrá se soubor...</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">ProbÃhá tisk...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Náhled...</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2326"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2330"/>
<source>Exiting...</source>
<translation>ProbÃhá ukonÄenÃ...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2338"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2342"/>
<source>Cutting selection...</source>
<translation>ProbÃhá vyjmutà výbÄ›ru...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2350"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2354"/>
<source>Copying selection to clipboard...</source>
<translation>ProbÃhá kopÃrovánà výbÄ›ru do schránky...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2361"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2365"/>
<source>Clipboard is empty</source>
<translation>Schránka je prázdná</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2364"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2368"/>
<source>Inserting clipboard contents...</source>
<translation>ProbÃhá vkládánà obsahu schránky...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2463"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2467"/>
<source>Duration of empty range to insert</source>
<translation>Doba trvánà prázdného úseku k vloženÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2567"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2584"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2571"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2588"/>
<source>This function needs no more than one segment to be selected.</source>
<translation>Tato funkce nevyžaduje výbÄ›r vÃce než jedné Äásti.</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2608"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2612"/>
<source>Can't join Audio segments</source>
<translation>Nelze spojit zvukové Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2694"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2698"/>
<source>rescaling an audio file</source>
<translation>probÃhá zmÄ›na délky zvukového souboru</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2712"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2716"/>
<source>Rescaling audio file...</source>
<translation>ProbÃhá zmÄ›na délky zvukového souboru...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2730"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2734"/>
<source>Generating audio preview...</source>
<translation>ProbÃhá vytvářenà náhledu na zvuk...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2763"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5602"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2767"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5595"/>
<source>Warning</source>
<translation>UpozornÄ›nÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2764"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2768"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -22444,13 +20884,13 @@ Nastavte platný adresář jako cestu ke zvukovému souboru ve Vlastnostech doku
Chcete cestu nastavit nynÃ?</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2835"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2839"/>
<source>Jog Selection</source>
<translation>Krokový posun výběru</translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2979"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3013"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2983"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3017"/>
<source>Split %n Segment(s) at Time</source>
<translation>
<numerusform>RozdÄ›lit Äást v Äase</numerusform>
@@ -22459,86 +20899,86 @@ Chcete cestu nastavit nynÃ?</translation>
</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3132"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3136"/>
<source>Segment Start Time</source>
<translation>PoÄáteÄnà Äas Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3079"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3142"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3083"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3146"/>
<source>Set Segment Start Times</source>
<translation>Nastavit poÄáteÄnà Äasy ÄástÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3080"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3143"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3084"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3147"/>
<source>Set Segment Start Time</source>
<translation>Nastavit poÄáteÄnà Äas Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3176"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3180"/>
<source>Segment Duration</source>
<translation>Doba trvánà Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3189"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3193"/>
<source>Set Segment Durations</source>
<translation>Nastavit doby trvánà ÄástÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3190"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3194"/>
<source>Set Segment Duration</source>
<translation>Nastavit dobu trvánà Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3301"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6243"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3305"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6236"/>
<source>Set Global Tempo</source>
<translation>Nastavit celkové tempo</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3374"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3378"/>
<source>Toggle the toolbar...</source>
<translation>Přepnout nástrojový pruh...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3385"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3389"/>
<source>Toggle the tools toolbar...</source>
<translation>PÅ™epnout nástrojový pruh ovládacÃch nástrojů...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3396"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3400"/>
<source>Toggle the tracks toolbar...</source>
<translation>Přepnout nástrojový pruh pro stopy...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3407"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3411"/>
<source>Toggle the editor toolbar...</source>
<translation>Přepnout nástrojový pruh pro editor...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3418"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3422"/>
<source>Toggle the transport toolbar...</source>
<translation>Přepnout nástrojový pruh pro přesun...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3429"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3433"/>
<source>Toggle the zoom toolbar...</source>
<translation>PÅ™epnout nástrojový pruh pro zvÄ›tÅ¡enÃ...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3440"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3459"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3444"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3463"/>
<source>Toggle the Transport</source>
<translation>Přepnout přesun</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3574"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3578"/>
<source>Toggle the statusbar...</source>
<translation>Přepnout stavový řádek...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3642"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3646"/>
<source>The join tool isn't implemented yet. Instead please highlight the segments you want to join and then use the menu option:
Segments->Collapse Segments.
@@ -22549,242 +20989,174 @@ Chcete cestu nastavit nynÃ?</translation>
</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3645"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3649"/>
<source>Join tool not yet implemented</source>
<translation>Nástroj pro spojovánà nebyl dosud proveden</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3886"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3890"/>
<source>Revert modified document to previous saved version?</source>
<translation>Chcete vrátit upravené dokumenty do stavu předešlých uložených verz�</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3905"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3909"/>
<source>Import Rosegarden Project File</source>
<translation>Zavést soubor projektu programu Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3906"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5186"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3910"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5184"/>
<source>Rosegarden Project files</source>
<translation>Soubory s projekty programu Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6594"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6587"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation><qt><p>PÅ™edtÃm, než zaÄnete s nahrávánÃm zvuku, musÃte pro tuto skladbu vybrat souborový název.</p><p>Zvukové soubory budou ukládány do <b>%1</b> jako <b>rg-[<i>název souboru</i>]-[<i>nástroj</i>]-<i>datum</i>_<i>Äas</i>-<i>n</i>.wav</b>. PÅ™ed zaÄátkem nahrávánà můžete stejnÄ› tak pÅ™ejmenovat zvukové nástroje. PodÃvejte se, prosÃm, kvůli vÃce informacÃm na <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6899"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6892"/>
<source>Input</source>
<translation>Vstup</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8032"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8002"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-en</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1226"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1538"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1625"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1786"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1788"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1933"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1951"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2061"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2120"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2123"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2213"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2221"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2229"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2286"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2289"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2567"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2584"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2608"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2633"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3018"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3044"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3885"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3924"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3976"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4012"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4134"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4280"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4316"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4351"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4523"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4559"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4594"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4911"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5167"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5171"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5207"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5253"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5287"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5321"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5387"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5429"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5477"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5594"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5616"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5641"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5654"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5676"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5734"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5736"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5770"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6590"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6686"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6808"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6821"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8059"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8218"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8236"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8239"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8249"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8291"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1207"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1542"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1629"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1790"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1792"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1937"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1955"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2065"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2124"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2127"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2217"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2225"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2233"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2290"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2293"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2571"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2588"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2612"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2637"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3022"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3048"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3889"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3928"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3980"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4016"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4135"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4278"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4314"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4349"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4521"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4557"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4592"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4909"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5165"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5169"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5205"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5246"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5280"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5314"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5380"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5422"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5470"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5587"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5609"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5634"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5647"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5669"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5727"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5729"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5763"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6583"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6679"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6801"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6814"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8029"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8168"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8186"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8189"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8199"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8241"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8039"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8009"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8543"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8493"/>
<source><h3>Newer version available</h3></source>
<translation><h3>Je dostupná novějšà verze</h3></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8544"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8494"/>
<source><p>You are using version %1. Version %2 is now available.</p><p>Please consult the <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Rosegarden website</a> for more information.</p></source>
<translation><p>PoužÃváte verzi %1. Verze %2 je nynà dostupná.</p><p>PoraÄte se, prosÃm, s <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">stránkami programu Rosegarden </a> kvůli dalÅ¡Ãm informacÃm.</p></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3957"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3961"/>
<source>Open MIDI File</source>
<translation>OtevÅ™Ãt soubor MIDI</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3993"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3997"/>
<source>Merge MIDI File</source>
<translation>Připojit soubor MIDI</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4120"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4121"/>
<source>Importing MIDI file...</source>
<translation>ProbÃhá zavedenà souboru MIDI...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4159"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4157"/>
<source>Calculating notation...</source>
<translation>ProbÃhá výpoÄet notového zápisu...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4212"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4210"/>
<source>Calculate Notation</source>
<translation>VypoÄÃtat notový zápis</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4261"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4297"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4295"/>
<source>Open X11 Rosegarden File</source>
<translation>OtevÅ™Ãt soubor programu Rosegarden X 11</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4262"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4298"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4260"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4296"/>
<source>X11 Rosegarden files</source>
<translation>Soubory programu Rosegarden X11</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4331"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4329"/>
<source>Importing X11 Rosegarden file...</source>
<translation>Zavádà se soubor Rosegarden X11...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4352"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4350"/>
<source>Can't load X11 Rosegarden file. It appears to be corrupted.</source>
<translation>Nelze nahrát soubor programu Rosegarden X 11. Vypadá to, že je poškozen.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">OtevÅ™Ãt soubor Hydrogen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">ProbÃhá zavedenà souboru Hydrogen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Nelze nahrát soubor Hydrogen. Zdá se, že je poškozený.</translation>
- </message>
- <message>
- <source>Export and import of Rosegarden Project files</source>
- <translation type="obsolete">Export a import souborů projektu aplikace Rosegarden</translation>
- </message>
- <message>
- <source>The Rosegarden Project Packager helper script</source>
- <translation type="obsolete">Skript pomocnÃka balÃÄkovaÄe Rosegarden Project Packager</translation>
- </message>
- <message>
- <source>%1 - for project file support</source>
- <translation type="obsolete">%1 - pro podporu projektového souboru</translation>
- </message>
- <message>
- <source>Notation previews through LilyPond</source>
- <translation type="obsolete">Náhled s aplikacà Lily&Pond...</translation>
- </message>
- <message>
- <source>The Rosegarden LilyPondView helper script</source>
- <translation type="obsolete">Skript pomocnÃka prohlÞeÄe Rosegarden LilyPondView</translation>
- </message>
- <message>
- <source>%1 - for LilyPond preview support</source>
- <translation type="obsolete">%1 - pro podporu náhledů pro aplikaci LilyPond</translation>
- </message>
- <message>
- <source>The Rosegarden Audio File Importer helper script</source>
- <translation type="obsolete">Skript pomocnÃka importu zvukového souboru Rosegarden</translation>
- </message>
- <message>
- <source>%1 - for audio file import</source>
- <translation type="obsolete">%1 - pro import zvukového souboru</translation>
- </message>
- <message>
- <source><h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features. The following features will not be available:</p></source>
- <translation type="obsolete"><h3>Programy pomocnÃků nebyly nalezeny</h3><p>Aplikace Rosegarden nenalezla jeden nebo vÃce programů pomocnÃků, které potÅ™ebuje k nÄ›kterým funkcÃm. NásledujÃcà funkce proto nebudou dostupné:</p></translation>
- </message>
- <message>
- <source><ul></source>
- <translation type="obsolete"><ul></translation>
- </message>
- <message>
- <source><li>%1</li></source>
- <translation type="obsolete"><li>%1</li></translation>
- </message>
- <message>
- <source></ul></source>
- <translation type="obsolete"></ul></translation>
- </message>
- <message>
- <source><p>To fix this, you should install the following additional programs:</p></source>
- <translation type="obsolete"><p>K napravenà tohoto stavu byste mÄ›li nainstalovat dodateÄné programy:</p></translation>
- </message>
- <message>
- <source>Helper programs not found</source>
- <translation type="obsolete">Programy pomocnÃků nebyly nalezeny</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5387"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5380"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>NepodaÅ™ilo se otevÅ™Ãt doÄasný soubor pro vyvedenà z LilyPondu.</p><p>PravdÄ›podobnÄ› to znamená, že ukládacà prostor na disku <pre>%1</pre>je zcela zaplnÄ›n.</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5167"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5165"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>Proces sekvenceru programu Rosegarden byl neÄekanÄ› ukonÄen. Zvuk a záznam nebude pro toto sezenà dostupný.
@@ -22796,185 +21168,185 @@ Chcete-li obnovit funkci zvuku, ukonÄete a znovu spusÅ¥te program Rosegarden.</
<translation>Spouštà se sekvencer...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2253"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2257"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>ProbÃhá ukládánà souboru %1 pod novým názvem...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2255"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2259"/>
<source> as a template </source>
<translation> jako předloha </translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2634"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2638"/>
<source>Can't expand Audio segments with figuration</source>
<translation>Nelze rozbalit Äásti se zvukem s figuracÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3019"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3023"/>
<source>Split time is not within a selected segment.
No segment will be split.</source>
<translation>ÄŒas rozdÄ›lenà nenà uvnitÅ™ vybrané Äásti.
Nebude rozdÄ›lena žádná Äást.</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3045"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3049"/>
<source><qt><p>In order to create anacrusis, at least one of the segments in your selection must start at the beginning of the composition.</p></qt></source>
<translation><qt><p>Pro vytvoÅ™enà pÅ™edtaktà misà alespoň jedna Äást ve vaÅ¡em výbÄ›ru zaÄÃnat na zaÄátku skladby.</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3054"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3058"/>
<source>Anacrusis Amount</source>
<translation>Množstvà pÅ™edtaktÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3069"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3073"/>
<source>Create Anacrusis</source>
<translation>VytvoÅ™it pÅ™edtaktÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3099"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3103"/>
<source>Insert Corrected Tempo and Time Signature</source>
<translation>Vložit opravené tempo a taktové oznaÄenÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3110"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3114"/>
<source>Remove Original Tempo and Time Signature</source>
<translation>Odstranit původnà tempo a taktové oznaÄenÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4504"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4540"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4502"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4538"/>
<source>Open MusicXML File</source>
<translation>OtevÅ™Ãt soubor MusicXML</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4574"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4572"/>
<source>Importing MusicXML file...</source>
<translation>Zavádà se soubor MusicXML...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4595"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4593"/>
<source>Can't load MusicXML file:
</source>
<translation>Nelze zavést soubor MusicXML:
</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5171"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5169"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation>Sekvencer programu Rosegarden nebylo možné spustit. Zvuk a záznam tedy nebude pro toto sezenà dostupný.
Informace o správném nastavenà zvuku a MIDI naleznete na adrese http://rosegardenmusic.com.</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5183"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5181"/>
<source>Exporting Rosegarden Project file...</source>
<translation>Vyvádà se soubor s projektem programu Rosegarden...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5188"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5227"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5266"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5300"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5334"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5447"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5186"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5225"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5293"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5327"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5440"/>
<source>Export as...</source>
<translation>Vyvést jako...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5207"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5205"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Ukládánà souboru programu Rosegarden do balÃku selhalo: %1</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5222"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5238"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5220"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5236"/>
<source>Exporting MIDI file...</source>
<translation>ProbÃhá vyvedenà souboru MIDI...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5225"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5223"/>
<source>Standard MIDI files</source>
<translation>Běžné soubory MIDI</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5253"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5287"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5321"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5477"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5246"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5280"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5314"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5470"/>
<source>Export failed. The file could not be opened for writing.</source>
<translation>Vyvedenà se nepodaÅ™ilo. Soubor nebylo možné otevÅ™Ãt pro zápis.</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5261"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5277"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5254"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5270"/>
<source>Exporting Csound score file...</source>
<translation>ProbÃhá vyvedenà souboru s notovým zápisem pro Csound...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5264"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5257"/>
<source>Csound files</source>
<translation>Soubory Csound</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5295"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5310"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5288"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5303"/>
<source>Exporting Mup file...</source>
<translation>ProbÃhá vyvedenà souboru Mup...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5298"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5291"/>
<source>Mup files</source>
<translation>Soubory Mup</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5329"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5414"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5322"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5407"/>
<source>Exporting LilyPond file...</source>
<translation>ProbÃhá vyvedenà souboru programu LilyPond...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5332"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5325"/>
<source>LilyPond files</source>
<translation>Soubory programu LilyPond</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5346"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5339"/>
<source>Printing with LilyPond...</source>
<translation>ProbÃhá tisk s LilyPondem...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5362"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5355"/>
<source>Previewing LilyPond file...</source>
<translation>Zobrazuje se náhled na soubor programu LilyPond...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5405"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5398"/>
<source>LilyPond Preview Options</source>
<translation>Možnosti zobrazenà náhledu pro program LilyPond</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5406"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5399"/>
<source>LilyPond preview options</source>
<translation>Možnosti zobrazenà náhledu pro program LilyPond</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5442"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5463"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5435"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5456"/>
<source>Exporting MusicXML file...</source>
<translation>ProbÃhá vyvedenà souboru MusicXML...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4505"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4541"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5445"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4503"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4539"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5438"/>
<source>XML files</source>
<translation>Soubory XML</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5603"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5596"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -22983,12 +21355,12 @@ Nastavte platný adresář jako cestu ke zvukovému souboru ve Vlastnostech doku
Chcete cestu nastavit nynÃ?</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5644"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5637"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5645"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5638"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before you start to record audio.
Would you like to set it now?</source>
@@ -22997,153 +21369,149 @@ Nastavte platný adresář jako cestu ke zvukovému souboru ve Vlastnostech doku
Chcete cestu nastavit nynÃ?</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6147"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6140"/>
<source>Move playback pointer to time</source>
<translation>Přesunout ukazatel přehrávánà na dobu</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6161"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6154"/>
<source>%1%</source>
<translation>%1%</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6229"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6222"/>
<source>Replace Tempo Change at %1</source>
<translation>Nahradit zmÄ›nu tempa na mÃstÄ› %1</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6252"/>
<source>Set Global and Default Tempo</source>
<translation>Nastavit celkové a výchozà tempo</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6282"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6275"/>
<source>Move Tempo Change</source>
<translation>Přesunout změnu tempa</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6317"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6310"/>
<source>new marker</source>
<translation>nová znaÄka</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6318"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6311"/>
<source>no description</source>
<translation>bez popisu</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6808"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6801"/>
<source>Sequencer failed to add audio file %1</source>
<translation>Sekvenceru se nepodařilo přidat zvukový soubor %1</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6821"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6814"/>
<source>Sequencer failed to remove audio file id %1</source>
<translation>Sekvenceru se nepodařilo odebrat id zvukového souboru %1</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6882"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6875"/>
<source>Modify Segment label</source>
<translation>Upravit oznaÄenà Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6884"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6877"/>
<source>Modify Segments label</source>
<translation>Upravit oznaÄenà ÄástÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6886"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6879"/>
<source>Relabelling selection...</source>
<translation>ProbÃhá zmÄ›na oznaÄenà výbÄ›ru...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6899"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6892"/>
<source>Enter new label</source>
<translation>Zadat nové oznaÄenÃ</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="7995"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="7965"/>
<source>Play List</source>
<translation>Seznam pÅ™ehrávánÃ</translation>
</message>
<message>
- <source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
- <translation type="obsolete">http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8046"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8016"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8164"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8114"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>ProbÃhá Å™azenà nouzových událostà MIDI do Å™ady pro pÅ™enos...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8218"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8168"/>
<source>Are you sure you want to save this as your default studio?</source>
<translation>SkuteÄnÄ› chcete toto uložit jako svoje výchozà studio?</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8224"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8174"/>
<source>Saving current document as default studio...</source>
<translation>ProbÃhá ukládánà souÄasného dokumentu jako výchozÃho studia...</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8236"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8186"/>
<source>Could not auto-save document at %1
Error was : %2</source>
<translation>Nepodařilo se automaticky uložit dokument v %1
Chyba byla: %2</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8239"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8189"/>
<source>Could not auto-save document at %1</source>
<translation>Nepodařilo se automaticky uložit dokument pod %1</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8249"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8199"/>
<source>Are you sure you want to import your default studio and lose the current one?</source>
<translation>SkuteÄnÄ› chcete zavést svoje výchozà studio a ztratit to nynÄ›jÅ¡Ã?</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8276"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8226"/>
<source>Import Studio from File</source>
<translation>Zavést studio ze souboru</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8325"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8275"/>
<source>Import Studio</source>
<translation>Zavést studio</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8654"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8604"/>
<source><h3>Invalid audio path</h3></source>
<translation><h3>Neplatná cesta ke zvuku</h3></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8655"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8605"/>
<source><p>You will not be able to record audio or drag and drop audio files onto Rosegarden until you correct this in <b>View -> Document Properties -> Audio</b>.</p></source>
<translation><p>Nebudete moci nahrávat zvuk nebo táhnout a upouÅ¡tÄ›t zvukové soubory na Rosegarden, dokud to neopravÃte v <b>Pohled -> Vlastnosti dokumentu -> Zvuk</b>.</p></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8659"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8609"/>
<source><h3>Created audio path</h3></source>
<translation><h3>Vytvořena cesta ke zvuku</h3></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8660"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8610"/>
<source><qt><p>Rosegarden created the audio path "%1" to use for audio recording, and to receive dropped audio files.</p><p>If you wish to use a different path, change this in <b>View -> Document Properties -> Audio</b>.</p></qt></source>
<translation><qt><p>Rosegarden vytvoÅ™il cestu ke zvuku "%1" k použità pro nahrávánà zvuku, a pro pÅ™ijÃmánà upuÅ¡tÄ›ných zvukových souborů.</p><p>Pokud byste si přál použÃvat jinou cestu, zmÄ›nu proveÄte v <b>Pohled -> Vlastnosti dokumentu -> Zvuk</b>.</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8666"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8616"/>
<source><qt><p>The audio path "%1" did not exist, and could not be created.</p>%2</qt></source>
<translation><qt><p>Cesta ke zvuku "%1" neexistovala, a nepodařilo se ji vytvořit.</p>%2</qt></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8671"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8621"/>
<source><qt><p>The audio path "%1" exists, but is not writable.</p>%2</qt></source>
<translation><qt><p>Cesta ke zvuku "%1" existuje, ale nenà zapisovatelná.</p>%2</qt></translation>
</message>
@@ -23156,12 +21524,12 @@ Chyba byla: %2</translation>
<translation><qt><p>KlepnÄ›te a táhnÄ›te nahoru, dolů, doleva nebo doprava kvůli zmÄ›nÄ› hodnoty.</p><p>Dvojité klepnutà pro pÅ™Ãmé zadánà hodnoty.</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/widgets/Rotary.cpp" line="506"/>
+ <location filename="../../src/gui/widgets/Rotary.cpp" line="504"/>
<source>Select a new value</source>
<translation>Vybrat novou hodnotu</translation>
</message>
<message>
- <location filename="../../src/gui/widgets/Rotary.cpp" line="507"/>
+ <location filename="../../src/gui/widgets/Rotary.cpp" line="505"/>
<source>Enter a new value</source>
<translation>Zadat novou hodnotu</translation>
</message>
@@ -23208,7 +21576,7 @@ Chyba byla: %2</translation>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="44"/>
<source>Change Segment Color...</source>
<translation>ZmÄ›nit barvu Äásti...</translation>
</message>
@@ -23251,7 +21619,7 @@ Chyba byla: %2</translation>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="105"/>
<source>Click on a segment to delete it</source>
<translation>Chcete-li Äást odstranit, klepnÄ›te na ni</translation>
</message>
@@ -23284,7 +21652,7 @@ Chyba byla: %2</translation>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="48"/>
<source>&Join</source>
<translation>&Spojit</translation>
</message>
@@ -23292,7 +21660,7 @@ Chyba byla: %2</translation>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="45"/>
<source>Re&label...</source>
<translation>ZmÄ›nit &oznaÄenÃ...</translation>
</message>
@@ -23329,22 +21697,22 @@ Chyba byla: %2</translation>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="176"/>
<source>Move Segment</source>
<translation>PÅ™esunout Äást</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="177"/>
<source>Move Segments</source>
<translation>PÅ™esunout Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="228"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="258"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Podržte tlaÄÃtko Shift, abyste se vyhnuli pÅ™ichytávánà na mřÞku dob</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="342"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="334"/>
<source>Click and drag to move a segment</source>
<translation>KlepnutÃm a taženÃm pÅ™esunete Äást</translation>
</message>
@@ -23408,10 +21776,6 @@ Chyba byla: %2</translation>
<translation><qt>Upravit oznaÄenà Äásti pro jakoukoli vybranou Äást</qt></translation>
</message>
<message>
- <source><qt><p>When checked, any selected segments will repeat until they run into another segment, or the end of the composition.</p><p>When viewed in the notation editor or printed via LilyPond, the segments will be bracketed by repeat signs.</p><p><center><img src=":pixmaps/tooltip/repeats.png"</img></center></p><br>These can be used in conjunction with special LilyPond export directives to create repeats with first and second alternate endings. See rosegardenmusic.com for a tutorial. [Ctrl+Shift+R] </qt></source>
- <translation type="obsolete"><qt><p>Když je zapnuto, budou se vÅ¡echny vybrané Äásti opakovat do té doby, než zaÄne dalÅ¡Ã Äást, nebo dokud skladba neskonÄÃ.</p><p>PÅ™i prohlÞenà v editoru notového zápisu nebo pÅ™i tisku prostÅ™ednictvÃm programu LilyPond, budou tyto Äásti oznaÄeny opakovacÃmi závorkami.</p><p><center><img src=":pixmaps/tooltip/repeats.png"</img></center></p><br>Tyto lze použÃvat ve spojenà se zvláštnÃmi smÄ›rnicemi programu LilyPond pro vyvedenà pro vytvoÅ™enà opakovánà s prvnÃmi a druhými náhradnÃmi zakonÄenÃmi. ProhlédnÄ›te si návod na rosegardenmusic.com. [Ctrl+Shift+R] </qt></translation>
- </message>
- <message>
<location filename="../../src/gui/editors/parameters/SegmentParameterBox.cpp" line="176"/>
<source><qt><p>When checked, any selected segments will repeat until they run into another segment, or the end of the composition.</p><p>When viewed in the notation editor or printed via LilyPond, the segments will be bracketed by repeat signs.</p><p><center><img src=":pixmaps/tooltip/repeats.png"></img></center></p><br>These can be used in conjunction with special LilyPond export directives to create repeats with first and second alternate endings. See rosegardenmusic.com for a tutorial. [Ctrl+Shift+R] </qt></source>
<translation><qt><p>Když je zapnuto, budou se vÅ¡echny vybrané Äásti opakovat do té doby, než zaÄne dalÅ¡Ã Äást, nebo dokud skladba neskonÄÃ.</p><p>PÅ™i prohlÞenà v editoru notového zápisu nebo pÅ™i tisku prostÅ™ednictvÃm programu LilyPond, budou tyto Äásti oznaÄeny opakovacÃmi závorkami.</p><p><center><img src=":pixmaps/tooltip/repeats.png"></img></center></p><br>Tyto lze použÃvat ve spojenà se zvláštnÃmi smÄ›rnicemi programu LilyPond pro vyvedenà pro vytvoÅ™enà opakovánà s prvnÃmi a druhými náhradnÃmi zakonÄenÃmi. ProhlédnÄ›te si návod na rosegardenmusic.com. [Ctrl+Shift+R] </qt></translation>
@@ -23544,17 +21908,17 @@ dÅ™Ãve než lze použÃt nové pÅ™evedenÃ.</translation>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>PodrženÃm tlaÄÃtka Shift (pÅ™esmykaÄe) se vyhnete pÅ™ichytávánà na taktové Äáry</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="284"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="294"/>
<source>Record or drop audio here</source>
<translation>Sem přetáhněte nebo zde zaznamenejte zvuk</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="290"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="300"/>
<source>Click and drag to draw an empty segment. Control+Alt click and drag to draw in overlap mode.</source>
<translation>KlepnutÃm a taženÃm vytvoÅ™Ãte prázdnou Äást. KlepnutÃm a taženÃm se stisknutým CTRL+Alt budete pracovat v pÅ™ekryvném režimu.</translation>
</message>
@@ -23625,12 +21989,12 @@ dÅ™Ãve než lze použÃt nové pÅ™evedenÃ.</translation>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="162"/>
<source>Warning</source>
<translation>UpozornÄ›nÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="153"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="163"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before rescaling an audio file.
Would you like to set it now?</source>
@@ -23639,42 +22003,42 @@ Nastavte platný adresář jako cestu ke zvukovému souboru ve Vlastnostech doku
Chcete cestu nastavit nynÃ?</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="172"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="182"/>
<source>Rescaling audio file...</source>
<translation>ProbÃhá zmÄ›na délky zvukového souboru...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="182"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="192"/>
<source>Generating audio preview...</source>
<translation>ProbÃhá vytvářenà náhledu na zvuk...</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="235"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="246"/>
<source>Resize Segment</source>
<translation type="unfinished">ZmÄ›nit velikost Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="274"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="290"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Podržte tlaÄÃtko Shift, abyste se vyhnuli pÅ™ichytávánà na mřÞku dob</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="280"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="297"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>PodrženÃm tlaÄÃtka Shift (pÅ™esmykaÄe) se vyhnete pÅ™ichytávánà na mřÞku dob; podržÃte-li tlaÄÃtko Ctrl, můžete také mÄ›nit délku obsahu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="282"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="299"/>
<source>Hold Ctrl to rescale contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="396"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="408"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>KlepnutÃm a taženÃm zmÄ›nÃte velikost Äásti; podržÃte-li tlaÄÃtko Ctrl, zmÄ›nÃte také délku jeho obsahu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="398"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="410"/>
<source>Click and drag to rescale segment</source>
<translation>KlepnutÃm a taženÃm zmÄ›nÃte délku Äásti</translation>
</message>
@@ -23682,64 +22046,56 @@ Chcete cestu nastavit nynÃ?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="81"/>
<source>Click and drag to select segments</source>
<translation>KlepnutÃm a taženÃm Äásti vyberete</translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="247"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>PÅ™esunout % Äást</numerusform>
- <numerusform>PÅ™esunout %n Äásti</numerusform>
- <numerusform>PÅ™esunout %n ÄástÃ</numerusform>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="288"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="401"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="429"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Podržte tlaÄÃtko Shift, abyste se vyhnuli pÅ™ichytávánà na mřÞku dob</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="509"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="549"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>KlepnutÃm a taženÃm Äásti vyberete; klepnutÃm prostÅ™ednÃm tlaÄÃtkem a taženÃm nakreslÃte prázdnou Äást</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="526"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="566"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>KlepnutÃm a taženÃm zmÄ›nÃte velikost Äásti; podržÃte-li tlaÄÃtko Ctrl, zmÄ›nÃte také délku jeho obsahu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="528"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="568"/>
<source>Click and drag to rescale segment</source>
<translation>KlepnutÃm a taženÃm zmÄ›nÃte délku Äásti</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="533"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="573"/>
<source>Click and drag to move segments; hold Ctrl as well to copy them; Ctrl + Alt for linked copies</source>
<translation>KlepnutÃm a taženÃm pÅ™esunete Äásti; podržÃte-li tlaÄÃtko Ctrl, můžete je také kopÃrovat; Ctrl+Alt pro propojené kopie</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="539"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="579"/>
<source>Click and drag to move segment; hold Ctrl as well to copy it; Ctrl + Alt for a linked copy; double-click to edit</source>
<translation>KlepnutÃm a taženÃm pÅ™esunete Äásti; podržÃte-li tlaÄÃtko Ctrl, můžete je také kopÃrovat; Ctrl+Alt pro propojené kopie; dvojité klepnutà pro úpravy</translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">KlepnutÃm a taženÃm pÅ™esunete Äásti; podržÃte-li tlaÄÃtko Ctrl, můžete je také kopÃrovat</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="535"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="575"/>
<source>Click and drag to copy segments</source>
<translation>KlepnutÃm a taženÃm zkopÃrujete Äásti</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">KlepnutÃm a taženÃm pÅ™esunete Äásti; podržÃte-li tlaÄÃtko Ctrl, můžete je také kopÃrovat; poklepánÃm je lze upravovat</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="541"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="581"/>
<source>Click and drag to copy segment</source>
<translation>KlepnutÃm a taženÃm zkopÃrujete Äást</translation>
</message>
@@ -23809,24 +22165,12 @@ Chcete cestu nastavit nynÃ?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">RozdÄ›lit Äást</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Chcete-li Äást rozdÄ›lit na dvÄ›, klepnÄ›te na ni; podržte pÅ™itom tlaÄÃtko Shift, abyste se vyhnuli pÅ™ichytávánà na mřÞku dob</translation>
</message>
- <message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="169"/>
- <source>Click on a segment to split it in two</source>
- <translation>Chcete-li Äást rozdÄ›lit na dva, klepnÄ›te na ni</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23941,8 +22285,8 @@ Chcete cestu nastavit nynÃ?</translation>
<context>
<name>Rosegarden::SequenceManager</name>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="926"/>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1076"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="928"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1078"/>
<source>The JACK Audio subsystem has failed or it has stopped Rosegarden from processing audio.
Please restart Rosegarden to continue working with audio.
Quitting other running applications may improve Rosegarden's performance.</source>
@@ -23951,8 +22295,8 @@ Pro pokraÄovánà v práci se zvukem spusÅ¥te program Rosegarden znovu.
UkonÄenà ostatnÃch běžÃcÃch programů by mohlo zlepÅ¡it výkon programu Rosegarden.</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="932"/>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1085"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="934"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1087"/>
<source>The JACK Audio subsystem has stopped Rosegarden from processing audio, probably because of a processing overload.
An attempt to restart the audio service has been made, but some problems may remain.
Quitting other running applications may improve Rosegarden's performance.</source>
@@ -23961,87 +22305,87 @@ Byl proveden pokus o opětovné spuštěnà zvukových služeb, některé probl
UkonÄenà ostatnÃch běžÃcÃch programů by mohlo zlepÅ¡it výkon programu Rosegarden.</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="943"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="945"/>
<source>Out of processor power for real-time audio processing. Cannot continue.</source>
<translation>Rychlost procesoru nestaÄà na zpracovávánà zvukových dat ve skuteÄném Äase. Nelze pokraÄovat.</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="969"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="971"/>
<source>A serious error has occurred in the ALSA MIDI subsystem. It may not be possible to continue sequencing. Please check console output for more information.</source>
<translation>V subsystému ALSA MIDI doÅ¡lo k vážné chybÄ›. Nemusà být dále možné pokraÄovat v práci (sekvencer). VÃce informacà naleznete na výstupu z ovládacÃho panelu (konzole).</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="995"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="997"/>
<source>JACK Audio subsystem is losing sample frames.</source>
<translation>Zvukový subsystém JACK ztrácà vzorkové rámce.</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1013"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1015"/>
<source>Failed to read audio data from disk in time to service the audio subsystem.</source>
<translation>NepodaÅ™ilo se vÄas pÅ™eÄÃst zvuková data na disku pro poslouženà zvukovému podsystému.</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1017"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1019"/>
<source>Failed to write audio data to disk fast enough to service the audio subsystem.</source>
<translation>NepodaÅ™ilo se dostateÄnÄ› rychle zapsat zvuková data na disk pro poslouženà zvukovému podsystému.</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1069"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1071"/>
<source><h3>System timer resolution is too low!</h3></source>
<translation><h3>RozliÅ¡enà systémového ÄasovaÄe je pÅ™ÃliÅ¡ nÃzké!</h3></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1104"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1106"/>
<source><p>Rosegarden was unable to find a high-resolution timing source for MIDI performance.</p><p>This may mean you are using a Linux system with the kernel timer resolution set too low. Please contact your Linux distributor for more information.</p><p>Some Linux distributors already provide low latency kernels, see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/low-latency_kernels">Rosegarden website</a> for instructions.</p></source>
<translation><p>Rosegarden nebyl schopen nalézt pro provedenà MIDI Äasovacà zdroj ve vysokém rozliÅ¡enÃ.</p><p>Může to znamenat, že použÃváte linuxový systém s rozliÅ¡enÃm ÄasovaÄe v jádru nastaveným na pÅ™ÃliÅ¡ nÃzkou hodnotu. Spojte se, prosÃm, s vaÅ¡Ãm distributorem Linuxu kvůli vÃce informacÃm.</p><p>NÄ›kteřà z distributorů Linuxu již poskytujà jádra s nÃzkou prodlevou. Kvůli dalÅ¡Ãm pokynům se podÃvejte na <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/low-latency_kernels">stránky programu Rosegarden</a>.</p></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1129"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1131"/>
<source><p>Rosegarden was unable to find a high-resolution timing source for MIDI performance.</p><p>You may be able to solve this problem by loading the RTC timer kernel module. To do this, try running <b>sudo modprobe snd-rtctimer</b> in a terminal window and then restarting Rosegarden.</p><p>Alternatively, check whether your Linux distributor provides a multimedia-optimized kernel. See the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/low-latency_kernels">Rosegarden website</a> for notes about this.</p></source>
<translation><p>Rosegarden nebyl schopen nalézt pro provedenà MIDI Äasovacà zdroj ve vysokém rozliÅ¡enÃ.</p><p>Tento problém můžete vyÅ™eÅ¡it nahránÃm modulu jádra s RTC ÄasovaÄem. Abyste to udÄ›lali, zkuste spustit <b>sudo modprobe snd-rtctimer</b> v oknÄ› ovládacÃho panelu pÅ™Ãkazového řádku a potom Rosegarden spusÅ¥te znovu.</p><p>Jako náhradnà řeÅ¡enà můžete ověřit, zda váš distributor Linuxu poskytuje jádro vyladÄ›né pro práci s multimédii Kvůli dalÅ¡Ãm poznámkám k této vÄ›ci se podÃvejte na <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/low-latency_kernels">stránky programu Rosegarden</a>.</p></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1239"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1241"/>
<source><h3>Sequencer engine unavailable!</h3></source>
<translation><h3>Stroj sekvenceru je nedostupný!</h3></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1240"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1242"/>
<source><p>Both MIDI and Audio subsystems have failed to initialize.</p><p>If you wish to run with no sequencer by design, then use "rosegarden --nosequencer" to avoid seeing this error in the future. Otherwise, we recommend that you repair your system configuration and start Rosegarden again.</p></source>
<translation><p>NepodaÅ™ilo se spustit ani MIDI ani zvukový podsystém.</p><p>Pokud chcete jet dál bez sekvenceru, použijte pÅ™Ãkaz "rosegarden --nosequencer", abyste se na hlášenà o této chybÄ› nemuseli v budocnu koukat. Jinak vám doporuÄujeme opravit nastavenà systému a spustit Rosegarden znovu.</p></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1242"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1244"/>
<source><h3>MIDI sequencing unavailable!</h3></source>
<translation><h3>SekvenÄnà zpracovánà MIDI nenà dostupné!</h3></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1260"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1262"/>
<source><h3>Audio sequencing and synth plugins unavailable!</h3></source>
<translation><h3>SekvenÄnà zpracovánà zvuku a syntetizátorové pÅ™Ãdavné moduly nejsou dostupné!</h3></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1261"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1263"/>
<source><p>Rosegarden could not connect to the JACK audio server. This probably means that Rosegarden was unable to start the audio server due to a problem with your configuration, your system installation, or both.</p><p>If you want to be able to play or record audio files or use plugins, we suggest that you exit Rosegarden and use the JACK Control utility (qjackctl) to try different settings until you arrive at a configuration that permits JACK to start. You may also need to install a realtime kernel, edit your system security configuration, and so on. Unfortunately, this is an extremely complex subject.</p><p> Once you establish a working JACK configuration, Rosegarden will be able to start the audio server automatically in the future.</p></source>
<translation><p>Rosegardenu se nepodaÅ™ilo spojit se zvukovým serverem JACK. PravdÄ›podobnÄ› to znamená, že Rosegardenu se nepodaÅ™ilo spustit zvukový server kvůli problému s vaÅ¡Ãm nastavenÃm, instalacà vaÅ¡eho systému, anebo kvůli obojÃmu.</p><p>Pokud chcete být schopen pÅ™ehrávat a nahrávat zvukové soubory nebo použÃvat pÅ™Ãdavné moduly, navrhujeme vám ukonÄit Rosegarden a použÃt pomůcku pro ovládánà serveru JACK (qjackctl) a vyzkouÅ¡et různá nastavenÃ, dokud nepÅ™ijdete na to, které umožnà spuÅ¡tÄ›nà serveru JACK. Možná budete rovněž muset nainstalovat jádro pracujÃcà ve skuteÄném Äase, upravit nastavenà bezpeÄnosti vaÅ¡eho systému, atd. NaneÅ¡tÄ›stà je toto celé velice složitá vÄ›c.</p><p> Jakmile se vám podařà vytvoÅ™it nastavenà serveru JACK, které bude pracovat, Rosegarden bude do budoucna schopen spustit zvukový server automaticky.</p></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1021"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1023"/>
<source>The audio mixing subsystem is failing to keep up.</source>
<translation>Zvukový směšovacà subsystém nestaÄà svým výkonem držet krok.</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1025"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1027"/>
<source>The audio subsystem is failing to keep up.</source>
<translation>Zvukový subsystém nestaÄà svým výkonem držet krok.</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1029"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1031"/>
<source>Unknown sequencer failure mode!</source>
<translation>Neznámý režim selhánà sekvenceru!</translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1243"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1245"/>
<source><p>The MIDI subsystem has failed to initialize.</p><p>You may continue without the sequencer, but we suggest closing Rosegarden, running "modprobe snd-seq-midi" as root, and starting Rosegarden again. If you wish to run with no sequencer by design, then use "rosegarden --nosequencer" to avoid seeing this error in the future.</p></source>
<translation><p>SpuÅ¡tÄ›nà subsystému MIDI selhalo.</p><p>Můžete pokraÄovat bez sekvenceru, ale doporuÄujeme spÃÅ¡e zavÅ™Ãt program Rosegarden, spustit jako uživatel root "modprobe snd-seq-midi" a znovu spustit Rosegarden. Pokud chcete pracovat bez sekvenceru zámÄ›rnÄ›, použijte možnost spuÅ¡tÄ›nà "rosegarden --nosequencer", abyste se s touto chybou v budoucnosti již nesetkávali.</p></translation>
</message>
@@ -24657,54 +23001,6 @@ UkonÄenà ostatnÃch běžÃcÃch programů by mohlo zlepÅ¡it výkon programu R
<translation>Rosegarden</translation>
</message>
<message>
- <source>C</source>
- <translation type="obsolete">C</translation>
- </message>
- <message>
- <source>C#</source>
- <translation type="obsolete">C#</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">D</translation>
- </message>
- <message>
- <source>Eb</source>
- <translation type="obsolete">Eb</translation>
- </message>
- <message>
- <source>E</source>
- <translation type="obsolete">E</translation>
- </message>
- <message>
- <source>F</source>
- <translation type="obsolete">F</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">F#</translation>
- </message>
- <message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">G#</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A</translation>
- </message>
- <message>
- <source>Bb</source>
- <translation type="obsolete">Bb</translation>
- </message>
- <message>
- <source>B</source>
- <translation type="obsolete">H</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/StaffHeader.cpp" line="685"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
@@ -24716,17 +23012,6 @@ UkonÄenà ostatnÃch běžÃcÃch programů by mohlo zlepÅ¡it výkon programu R
</message>
</context>
<context>
- <name>Rosegarden::Studio</name>
- <message>
- <source>Audio</source>
- <translation type="obsolete">Zvuk</translation>
- </message>
- <message>
- <source>Synth plugin</source>
- <translation type="obsolete">PÅ™Ãdavné moduly syntetizátorů</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SustainInsertionCommand</name>
<message>
<location filename="../../src/commands/notation/SustainInsertionCommand.h" line="51"/>
@@ -24774,14 +23059,6 @@ UkonÄenà ostatnÃch běžÃcÃch programů by mohlo zlepÅ¡it výkon programu R
<source>http://rosegardenmusic.com/wiki/doc:synth-plugin-manager-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:synth-plugin-manager-en</translation>
</message>
- <message>
- <source>Help for the Synth-Plugin Management Dialog</source>
- <translation type="obsolete">NápovÄ›da k dialogu pro správu pÅ™Ãdavných modulů syntetizátorů</translation>
- </message>
- <message>
- <source>Create plugin instances here, e.g. software synthesizers and effects. </source>
- <translation type="obsolete">Zde vytvoÅ™it instanci pÅ™Ãdavného modulu, napÅ™. programové syntetizátory a efekty. </translation>
- </message>
</context>
<context>
<name>Rosegarden::TempoDialog</name>
@@ -25608,39 +23885,27 @@ UkonÄenà ostatnÃch běžÃcÃch programů by mohlo zlepÅ¡it výkon programu R
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="264"/>
<source><no instrument></source>
<translation><žádný nástroj></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="192"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="201"/>
<source><untitled audio></source>
<translation><zvuk bez názvu></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="194"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="203"/>
<source><untitled></source>
<translation><bez názvu></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">UpozornÄ›nÃ</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Cesta ke zvukovému souboru neexistuje nebo se do nà nedá zapisovat.
-Nastavte platný adresář jako cestu ke zvukovému souboru ve Vlastnostech dokumentu pÅ™ed poÅ™izovánÃm zvukového záznamu.
-Chcete cestu nastavit nynÃ?</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="1010"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="1052"/>
<source>Mute track</source>
<translation>Ztlumit stopu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="1028"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="1070"/>
<source>Record on this track</source>
<translation>Nahrát do této stopy</translation>
</message>
@@ -25648,25 +23913,17 @@ Chcete cestu nastavit nynÃ?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">PÅ™evést opakujÃcà se Äást na skuteÄné kopie</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">PÅ™evést opakujÃcà se Äásti na skuteÄné kopie</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="709"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="575"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="746"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="598"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform>PÅ™evést %n opakujÃcà se Äást na skuteÄné kopie</numerusform>
@@ -25675,7 +23932,7 @@ Chcete cestu nastavit nynÃ?</translation>
</translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="771"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="624"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform>PÅ™evést %n propojenou Äást na skuteÄné kopie</numerusform>
@@ -25684,27 +23941,19 @@ Chcete cestu nastavit nynÃ?</translation>
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="1002"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="943"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="1003"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="944"/>
<source>Rosegarden cannot accept dropped files of this type.</source>
<translation>Rosegarden nemůže přijmout upuštěné soubory tohoto typu.</translation>
</message>
- <message>
- <source>You can't drop files into Rosegarden from this client. Try using Konqueror instead.</source>
- <translation type="obsolete">Z tohoto klienta nelze do aplikace Rosegarden pÅ™etahovat soubory. Zkuste použÃt aplikaci Konqueror.</translation>
- </message>
</context>
<context>
<name>Rosegarden::TrackLabel</name>
<message>
- <source><qt>Click and hold with either mouse button to assign this track to an instrument.</qt></source>
- <translation type="obsolete"><qt>KlepnÄ›te a pÅ™itom podržte nÄ›jaké své oblÃbené tlaÄÃtko na myÅ¡i pro pÅ™iÅ™azenà této stopy nÄ›jakému nástroji.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/editors/segment/TrackLabel.cpp" line="61"/>
<source><qt><p>Click to select all the segments on this track.</p><p>Shift+click to add to or to remove from the selection all the segments on this track.</p><p>Click and hold with either mouse button to assign this track to an instrument.</p></qt></source>
<translation><qt><p>KlepnÄ›te pro výbÄ›r vÅ¡ech Äástà v této stopÄ›.</p><p>Shift+klepnutà pro pÅ™idánà vÅ¡ech Äástà v této stopÄ› do výbÄ›ru nebo pro jejich odebránà z výbÄ›ru.</p><p>KlepnÄ›te a držte tlaÄÃtko myÅ¡i pro pro pÅ™iÅ™azenà této stopy k nástroji.</p></qt></translation>
@@ -25738,395 +23987,463 @@ Chcete cestu nastavit nynÃ?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="91"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="92"/>
<source>Track</source>
<translation>Stopa</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="92"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="93"/>
<source>Track Parameters</source>
<translation>Parametry stopy</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="140"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="792"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="141"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="801"/>
<source><untitled></source>
<translation><bez názvu></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="147"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="148"/>
<source>Playback parameters</source>
<translation>Parametry pÅ™ehrávánÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="163"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="205"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="164"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="206"/>
<source>Device</source>
<translation>ZaÅ™ÃzenÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="175"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="176"/>
<source>Instrument</source>
<translation>Nástroj</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="180"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="181"/>
<source><qt><p>Choose the instrument this track will use for playback. (Configure the instrument in <b>Instrument Parameters</b>).</p></qt></source>
<translation><qt><p>Vyberte nástroj, který se bude použÃvat pÅ™i pÅ™ehrávánà této stopy. (Nástroj lze nastavit v <b>Parametry nástroje</b>).</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="191"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="192"/>
<source>Recording filters</source>
<translation>Záznamové filtry</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="210"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="211"/>
<source><qt><p>This track will only record Audio/MIDI from the selected device, filtering anything else out</p></qt></source>
<translation><qt><p>Tato stopa bude nahrávat pouze Audio/MIDI z vybraného zaÅ™ÃzenÃ, cokoli jiného se odfiltrovává pryÄ</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="217"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="218"/>
<source>Channel</source>
<translation>Kanál</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="233"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="234"/>
<source>Staff export options</source>
<translation>Možnosti vyvedenà osnovy</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="252"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="253"/>
<source>Notation size:</source>
<translation>Velikost notace:</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="259"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="260"/>
<source>Normal</source>
<translation>NormálnÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="260"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="261"/>
<source>Small</source>
<translation>Malá</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="261"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="262"/>
<source>Tiny</source>
<translation>Drobná</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="268"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="269"/>
<source>Bracket type:</source>
<translation>Typ závorky:</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="273"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="274"/>
<source><qt><p>Bracket staffs in LilyPond<br>(fragile, use with caution)</p><qt></source>
<translation><qt>Osnovy závorek v LilyPondu<br>(kÅ™ehké, opatrnÄ› pÅ™i použitÃ)</p><qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="275"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="276"/>
<source>-----</source>
<translation>-----</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="276"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="277"/>
<source>[----</source>
<translation>[----</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="277"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="278"/>
<source>----]</source>
<translation>----]</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="278"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="279"/>
<source>[---]</source>
<translation>[---]</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="279"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="280"/>
<source>{----</source>
<translation>{----</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="280"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="281"/>
<source>----}</source>
<translation>----}</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="281"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="282"/>
<source>{[---</source>
<translation>{[---</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="282"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="283"/>
<source>---]}</source>
<translation>---]}</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="291"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="292"/>
<source>Create segments with</source>
<translation>VytvoÅ™it Äásti s</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="304"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="305"/>
<source>Preset</source>
<translation>PÅ™ednastavenÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="308"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="309"/>
<source><none></source>
<translation><žádný></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="315"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="316"/>
<source>Load</source>
<translation>NaÄÃst</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="323"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="324"/>
<source>Clef</source>
<translation>KlÃÄ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="328"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="329"/>
<source><qt><p>New segments will be created with this clef inserted at the beginning</p></qt></source>
<translation><qt><p>Nové Äásti budou vytvoÅ™eny s tÃmto klÃÄem, který byl vložen na zaÄátku</p></qt></translation>
</message>
<message>
- <source><qt><p>New segments will be created with this transpose property set<p></qt></source>
- <translation type="obsolete"><qt><p>Nové Äásti budou vytvoÅ™eny s tÄ›mito vlastnostmi pÅ™evedenÃ<p></qt></translation>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="331"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">houslový</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="332"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">basový</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="333"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">chrastÃtka</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="334"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">xylofon</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="335"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">kytara</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="336"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">kontrabas</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="337"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">celesta</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="338"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">stará celesta</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="339"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">francouzský</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="340"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">sopránový</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="341"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">mezosopránový</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="342"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">violový</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="343"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">tenorový</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="344"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">barytonový</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="345"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">varbarytonový</translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="346"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">subbasový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="384"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="385"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation><qt><p>S pomocà osnovy vyberte nejnižšà navrženou hratelnou notu</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="394"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="395"/>
<source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
<translation><qt><p>S pomocà osnovy vyberte nejvyššà navrženou hratelnou notu</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="167"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="168"/>
<source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
<translation><qt><p>Vyberte zaÅ™ÃzenÃ, které tato stopa bude použÃvat pro pÅ™ehrávánÃ.</p><p>KlepnÄ›te na <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> pro pÅ™ipojenà tohoto zaÅ™Ãzenà k platnému výstupu, pokud neslyÅ¡Ãte zvuk</p></qt></translation>
</message>
<message>
- <source><qt><p>This track will only record Audio/ MIDI from the selected device, filtering anything else out</p></qt></source>
- <translation type="obsolete"><qt><p>Do této stopy se budou nahrávat pouze Audio/ MIDI data z vybraného zaÅ™ÃzenÃ. VÅ¡e ostatnà bude odfiltrováno</p></qt></translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="222"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="223"/>
<source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
<translation><qt><p>Do této stopy se budou nahrávat pouze Audio/ MIDI data z vybraného kanálu. Vše ostatnà bude odfiltrováno</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="257"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="258"/>
<source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
<translation><qt><p>Vybrat obvyklou, malou nebo drobnou velikost pÃsma pro prvky not v tomto notovém zápisu (o obvyklé velikosti) pÅ™i vyvedenà do LilyPondu.</p><p>Toto je nejlepÅ¡Ã možná volba pro tisk ve správné velikosti</p></qt></translation>
</message>
<message>
- <source><qt>Bracket staffs in LilyPond<br>(fragile, use with caution)</p><qt></source>
- <translation type="obsolete"><qt>Osnovy závorek v LilyPondu<br>(kÅ™ehké, opatrnÄ› pÅ™i použitÃ)</p><qt></translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="317"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="318"/>
<source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
<translation><qt><p>Nahrát pÅ™ednastavenà pro parametr Äásti z naÅ¡Ã obsáhlé databáze skuteÄných nástrojů.</p><p>Když vytvoÅ™Ãte nové Äásti, budou jim tyto parametry pÅ™i vytvoÅ™enà pÅ™iÅ™azeny. Pro použità tÄ›chto parametrů na stávajÃcÃch Äástech (napÅ™. pro pÅ™evedenà stávajÃcà Äásti v koncertnà výšce tónu pro pÅ™ehrávánà na B trubku) použijte <b>Části -> PÅ™evést notový zápis pro</b> v editoru notového zápisu.</p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="330"/>
<source>treble</source>
- <translation>houslový</translation>
+ <translation type="obsolete">houslový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="331"/>
<source>bass</source>
- <translation>basový</translation>
+ <translation type="obsolete">basový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="332"/>
<source>crotales</source>
- <translation>chrastÃtka</translation>
+ <translation type="obsolete">chrastÃtka</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="333"/>
<source>xylophone</source>
- <translation>xylofon</translation>
+ <translation type="obsolete">xylofon</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="334"/>
<source>guitar</source>
- <translation>kytara</translation>
+ <translation type="obsolete">kytara</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="335"/>
<source>contrabass</source>
- <translation>kontrabas</translation>
+ <translation type="obsolete">kontrabas</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="336"/>
<source>celesta</source>
- <translation>celesta</translation>
+ <translation type="obsolete">celesta</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="337"/>
<source>old celesta</source>
- <translation>stará celesta</translation>
+ <translation type="obsolete">stará celesta</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="338"/>
<source>french</source>
- <translation>francouzský</translation>
+ <translation type="obsolete">francouzský</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="339"/>
<source>soprano</source>
- <translation>sopránový</translation>
+ <translation type="obsolete">sopránový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="340"/>
<source>mezzosoprano</source>
- <translation>mezosopránový</translation>
+ <translation type="obsolete">mezosopránový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="341"/>
<source>alto</source>
- <translation>violový</translation>
+ <translation type="obsolete">violový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="342"/>
<source>tenor</source>
- <translation>tenorový</translation>
+ <translation type="obsolete">tenorový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="343"/>
<source>baritone</source>
- <translation>barytonový</translation>
+ <translation type="obsolete">barytonový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="344"/>
<source>varbaritone</source>
- <translation>varbarytonový</translation>
+ <translation type="obsolete">varbarytonový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="345"/>
<source>subbass</source>
- <translation>subbasový</translation>
+ <translation type="obsolete">subbasový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="353"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="354"/>
<source>Transpose</source>
<translation>Převést</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="358"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="359"/>
<source><qt><p>New segments will be created with this transpose property set</p></qt></source>
<translation><qt><p>Nové Äásti budou vytvoÅ™eny s tÃmto souborem vlastnostà pÅ™evedenÃ<p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="374"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="375"/>
<source>Pitch</source>
<translation>Výška tónu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="378"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="379"/>
<source>Lowest</source>
<translation>NejnižšÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="382"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="392"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="383"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="393"/>
<source>---</source>
<translation>---</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="388"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="389"/>
<source>Highest</source>
<translation>NejvyÅ¡Å¡Ã</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="405"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="406"/>
<source>Color</source>
<translation>Barva</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="410"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="411"/>
<source><qt><p>New segments will be created using this color</p></qt></source>
<translation><qt><p>Nové Äásti budou vytvoÅ™eny s touto barvou<p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="596"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="597"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="605"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="606"/>
<source>Audio</source>
<translation>Zvuk</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="611"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="628"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="620"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="637"/>
<source>All</source>
<translation>VÅ¡e</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="685"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="689"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="694"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="698"/>
<source> %1</source>
<translation> %1</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="796"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="805"/>
<source>[ Track %1 - %2 ]</source>
<translation>[ Stopa %1 - %2 ]</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1043"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1052"/>
<source>Default</source>
<translation>VýchozÃ</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1059"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1068"/>
<source>Add New Color</source>
<translation>Přidat novou barvu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1091"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1100"/>
<source>New Color Name</source>
<translation>Název nové barvy</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1092"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1101"/>
<source>Enter new name:</source>
<translation>Zadejte nový název:</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1094"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1103"/>
<source>New</source>
<translation>Nový</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1126"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1135"/>
<source>Highest playable note</source>
<translation>Nejvyššà hratelná nota</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1148"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1157"/>
<source>Lowest playable note</source>
<translation>Nejnižšà hratelná nota</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1207"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1216"/>
<source>The instrument preset database is corrupt. Check your installation.</source>
<translation>Databáze přednastavených nástrojů je porušená. Zkontrolujte instalaci.</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1207"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1216"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1251"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1260"/>
<source>Segment</source>
<translation>Část</translation>
</message>
@@ -26456,13 +24773,6 @@ Chcete cestu nastavit nynÃ?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Ui</name>
- <message>
- <source>[ No port ]</source>
- <translation type="obsolete">[ Žádná pÅ™Ãpojka (port) ]</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::UnGraceCommand</name>
<message>
<location filename="../../src/commands/notation/UnGraceCommand.h" line="43"/>
@@ -26699,28 +25009,6 @@ Chcete cestu nastavit nynÃ?</translation>
</message>
</context>
<context>
- <name>RosegardenApplication</name>
- <message>
- <source>Rosegarden - A sequencer and musical notation editor</source>
- <translation type="obsolete">Aplikace Rosegarden - sekvencer a editor notového zápisu</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
- <message>
- <source>Welcome!</source>
- <translation type="obsolete">VÃtejte!</translation>
- </message>
-</context>
-<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">(zaznamenáno)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="25"/>
diff --git a/data/locale/cy.ts b/data/locale/cy.ts
index c51d26b..ec24c04 100644
--- a/data/locale/cy.ts
+++ b/data/locale/cy.ts
@@ -2,13 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
- <name></name>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
<name>:</name>
<message>
<source></source>
@@ -338,23 +331,23 @@
<translation type="unfinished">Methu agor ffeil mapio wynebfathau %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation type="unfinished">Ychwanegu Ffeil Sain</translation>
</message>
@@ -364,54 +357,54 @@
<translation type="unfinished">Allforio Ffeil Sain</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation type="unfinished">Ychwanegu Ffeil Sain</translation>
</message>
@@ -436,346 +429,346 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation type="unfinished">Bar Meta</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation type="unfinished">Newid i Erfyn Dewis</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation type="unfinished">Newid i Fewnosod Nodau</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation type="unfinished">Newid i Erfyn Dileu</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation type="unfinished">Mewnosod Di&gwyddiad</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation type="unfinished">Dileu Dig&wyddiad</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation type="unfinished">Golygu Digw&yddiad</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation type="unfinished">Golygu Digwyddiadau yn &Fanwl</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation type="unfinished">To&rri</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation type="unfinished">Dewisiad &Hidlen</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation type="unfinished"></translation>
</message>
@@ -785,82 +778,82 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation type="unfinished">Gwir-amser:</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation type="unfinished">Gwir-amser:</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation type="unfinished">Cylch&rannau</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation type="unfinished">%1 Traw</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation type="unfinished">Agor yn y Golygydd Matric&s</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation type="unfinished">Agor yn y Golygydd &Nodiant</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation type="unfinished"></translation>
</message>
@@ -890,7 +883,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation type="unfinished"></translation>
</message>
@@ -910,12 +903,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -925,7 +918,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+73"/>
+ <location line="-2670"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -1000,47 +993,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -1110,7 +1103,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1120,39 +1113,39 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation type="unfinished">Bar Gweithrediadau</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation type="unfinished">Bar Chwyddo</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation type="unfinished">Bar Cludydd</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation type="unfinished">Bar Chwyddo</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1202,7 +1195,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation type="unfinished">Mewnosod Saib</translation>
</message>
@@ -1222,117 +1215,117 @@
<translation type="unfinished">Golygu Arwydd</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation type="unfinished">Newid i Erfyn Dileu</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation type="unfinished">Newid i Erfyn Dileu</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation type="unfinished">Newid i Erfyn Dileu</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation type="unfinished">&Rhwydell</translation>
</message>
@@ -1348,13 +1341,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation type="unfinished"></translation>
</message>
@@ -1365,13 +1358,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation type="unfinished"></translation>
</message>
@@ -1382,13 +1375,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation type="unfinished"></translation>
</message>
@@ -1399,13 +1392,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation type="unfinished"></translation>
</message>
@@ -1416,13 +1409,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation type="unfinished"></translation>
</message>
@@ -1433,177 +1426,173 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation type="unfinished">Cipio at Curia&d</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">%1%</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation type="unfinished">Cipio at &Far</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A5</translation>
</message>
<message>
- <location line="-2205"/>
- <location line="+1302"/>
+ <location line="-3401"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1282"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2477"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation type="unfinished">Lleoliad y cyrchydd</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation type="unfinished">Ychwanegu Newid Te&mpo...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation type="unfinished">Ychwanegu Newid Ar&wydd Amseriad...</translation>
</message>
<message>
- <source>&Segment</source>
- <translation type="obsolete">Cylch&rannau</translation>
- </message>
- <message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation type="unfinished">Agor yn y Golygydd &Rhestr Digwyddiadau</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -1616,701 +1605,701 @@
</message>
<message>
<location line="+6"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1712"/>
- <location line="+1724"/>
+ <location line="-2908"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A4</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">I</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2588"/>
+ <location line="+43"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2342,7 +2331,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+17"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -2459,14 +2453,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2484,8 +2478,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2503,27 +2497,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation type="unfinished">Cwanteiddio</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation type="unfinished">Cw&anteiddio...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation type="unfinished"></translation>
</message>
@@ -2534,36 +2528,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation type="unfinished">Dat-ehangu &Nodau Hafal-Draw</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation type="unfinished">&Cynyddu Buanedd</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation type="unfinished">&Lleihau Buanedd</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -2579,359 +2573,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation type="unfinished">Parhad</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation type="unfinished">Lleddf dwbl</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation type="unfinished">Traws&gyweirio</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation type="unfinished">I &Fyny Hanner-ton</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation type="unfinished">I &Lawr Hanner-ton</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation type="unfinished">I Fyny &Wythfed</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation type="unfinished">I lawr Wyth&fed</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation type="unfinished">Trawsgyweirio i fyny un hanner-ton...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation type="unfinished">&Trawsgyweirio...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation type="unfinished">Cil&droi</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation type="unfinished">&Recordio</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation type="unfinished">Dileu Cylchran</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation type="unfinished">Dewis i Ddi&wedd</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation type="unfinished">&Dylunio</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation type="unfinished">&Dileu</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation type="unfinished">&Symud</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation type="unfinished">Ail-f&eintio</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation type="unfinished">&Buanedd</translation>
</message>
<message>
- <source>Cursor &Back</source>
- <translation type="obsolete">Cyrchydd Yn &Ol</translation>
- </message>
- <message>
- <source>Cursor &Forward</source>
- <translation type="obsolete">Cyrchydd Ym&laen</translation>
- </message>
- <message>
- <source>Cursor For&ward Bar</source>
- <translation type="obsolete">Cyrchydd Y&mlaen Un Far</translation>
- </message>
- <message>
- <source>Cursor to St&art</source>
- <translation type="obsolete">Cyrchydd i'r De&chrau</translation>
- </message>
- <message>
- <source>Cursor to &End</source>
- <translation type="obsolete">Cyrchydd i'r Diwe&dd</translation>
- </message>
- <message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation type="unfinished">Cyrchydd Ymlaen a D&ewis</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation type="unfinished">Gwaredu'r Dd&olen</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation type="unfinished">C&ludydd</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation type="unfinished">&Chwarae</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation type="unfinished">&Aros</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation type="unfinished">Ail-&ddirwyn</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation type="unfinished">&Brys Ymlaen </translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation type="unfinished">Ail-ddirwyn i'r &Dechrau</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation type="unfinished">Brys Ymlaen i'r Diw&edd</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation type="unfinished">Wythfed &Uwch</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation type="unfinished">Modd Mewnosod &Cord</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation type="unfinished">Recordio Cama&u</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation type="unfinished">Bar Ffontiau</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation type="unfinished">Dangos Rhes&yddion</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation type="unfinished">Dangos Rhesydd Enwau C&ordiau</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation type="unfinished">Dangos Rhesydd &Tempo</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation type="unfinished">Bar Offer</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation type="unfinished">&Recordio</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation type="unfinished"></translation>
</message>
@@ -3016,7 +2966,7 @@
<translation type="unfinished">Dangos Rhes&yddion</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation type="unfinished"></translation>
</message>
@@ -3026,13 +2976,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation type="unfinished"></translation>
</message>
@@ -3097,10 +3047,6 @@
<translation type="unfinished">B&ylchu</translation>
</message>
<message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Parhad</translation>
- </message>
- <message>
<location line="+1"/>
<source>&Layout Mode</source>
<translation type="unfinished">Haenlun</translation>
@@ -3126,36 +3072,32 @@
<translation type="unfinished">Agor Golygydd G&eiriau</translation>
</message>
<message>
- <source>Add Event Ruler</source>
- <translation type="obsolete">Hidlen Ddigwyddiadau</translation>
- </message>
- <message>
<location line="+23"/>
<source>Show &Track Headers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation type="unfinished">Agor yn y Golygydd Matric&s</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation type="unfinished">Ychwanegu Newid Cle&ff...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation type="unfinished">Ychwanegu &Newid Cywair...</translation>
</message>
<message>
- <location line="-1125"/>
- <location line="+1724"/>
+ <location line="-2321"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation type="unfinished"></translation>
</message>
@@ -3170,13 +3112,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2110"/>
+ <location line="+1"/>
<source>Add &Layer</source>
<translation type="unfinished"></translation>
</message>
@@ -3192,7 +3134,7 @@
<translation type="unfinished">&Nodau</translation>
</message>
<message>
- <location line="-1510"/>
+ <location line="-2706"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -3202,7 +3144,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1502"/>
+ <location line="+2698"/>
<source>Mar&ks</source>
<translation type="unfinished">Ar&wyddion</translation>
</message>
@@ -3484,8 +3426,8 @@
<translation type="unfinished">&Adfer Coesau a Gyfrifwyd</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation type="unfinished">&Dileu</translation>
</message>
@@ -3561,14 +3503,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation type="unfinished">Dad-&glymu Nodau</translation>
</message>
@@ -3648,14 +3590,14 @@
<translation type="unfinished">&Normaleiddio Seibiau</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation type="unfinished">&Dat-ehangu Seibiau</translation>
</message>
@@ -3665,8 +3607,8 @@
<translation type="unfinished">&Nodau</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -3752,13 +3694,13 @@
<translation type="unfinished">Ychwanegu llithriad...</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation type="unfinished">&Buanedd</translation>
</message>
@@ -3815,26 +3757,26 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation type="unfinished"></translation>
</message>
@@ -3979,26 +3921,14 @@
<translation type="unfinished">Dewisydd Traw</translation>
</message>
<message>
- <source>Cursor &Up Staff</source>
- <translation type="obsolete">Cyrchydd i &Fyny Un Erwydd</translation>
- </message>
- <message>
- <source>Cursor &Down Staff</source>
- <translation type="obsolete">Cyrchydd i &Lawr Un Erwydd</translation>
- </message>
- <message>
- <source>Cursor Ne&xt Segment</source>
- <translation type="obsolete">Creu Cylchran</translation>
- </message>
- <message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation type="unfinished">&Mewnosod nodyn</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation type="unfinished">Wythfed &Is</translation>
</message>
@@ -4018,13 +3948,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation type="unfinished">Dangos Bar &Offer</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation type="unfinished">Dangos Bar &Hapnodau</translation>
</message>
@@ -4044,18 +3974,18 @@
<translation type="unfinished">Dangos Bar &Casglu</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation type="unfinished">Dangos Bar C&ludydd</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation type="unfinished">Dangos Bar &Haenlunio</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4068,13 +3998,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4085,7 +4015,7 @@
<translation type="unfinished">Dangos Rhesydd Enwau Co&rdiau</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation type="unfinished">Dangos Rhesydd Nodau C&raidd</translation>
</message>
@@ -4100,7 +4030,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation type="unfinished">Bar Cleffau</translation>
</message>
@@ -4120,7 +4050,7 @@
<translation type="unfinished">Bar Arwyddion</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation type="unfinished"></translation>
</message>
@@ -4141,90 +4071,54 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>0</source>
- <translation type="obsolete">0</translation>
- </message>
- <message>
- <source>3</source>
- <translation type="obsolete">A3</translation>
- </message>
- <message>
- <source>6</source>
- <translation type="obsolete">A6</translation>
- </message>
- <message>
- <source>4</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
- <source>2</source>
- <translation type="obsolete">A2</translation>
- </message>
- <message>
- <source>1</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <source>5</source>
- <translation type="obsolete">A5</translation>
- </message>
- <message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rewind</source>
- <translation type="obsolete">Ail-ddirwyn</translation>
- </message>
- <message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation type="unfinished"></translation>
</message>
@@ -4234,13 +4128,13 @@
<translation type="unfinished">Chwarae</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation type="unfinished"></translation>
</message>
@@ -4260,7 +4154,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+607"/>
+ <location line="-1416"/>
<source>Show A&ctions Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -4271,31 +4165,31 @@
</message>
<message>
<location line="+25"/>
- <location line="+1550"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1379"/>
- <location line="+1723"/>
+ <location line="-2575"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-810"/>
+ <location line="-1645"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -4320,7 +4214,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+116"/>
+ <location line="+950"/>
<source>&Move to Staff Above...</source>
<translation type="unfinished"></translation>
</message>
@@ -4345,14 +4239,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2180"/>
+ <location line="+282"/>
<source>&Figuration</source>
<translation type="unfinished"></translation>
</message>
@@ -4625,21 +4519,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
@@ -4810,7 +4704,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation type="unfinished">Newid i Erfyn Mewnosod</translation>
</message>
@@ -4865,7 +4759,7 @@
<translation type="unfinished">Gwneud Nodau yn Ddic&honol</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation type="unfinished">Hunan-Drawstio lle mae'n addas</translation>
</message>
@@ -4905,7 +4799,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation type="unfinished"></translation>
</message>
@@ -4915,14 +4809,6 @@
<translation type="unfinished">&Mewnforio</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Mewnforio ffeil &Rosegarden 2.1...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Mewnforio ffeil &MIDI...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation type="unfinished">Mewnforio ffeil &Rosegarden 2.1...</translation>
@@ -4938,10 +4824,6 @@
<translation type="unfinished">Cyfuno &Ffeil...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Cyfuno ffeil &MIDI...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation type="unfinished">Mewnforio ffeil &Rosegarden 2.1...</translation>
@@ -4952,26 +4834,6 @@
<translation type="unfinished">&Allforio</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Mewnforio ffeil &Rosegarden 2.1...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Allforio ffeil &MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Allforio ffeil sgor &Csound...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Allforio ffeil &Mup...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Allforio ffeil Music&XML...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation type="unfinished"></translation>
@@ -5098,13 +4960,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation type="unfinished">&Stiwdio</translation>
</message>
@@ -5159,58 +5021,54 @@
<translation type="unfinished">&Cadw'r Ddogfen Gyfredol fel Stiwdio Rhagosodedig</translation>
</message>
<message>
- <source>Se&gments</source>
- <translation type="obsolete">Cylch&rannau</translation>
- </message>
- <message>
<location line="+2"/>
<source>Toggle Repeat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation type="unfinished">&Hollti</translation>
</message>
@@ -5325,26 +5183,26 @@
<translation type="unfinished">&Ail-fapio Offerynnau...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation type="unfinished">&Ail-feintio</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation type="unfinished">Recordio gan Ddisg&yn i Mewn</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation type="unfinished">Dangos Bar Tra&ciau</translation>
</message>
@@ -5359,15 +5217,15 @@
<translation type="unfinished">Dangos Bar Ch&wyddo</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation type="unfinished">Pwyntydd Chwarae i'r &Cyrchydd</translation>
</message>
@@ -5428,26 +5286,26 @@
<translation type="unfinished">Bar Golygyddion</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+221"/>
+ <location line="-1791"/>
<source>Insert Tempo Change</source>
<translation type="unfinished">Mewnosod Newid Tempo</translation>
</message>
@@ -5487,7 +5345,7 @@
<translation type="unfinished">Agor yn y Golygydd Digwyddiadau</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation type="unfinished">Golygu Digw&yddiad</translation>
</message>
@@ -5507,25 +5365,11 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">Mae angen ar y math gludo Cyfyngedig digon o le gwag
-(yn cynnwys dim ond seibiau) wrth y lleoliad gludo
-i gadw yr holl ddigwyddiadau i gael eu gludo.
-Doedd dim digon o le.
-Os ydych eisiau gludo beth bynnag, ystyriwch defnyddio
-un o'r mathau gludo eraill o'r dewisiad "Gludo" ar y
-ddewislen Golygu. Cewch hefyd newid y math gludo
-rhagosodedig i rhwybeth arall yn lle Cyfyngedig
-os hoffech chi.</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NoteFont.cpp" line="+58"/>
<source>No sizes listed for font "%1"</source>
<translation type="unfinished"></translation>
@@ -5546,7 +5390,7 @@ os hoffech chi.</translation>
<translation type="unfinished">Bas</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2626"/>
+ <location filename="../QMenuStrings.cpp" line="+345"/>
<location filename="../InstrumentStrings.cpp" line="-74"/>
<source>Triangle</source>
<translation type="unfinished">Tripled</translation>
@@ -7326,26 +7170,6 @@ os hoffech chi.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">C#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">F#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">G#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../AutoloadStrings.cpp" line="-24"/>
<source>General MIDI Device</source>
<translation type="unfinished"></translation>
@@ -8531,16 +8355,16 @@ os hoffech chi.</translation>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation type="unfinished">Sain</translation>
@@ -10681,20 +10505,15 @@ os hoffech chi.</translation>
<translation type="unfinished">Anhysbys</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation type="unfinished">[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation type="unfinished">%1%</translation>
</message>
@@ -10709,10 +10528,10 @@ os hoffech chi.</translation>
<translation type="unfinished">&%1%2</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation type="unfinished">rheolydd %1</translation>
</message>
@@ -10727,7 +10546,7 @@ os hoffech chi.</translation>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
@@ -10835,45 +10654,53 @@ os hoffech chi.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation type="unfinished"></translation>
</message>
@@ -10973,7 +10800,7 @@ os hoffech chi.</translation>
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
@@ -11070,6 +10897,56 @@ os hoffech chi.</translation>
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Nid yw Lilypond yn caniatau gofodnodau neu slaesau ol mewn enwau ffeiliau. Fuasech chi'n hoffi defnyddio
+
+%1
+
+yn lle?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Methodd yr allforio. Methu agor y ffeil i ysgrifennu.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">rhybudd: bar sy'n or-hir wedi'i dorri yma</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">rhybudd: bar sy'n rhy gwta, wedi ei lenwi efo seibiau</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11085,7 +10962,7 @@ os hoffech chi.</translation>
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -11147,12 +11024,12 @@ os hoffech chi.</translation>
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation type="unfinished">Ychwanegu &Llithriad</translation>
</message>
@@ -11647,14 +11524,6 @@ os hoffech chi.</translation>
<translation type="unfinished">Allforio ffeil sain ...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">Allforio ffeil sain ...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">Allforio ffeil sain ...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation type="unfinished">Allforio ffeil sain ...</translation>
@@ -11668,24 +11537,24 @@ os hoffech chi.</translation>
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation type="unfinished"><dim digwyddiadau></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation type="unfinished"><dim ategyn></translation>
</message>
@@ -11738,10 +11607,6 @@ os hoffech chi.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><dim ffeil sain></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation type="unfinished"></translation>
@@ -11858,10 +11723,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">Mewnosod label newydd</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Allforio ffeil sain ...</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation type="unfinished"></translation>
@@ -11896,7 +11757,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation type="unfinished">Pylydd Sain</translation>
</message>
@@ -11912,49 +11773,45 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation type="unfinished">Tremio</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation type="unfinished">Ychwanegu Ffeil Sain</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Solo</source>
- <translation type="obsolete">Unawd</translation>
- </message>
- <message>
<location line="+8"/>
<source>Arm recording</source>
<translation type="unfinished">Recordio</translation>
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation type="unfinished"><dim></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
@@ -11974,7 +11831,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation type="unfinished"></translation>
</message>
@@ -11990,14 +11847,14 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">Meistr MMC</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation type="unfinished"><dim ategyn></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -12439,10 +12296,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">Rheoli Rhengau MIDI a Rhaglenni</translation>
</message>
<message>
- <source>Reset</source>
- <translation type="obsolete">Ail-osod</translation>
- </message>
- <message>
<location line="+23"/>
<source>Device and Banks</source>
<translation type="unfinished"></translation>
@@ -12580,7 +12433,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">Wir dileu y rheng yma?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation type="unfinished">Wir dileu y rheng yma?</translation>
</message>
@@ -12655,10 +12508,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<source>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>Unsaved Changes</source>
- <translation type="obsolete">Newid Allwedd</translation>
- </message>
</context>
<context>
<name>Rosegarden::BeamCommand</name>
@@ -12768,6 +12617,120 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -13091,7 +13054,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -13099,10 +13062,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ConfigureDialog</name>
<message>
- <source>Configure Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/ConfigureDialog.cpp" line="+48"/>
<source>Rosegarden - Preferences</source>
<translation type="unfinished"></translation>
@@ -13320,7 +13279,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -13336,7 +13295,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation type="unfinished">Math o ddigwyddiad na chynhelir:</translation>
</message>
@@ -13351,12 +13310,13 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">Digwyddiadau Rheolydd</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation type="unfinished">Rhif Digwyddiad Rheolydd</translation>
</message>
@@ -13364,7 +13324,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
@@ -13374,7 +13334,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">(dyfyniad)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation type="unfinished">(wedi'i gopio)</translation>
</message>
@@ -13444,7 +13404,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation type="unfinished">To&rri</translation>
</message>
@@ -13520,7 +13480,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation type="unfinished"></translation>
</message>
@@ -13528,14 +13488,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::DiatonicPitchChooser</name>
<message>
- <source>D</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/DiatonicPitchChooser.cpp" line="+59"/>
<source>C</source>
<comment>note name</comment>
@@ -13811,143 +13763,16 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
</context>
<context>
- <name>Rosegarden::EditView</name>
+ <name>Rosegarden::EditViewBase</name>
<message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">rheolydd %1</translation>
+ <location filename="../../src/gui/general/EditViewBase.cpp" line="+222"/>
+ <source>Toggle the statusbar...</source>
+ <translation type="unfinished">Dangos/cuddio'r bar cyflwr...</translation>
</message>
<message>
- <source>Pitch Bend</source>
- <translation type="obsolete">Plygu Traw</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Math o ddigwyddiad na chynhelir:</translation>
- </message>
- <message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <source>VIII</source>
- <translation type="obsolete">VIII</translation>
- </message>
- <message>
- <source>%1 flat</source>
- <translation type="obsolete">%1 lleddf</translation>
- </message>
- <message>
- <source>%1 sharp</source>
- <translation type="obsolete">%1 llon</translation>
- </message>
- <message>
- <source>&Insert Note</source>
- <translation type="obsolete">&Mewnosod nodyn</translation>
- </message>
- <message>
- <source>&Upper Octave</source>
- <translation type="obsolete">Wythfed &Uwch</translation>
- </message>
- <message>
- <source>&Lower Octave</source>
- <translation type="obsolete">Wythfed &Is</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Dangos arwydd amseriad wedi'i amcangyfrif</translation>
- </message>
- <message>
- <source>Halving durations...</source>
- <translation type="obsolete">Gosod &Tempo i Barhad Cylchran Sain</translation>
- </message>
- <message>
- <source>Doubling durations...</source>
- <translation type="obsolete">Gosod &Tempo i Barhad Cylchran Sain</translation>
- </message>
- <message>
- <source>Rescaling...</source>
- <translation type="obsolete">Ail-&raddu...</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Trawsgyweirio</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Mewnosod faint o hanner-tonau i drawsgyweirio:</translation>
- </message>
- <message>
- <source>Transposing...</source>
- <translation type="obsolete">Trawsgyweirio...</translation>
- </message>
- <message>
- <source>Transposing up one semitone...</source>
- <translation type="obsolete">Trawsgyweirio i fyny un hanner-ton...</translation>
- </message>
- <message>
- <source>Transposing up one octave...</source>
- <translation type="obsolete">Trawsgyweirio i fyny un wythfed...</translation>
- </message>
- <message>
- <source>Transposing down one semitone...</source>
- <translation type="obsolete">Trawsgyweirio i lawr un hanner-ton...</translation>
- </message>
- <message>
- <source>Transposing down one octave...</source>
- <translation type="obsolete">Trawsgyweirio i lawr un wythfed...</translation>
- </message>
- <message>
- <source>Inverting...</source>
- <translation type="obsolete">Dechrau...</translation>
- </message>
- <message>
- <source>Retrograding...</source>
- <translation type="obsolete">Ail-&raddu...</translation>
- </message>
- <message>
- <source>Retrograde inverting...</source>
- <translation type="obsolete">Ail-&raddu...</translation>
- </message>
- <message>
- <source>Jogging left...</source>
- <translation type="obsolete">Cau'r ffeil...</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::EditViewBase</name>
- <message>
- <location filename="../../src/gui/general/EditViewBase.cpp" line="+222"/>
- <source>Toggle the statusbar...</source>
- <translation type="unfinished">Dangos/cuddio'r bar cyflwr...</translation>
- </message>
- <message>
- <location line="+72"/>
- <source>Segment Start Time</source>
- <translation type="unfinished">Paramedrau Cylchrannau</translation>
+ <location line="+72"/>
+ <source>Segment Start Time</source>
+ <translation type="unfinished">Paramedrau Cylchrannau</translation>
</message>
<message>
<location line="+7"/>
@@ -14276,46 +14101,10 @@ Gall hyn achosi problemau os mae'n newid gwerth gwahanol sydd wedi'i c
<translation type="unfinished">Patrwm</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Lleddf - gosod %1 i'r gwerth</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Eiledu - gosod %1 i'r mwyaf a'r lleiaf ar bob yn ail ddigwyddiad</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo - gosod %1 i godi o'r lleiaf i'r mwyaf</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo - gosod %1 i syrthio o'r mwyaf i'r lleiaf</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Atseinio - gosod %1 i fynd bob yn ail o'r mwyaf i'r lleiaf, efo'r dau yn distewi i sero</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation type="unfinished">Gwerth</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Gwerth Cyntaf</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Ail Werth</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Gwerth LSB</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Gwerth Cyntaf</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14575,10 +14364,6 @@ Gall hyn achosi problemau os mae'n newid gwerth gwahanol sydd wedi'i c
<source>http://rosegardenmusic.com/wiki/doc:eventView-en</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>%1 - Triggered Segment: %2</source>
- <translation type="obsolete">Creu Cylchran</translation>
- </message>
</context>
<context>
<name>Rosegarden::ExpandFigurationCommand</name>
@@ -14976,10 +14761,6 @@ Ydych eisiau ceisio lleoli'r ffeil yma neu'i osgoi?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Normal</source>
- <translation type="obsolete">Arferol</translation>
- </message>
- <message>
<location line="+6"/>
<source>Safe</source>
<translation type="unfinished"></translation>
@@ -15010,10 +14791,6 @@ Ydych eisiau ceisio lleoli'r ffeil yma neu'i osgoi?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Matrix</source>
- <translation type="obsolete">Matrics</translation>
- </message>
- <message>
<location line="+4"/>
<source>Notation</source>
<translation type="unfinished">Nodiant</translation>
@@ -15639,7 +15416,7 @@ Example text from file:</source>
<translation type="unfinished">Paramedrau Offerynnau</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation type="unfinished">Tra&ciau</translation>
</message>
@@ -15647,7 +15424,7 @@ Example text from file:</source>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -16030,52 +15807,8 @@ Example text from file:</source>
</message>
</context>
<context>
- <name>Rosegarden::LatencyConfigurationPage</name>
- <message>
- <source>Latency</source>
- <translation type="obsolete">Hwyrni</translation>
- </message>
- <message>
- <source>Sequencer Latency</source>
- <translation type="obsolete">Hwyrni Dilyniannydd</translation>
- </message>
- <message>
- <source>JACK latency</source>
- <translation type="obsolete">Hwyrni JACK</translation>
- </message>
- <message>
- <source>Use the "Fetch JACK latencies" button to discover the latency values set at
-the sequencer. It's recommended that you use the returned values but it's also
-possible to override them manually using the sliders. Note that if you change
-your JACK server parameters you should always fetch the latency values again.
-The latency values will be stored by Rosegarden for use next time.</source>
- <translation type="obsolete">Defynyddiwch y botwm "Nol hwyrnioedd JACK" i ddarganfod y gwerthoedd hwyrni sydd wedi eu gosod
-wrth y dilyniannydd. Y peth gorau yw defnyddio'r gwerthoedd a ddangosir, ond mae'n bosibl hefyd
-i'w newid a llaw gan ddefnyddio'r llithryddion. Noder: ar ol i chi newid paramedrau eich
-gweinydd JACK, dylech nol y gwerthoedd hwyrni eto. Bydd Rosegarden yn cadw'r gwerthoedd
-hwyrni i ddeffnyddio'r tro nesaf.</translation>
- </message>
- <message>
- <source>JACK playback latency (in ms)</source>
- <translation type="obsolete">Hwyrni chwarae JACK (mewn ms)</translation>
- </message>
- <message>
- <source>JACK record latency (in ms)</source>
- <translation type="obsolete">Hwyrni recordio JACK (mewn ms)</translation>
- </message>
- <message>
- <source>Fetch JACK latencies</source>
- <translation type="obsolete">Nol hwyrnioedd JACK</translation>
- </message>
- <message>
- <source>JACK Latency</source>
- <translation type="obsolete">Hwyrni JACK</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -16083,46 +15816,23 @@ Would you like to use
%1
instead?</source>
- <translation type="unfinished">Nid yw Lilypond yn caniatau gofodnodau neu slaesau ol mewn enwau ffeiliau. Fuasech chi'n hoffi defnyddio
+ <translation type="obsolete">Nid yw Lilypond yn caniatau gofodnodau neu slaesau ol mewn enwau ffeiliau. Fuasech chi'n hoffi defnyddio
%1
yn lle?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">Methodd yr allforio. Methu agor y ffeil i ysgrifennu.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Methodd yr allforio. Methu agor y ffeil i ysgrifennu.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation type="unfinished">rhybudd: bar sy'n or-hir wedi'i dorri yma</translation>
+ <translation type="obsolete">rhybudd: bar sy'n or-hir wedi'i dorri yma</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation type="unfinished">rhybudd: bar sy'n rhy gwta, wedi ei lenwi efo seibiau</translation>
+ <translation type="obsolete">rhybudd: bar sy'n rhy gwta, wedi ei lenwi efo seibiau</translation>
</message>
</context>
<context>
@@ -16831,7 +16541,7 @@ fel arfer yn achosi oedi wrth ddechrau'r chwarae o achos cymaint y ddata sy
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -16871,10 +16581,6 @@ fel arfer yn achosi oedi wrth ddechrau'r chwarae o achos cymaint y ddata sy
<translation type="unfinished">Rhaglen</translation>
</message>
<message>
- <source>Channel out</source>
- <translation type="obsolete">Sianel</translation>
- </message>
- <message>
<location line="-46"/>
<source>Percussion</source>
<translation type="unfinished">Trawiad</translation>
@@ -16920,12 +16626,7 @@ fel arfer yn achosi oedi wrth ddechrau'r chwarae o achos cymaint y ddata sy
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation type="unfinished">[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation type="unfinished">Dim cysylltiad</translation>
</message>
@@ -17143,16 +16844,21 @@ fel arfer yn achosi oedi wrth ddechrau'r chwarae o achos cymaint y ddata sy
<translation type="unfinished">Ail-&raddu...</translation>
</message>
<message>
- <source>Synth plugin </source>
- <translation type="obsolete">Botwm ategyn sain</translation>
- </message>
- <message>
<location line="+124"/>
<source>%1 (%2)</source>
<translation type="unfinished">&%1%2</translation>
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17356,12 +17062,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation type="unfinished">Symud Digwyddiad</translation>
</message>
@@ -17520,7 +17226,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Buanedd:</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation type="unfinished">Newid i Erfyn Dewis</translation>
</message>
@@ -17533,80 +17239,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <source>Instrument Parameters</source>
- <translation type="obsolete">Paramedrau Offerynnau</translation>
- </message>
- <message>
- <source>Couldn't apply piano roll layout</source>
- <translation type="obsolete">Methu gweithredu haenlun rholyn piano</translation>
- </message>
- <message>
- <source> No selection </source>
- <translation type="obsolete"> Dim dewisiad</translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">Cwanteiddio...</translation>
- </message>
- <message>
- <source>Collapsing notes...</source>
- <translation type="obsolete">Dat-ehangu nodau...</translation>
- </message>
- <message>
- <source>Making legato...</source>
- <translation type="obsolete">Gwneud addurnodau...</translation>
- </message>
- <message>
- <source>Note: %1 (%2.%3s)</source>
- <translation type="obsolete">Amser: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>%1 (%2)</source>
- <translation type="obsolete">&%1%2</translation>
- </message>
- <message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Amser: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">Torri'r dewisiad i'r gludfwrdd... </translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">Copio'r dewisiad i'r gludfwrdd...</translation>
- </message>
- <message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">Mae'r gludfwrdd yn wag</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">Mewnosod cynnyws y gludfwrdd...</translation>
- </message>
- <message>
- <source>Couldn't paste at this point</source>
- <translation type="obsolete">Methu gludo wrth y fan yma</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">Dileu'r dewisiad...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished">Gweithrediad anhysbys %1 wrth fewnosod nodyn</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">Mewnosod nodyn</translation>
- </message>
- <message>
- <source>Unquantizing...</source>
- <translation type="obsolete">Dad-gwanteiddio...</translation>
- </message>
- <message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation type="unfinished"><di-deitl></translation>
</message>
@@ -17629,18 +17267,6 @@ Double-click to open the marker editor.</source>
</translation>
</message>
<message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">rheolydd %1</translation>
- </message>
- <message>
- <source>Pitch Bend</source>
- <translation type="obsolete">Plygu Traw</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Math o ddigwyddiad na chynhelir:</translation>
- </message>
- <message>
<location line="+254"/>
<source> Grid: </source>
<translation type="unfinished">Rhwydell:</translation>
@@ -17681,7 +17307,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation type="unfinished"></translation>
</message>
@@ -17697,8 +17323,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -17708,15 +17333,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Dangos arwydd cywair wedi'i amcangyfrif</translation>
</message>
<message>
- <source> Zoom: </source>
- <translation type="obsolete">Chwyddo:</translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation type="unfinished">Dangos arwydd amseriad wedi'i amcangyfrif</translation>
</message>
@@ -17731,22 +17348,6 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Mewnosod faint o hanner-tonau i drawsgyweirio:</translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">Codi buaneddau...</translation>
- </message>
- <message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">Iselhau buaneddau...</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Gosod Buaneddau Digwyddiadau</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Gosod Buaneddau...</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation type="unfinished">Dileu Cylchran</translation>
@@ -17757,32 +17358,15 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">&Gwaredu Arwydd</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation type="unfinished">Matrics</translation>
</message>
- <message>
- <source>Percussion</source>
- <translation type="obsolete">Trawiad</translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">Parhad</translation>
- </message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="unfinished">Dim parhad nodau wedi'i ddewis</translation>
- </message>
- <message>
- <source> Chord </source>
- <translation type="obsolete">Cord</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation type="unfinished"></translation>
</message>
@@ -17802,7 +17386,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -17909,13 +17493,6 @@ Double-click to open the marker editor.</source>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">Newid Allwedd</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="+53"/>
@@ -17932,7 +17509,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation type="unfinished">Cyfuno MIDI</translation>
</message>
@@ -17947,7 +17524,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Offeryn</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -18061,441 +17638,176 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MoveCommand</name>
<message>
- <location filename="../../src/commands/edit/MoveCommand.cpp" line="+54"/>
- <source>&Move Events</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>&Move Events Back</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>&Move Events Forward</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::MoveTracksCommand</name>
- <message>
- <location filename="../../src/commands/segment/MoveTracksCommand.h" line="+46"/>
- <source>Move Tracks...</source>
- <translation type="unfinished">Symud Traciau...</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::MultiKeyInsertionCommand</name>
- <message>
- <location filename="../../src/commands/notation/MultiKeyInsertionCommand.h" line="+58"/>
- <source>Change all to &Key %1...</source>
- <translation type="unfinished">Newid popeth i &Gywair %1...</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Add &Key Change...</source>
- <translation type="unfinished">Ychwanegu &Newid Cywair...</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::MusicXMLOptionsDialog</name>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="+60"/>
- <source>MusicXML Export</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Layout</source>
- <translation type="unfinished">Haenlun</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Headers</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Basic options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Export content</source>
- <translation type="unfinished">Allforio Dyfais fel ...</translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Choose which tracks or segments to export</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>All tracks</source>
- <translation type="unfinished">Ymladd</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Non-muted tracks</source>
- <translation type="unfinished">Ymladd</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Selected track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Selected segments</source>
- <translation type="unfinished">Dewis &Pob Cylchran</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Export track staff brackets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Track staff brackets are found in the <b>Track Parameters</b> box, and may be used to group staffs in various ways</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Advanced/Experimental options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Compatibility level</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Set the MusicXML version you want export</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source><qt><p>Choose the format of the MusicXML file.</p><p>The "partwise" format contains "part" elements that contain "measure" elements. The "timewise" format reverses this ordering.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export grand staff instrument</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source><qt>Choose which bracket will create a grand staff system</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-29"/>
- <source>MusicXML type</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>None</source>
- <translation type="unfinished">Dim</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Don't export percussion tracks</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Use "<octave-shift>" for transposing instruments</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+45"/>
- <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NameSetEditor</name>
- <message>
- <source>Librarian</source>
- <translation type="obsolete">Rhaglengellydd</translation>
- </message>
- <message>
- <source>Name</source>
- <translation type="obsolete">Enw</translation>
- </message>
- <message>
- <source>Email</source>
- <translation type="obsolete">Ebost</translation>
- </message>
- <message>
- <source>The librarian maintains the Rosegarden device data for this device.
-If you've made modifications to suit your own device, it might be worth
-liaising with the librarian in order to publish your information for the benefit
-of others.</source>
- <translation type="obsolete">Mae'r rhaglengellydd yn cynnal y gwybodaeth generig Rheng a Rhaglen ar gyfer y ddyfais yma.
-Os ydych wedi gwneud addasiadau i Reng ar gyfer eich dyfais eich hun, efallai bydd hi'n werth
-cysylltu a'r rhaglengellydd er mwyn cyhoeddi eich gwybodaeth Rheng i fantais eraill.</translation>
- </message>
- <message>
- <location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
- <source>Provided by</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewMatrixView</name>
- <message>
- <source>Matrix</source>
- <translation type="obsolete">Matrics</translation>
- </message>
- <message>
- <source><untitled></source>
- <translation type="obsolete"><di-deitl></translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">Parhad</translation>
- </message>
- <message>
- <source> Grid: </source>
- <translation type="obsolete">Rhwydell:</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Dim</translation>
- </message>
- <message>
- <source>Unit</source>
- <translation type="obsolete">Uned</translation>
- </message>
- <message>
- <source>Beat</source>
- <translation type="obsolete">Curiad</translation>
- </message>
- <message>
- <source>Bar</source>
- <translation type="obsolete">Bar</translation>
- </message>
- <message>
- <source> Velocity: </source>
- <translation type="obsolete">Buanedd:</translation>
- </message>
- <message>
- <source> Quantize: </source>
- <translation type="obsolete">Cwanteiddio:</translation>
- </message>
- <message>
- <source> Zoom: </source>
- <translation type="obsolete">Chwyddo:</translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Gosod Buaneddau Digwyddiadau</translation>
- </message>
- <message>
- <source>Trigger Segment</source>
- <translation type="obsolete">Dileu Cylchran</translation>
- </message>
- <message>
- <source>Remove Triggers</source>
- <translation type="obsolete">&Gwaredu Arwydd</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Dangos arwydd amseriad wedi'i amcangyfrif</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Trawsgyweirio</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Mewnosod faint o hanner-tonau i drawsgyweirio:</translation>
- </message>
- <message>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="obsolete">Dim parhad nodau wedi'i ddewis</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewNotationView</name>
- <message>
- <source>Note &Font</source>
- <translation type="obsolete">&Ffont i'r Nodau</translation>
- </message>
- <message>
- <source>Si&ze</source>
- <translation type="obsolete">Ma&int</translation>
- </message>
- <message>
- <source>S&pacing</source>
- <translation type="obsolete">B&ylchu</translation>
- </message>
- <message>
- <source> Font: </source>
- <translation type="obsolete">Ffont:</translation>
- </message>
- <message>
- <source>Unknown font "%1", using default</source>
- <translation type="obsolete">Ffont anhysbys "%1"; yn defnyddio'r rhagosod</translation>
- </message>
- <message>
- <source> Size: </source>
- <translation type="obsolete">Maint:</translation>
- </message>
- <message>
- <source> Spacing: </source>
- <translation type="obsolete">Bylchu:</translation>
+ <location filename="../../src/commands/edit/MoveCommand.cpp" line="+54"/>
+ <source>&Move Events</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>LilyPond Preview Options</source>
- <translation type="obsolete">Maint ffont Lilypad</translation>
+ <location line="+2"/>
+ <source>&Move Events Back</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>LilyPond preview options</source>
- <translation type="obsolete">Maint ffont Lilypad</translation>
+ <location line="+2"/>
+ <source>&Move Events Forward</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::MoveTracksCommand</name>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Methodd yr allforio. Methu agor y ffeil i ysgrifennu.</translation>
+ <location filename="../../src/commands/segment/MoveTracksCommand.h" line="+46"/>
+ <source>Move Tracks...</source>
+ <translation type="unfinished">Symud Traciau...</translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::MultiKeyInsertionCommand</name>
<message>
- <source>Unknown font action %1</source>
- <translation type="obsolete">Gweithrediad ffont anhysbys %1</translation>
+ <location filename="../../src/commands/notation/MultiKeyInsertionCommand.h" line="+58"/>
+ <source>Change all to &Key %1...</source>
+ <translation type="unfinished">Newid popeth i &Gywair %1...</translation>
</message>
<message>
- <source>Unknown font size action %1</source>
- <translation type="obsolete">Gweithrediad maint ffont anhysbys %1</translation>
+ <location line="+2"/>
+ <source>Add &Key Change...</source>
+ <translation type="unfinished">Ychwanegu &Newid Cywair...</translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::MusicXMLOptionsDialog</name>
<message>
- <source>Unknown spacing action %1</source>
- <translation type="obsolete">Gweithrediad bylchu anhysbys %1</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="+60"/>
+ <source>MusicXML Export</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Can't paste multiple Segments into one</source>
- <translation type="obsolete">Methu gludo Cylchrannau lluosol i mewn i un</translation>
+ <location line="+16"/>
+ <source>Layout</source>
+ <translation type="unfinished">Haenlun</translation>
</message>
<message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
+ <location line="+7"/>
+ <source>Headers</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Couldn't paste at this point.</source>
- <translation type="obsolete">Methu gludo wrth y fan yma.</translation>
+ <location line="+6"/>
+ <source>Basic options</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">Mae angen ar y math gludo Cyfyngedig digon o le gwag
-(yn cynnwys dim ond seibiau) wrth y lleoliad gludo
-i gadw yr holl ddigwyddiadau i gael eu gludo.
-Doedd dim digon o le.
-Os ydych eisiau gludo beth bynnag, ystyriwch defnyddio
-un o'r mathau gludo eraill o'r dewisiad "Gludo" ar y
-ddewislen Golygu. Cewch hefyd newid y math gludo
-rhagosodedig i rhwybeth arall yn lle Cyfyngedig
-os hoffech chi.</translation>
+ <location line="+12"/>
+ <source>Export content</source>
+ <translation type="unfinished">Allforio Dyfais fel ...</translation>
</message>
<message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">Mae'r gludfwrdd yn wag</translation>
+ <location line="+2"/>
+ <source><qt>Choose which tracks or segments to export</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">Mewnosod cynnyws y gludfwrdd...</translation>
+ <location line="+1"/>
+ <source>All tracks</source>
+ <translation type="unfinished">Ymladd</translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">Codi buaneddau...</translation>
+ <location line="+1"/>
+ <source>Non-muted tracks</source>
+ <translation type="unfinished">Ymladd</translation>
</message>
<message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">Iselhau buaneddau...</translation>
+ <location line="+1"/>
+ <source>Selected track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Gosod Buaneddau Digwyddiadau</translation>
+ <location line="+1"/>
+ <source>Selected segments</source>
+ <translation type="unfinished">Dewis &Pob Cylchran</translation>
</message>
<message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Gosod Buaneddau...</translation>
+ <location line="+3"/>
+ <source>Export track staff brackets</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Unknown note insert action %1</source>
- <translation type="obsolete">Gweithrediad anhysbys %1 wrth fewnosod nodyn</translation>
+ <location line="+2"/>
+ <source><qt>Track staff brackets are found in the <b>Track Parameters</b> box, and may be used to group staffs in various ways</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">Mewnosod nodyn</translation>
+ <location line="+6"/>
+ <source>Advanced/Experimental options</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Ornament bar %1</source>
- <translation type="obsolete">Cylch&rannau</translation>
+ <location line="+11"/>
+ <source>Compatibility level</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Enw'r arwydd</translation>
+ <location line="+2"/>
+ <source><qt>Set the MusicXML version you want export</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Remove Ornaments</source>
- <translation type="obsolete">&Gwaredu Pob Arwydd</translation>
+ <location line="+9"/>
+ <source><qt><p>Choose the format of the MusicXML file.</p><p>The "partwise" format contains "part" elements that contain "measure" elements. The "timewise" format reverses this ordering.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Estimated key signature shown</source>
- <translation type="obsolete">Dangos arwydd cywair wedi'i amcangyfrif</translation>
+ <location line="+6"/>
+ <source>Export grand staff instrument</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Dangos arwydd amseriad wedi'i amcangyfrif</translation>
+ <location line="+6"/>
+ <source><qt>Choose which bracket will create a grand staff system</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Can't insert note: No note duration selected</source>
- <translation type="obsolete">Dim parhad nodau wedi'i ddewis</translation>
+ <location line="+9"/>
+ <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Amser: %1 (%2.%3s)</translation>
+ <location line="+6"/>
+ <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">Parhad</translation>
+ <location line="-29"/>
+ <source>MusicXML type</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Tripled</translation>
+ <location line="+10"/>
+ <source>None</source>
+ <translation type="unfinished">Dim</translation>
</message>
<message>
- <source>Chord</source>
- <translation type="obsolete">Cord</translation>
+ <location line="+7"/>
+ <source>Don't export percussion tracks</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Grace</source>
- <translation type="obsolete">Gwyrdd</translation>
+ <location line="+8"/>
+ <source>Use "<octave-shift>" for transposing instruments</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Transpose</source>
- <translation type="obsolete">Trawsgyweirio</translation>
+ <location line="+45"/>
+ <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::NameSetEditor</name>
<message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Mewnosod faint o hanner-tonau i drawsgyweirio:</translation>
+ <location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
+ <source>Provided by</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -18509,13 +17821,13 @@ os hoffech chi.</translation>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation type="unfinished">Nodiant</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation type="unfinished">Modd haenlun rhagosodedig</translation>
</message>
@@ -18545,14 +17857,6 @@ os hoffech chi.</translation>
<translation type="unfinished">Arferol</translation>
</message>
<message>
- <source>Default duration factor</source>
- <translation type="obsolete">Parhad</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Dim</translation>
- </message>
- <message>
<location line="+12"/>
<source>Show track headers (linear layout only)</source>
<translation type="unfinished"></translation>
@@ -18764,10 +18068,6 @@ os hoffech chi.</translation>
<translation type="unfinished">Maint ffont i olygon erwydd lluosol</translation>
</message>
<message>
- <source>Font size for printing (pt)</source>
- <translation type="obsolete">Maint wynebfath ar gyfer argraffu (pt)</translation>
- </message>
- <message>
<location line="+18"/>
<source>Text font</source>
<translation type="unfinished">Testun:</translation>
@@ -19078,14 +18378,6 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<context>
<name>Rosegarden::NotationView</name>
<message>
- <source>Starting...</source>
- <translation type="obsolete">Dechrau...</translation>
- </message>
- <message>
- <source>Preparing to print...</source>
- <translation type="obsolete">Paratoi argraffu...</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NotationView.cpp" line="+121"/>
<source>Note &Font</source>
<translation type="unfinished">&Ffont i'r Nodau</translation>
@@ -19100,14 +18392,6 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<source>S&pacing</source>
<translation type="unfinished">B&ylchu</translation>
</message>
- <message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Parhad</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Dim</translation>
- </message>
<message numerus="yes">
<location line="-8"/>
<source>%n pixel(s)</source>
@@ -19117,7 +18401,7 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation type="unfinished">Ffont:</translation>
</message>
@@ -19137,48 +18421,12 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<translation type="unfinished">Bylchu:</translation>
</message>
<message>
- <source> Ready.</source>
- <translation type="obsolete"> Yn Barod.</translation>
- </message>
- <message>
- <source>Laying out score...</source>
- <translation type="obsolete">Haenlunio'r sgor...</translation>
- </message>
- <message>
- <source>Laying out staff %1...</source>
- <translation type="obsolete">Haenlunio erwydd %1...</translation>
- </message>
- <message>
- <source>Reconciling staffs...</source>
- <translation type="obsolete">Cysoni erwyddau...</translation>
- </message>
- <message>
- <location line="-115"/>
+ <location line="-117"/>
<source> No selection </source>
<translation type="unfinished"> Dim dewisiad</translation>
</message>
<message>
- <source>Sizing and allocating canvas...</source>
- <translation type="obsolete">Meintio a dosrannu'r cynfas...</translation>
- </message>
- <message>
- <source>note</source>
- <translation type="obsolete">nodyn</translation>
- </message>
- <message>
- <source>rest</source>
- <translation type="obsolete">saib</translation>
- </message>
- <message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">Parhad</translation>
- </message>
- <message>
- <source>Triplet</source>
- <translation type="obsolete">Tripled</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation type="unfinished">Cord</translation>
</message>
@@ -19195,53 +18443,21 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<translation type="unfinished">&%1%2</translation>
</message>
<message>
- <source>Hidden annotations</source>
- <translation type="obsolete">Anodiadau cudd</translation>
- </message>
- <message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation type="unfinished">Gweithrediad bylchu anhysbys %1</translation>
</message>
<message>
- <source>Unknown proportion action %1</source>
- <translation type="obsolete">Gweithrediad ffont anhysbys %1</translation>
- </message>
- <message>
<location line="-51"/>
<source>Unknown font action %1</source>
<translation type="unfinished">Gweithrediad ffont anhysbys %1</translation>
</message>
<message>
- <source>Unknown font size %1</source>
- <translation type="obsolete">Maint ffont anhysbys %1</translation>
- </message>
- <message>
<location line="+26"/>
<source>Unknown font size action %1</source>
<translation type="unfinished">Gweithrediad maint ffont anhysbys %1</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">Argraffu...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Rhagolygu...</translation>
- </message>
- <message>
- <source>Printing LilyPond file...</source>
- <translation type="obsolete">Allforio ffeil Lilypond...</translation>
- </message>
- <message>
- <source>Failed to open a temporary file for LilyPond export.</source>
- <translation type="obsolete">Dewis un neu mwy o Ffeiliau Sain</translation>
- </message>
- <message>
- <source>Previewing LilyPond file...</source>
- <translation type="obsolete">Allforio ffeil Lilypond...</translation>
- </message>
- <message>
<location line="-147"/>
<source>LilyPond Preview Options</source>
<translation type="unfinished">Maint ffont Lilypad</translation>
@@ -19252,37 +18468,17 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<translation type="unfinished">Maint ffont Lilypad</translation>
</message>
<message>
- <source>Exporting LilyPond file...</source>
- <translation type="obsolete">Allforio ffeil Lilypond...</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Methodd yr allforio. Methu agor y ffeil i ysgrifennu.</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">Torri'r dewisiad i'r gludfwrdd... </translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">Dileu'r dewisiad...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">Copio'r dewisiad i'r gludfwrdd...</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation type="unfinished">Mae'r gludfwrdd yn wag</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation type="unfinished">Methu gludo Cylchrannau lluosol i mewn i un</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -19295,23 +18491,22 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+88"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation type="unfinished"></translation>
</message>
@@ -19326,29 +18521,29 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation type="unfinished">Mewnosod cynnyws y gludfwrdd...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation type="unfinished">Methu gludo wrth y fan yma.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation type="unfinished">Wedi cael digwyddiad tu allan o Gylchran</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation type="unfinished">Codi buaneddau...</translation>
</message>
@@ -19358,15 +18553,7 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<translation type="unfinished">Iselhau buaneddau...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Gosod Buaneddau Digwyddiadau</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Gosod Buaneddau...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation type="unfinished"></translation>
</message>
@@ -19381,11 +18568,7 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<translation type="unfinished">Dat-ehangu nodau...</translation>
</message>
<message>
- <source>No note duration selected</source>
- <translation type="obsolete">Dim parhad nodau wedi'i ddewis</translation>
- </message>
- <message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished">Gweithrediad anhysbys %1 wrth fewnosod nodyn</translation>
</message>
@@ -19395,29 +18578,13 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<translation type="unfinished">Mewnosod nodyn</translation>
</message>
<message>
- <source>No rest duration selected</source>
- <translation type="obsolete">Dim parhad saib wedi'i ddewis</translation>
- </message>
- <message>
- <source>No note or rest duration selected</source>
- <translation type="obsolete">Dim parhad saib wedi'i ddewis</translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">Cwanteiddio...</translation>
- </message>
- <message>
- <source>Interpreting selection...</source>
- <translation type="obsolete">Dehongli dewisiad...</translation>
- </message>
- <message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation type="unfinished">Ychwanegu crescendo...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation type="unfinished"></translation>
</message>
@@ -19427,10 +18594,6 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<translation type="unfinished">Cylch&rannau</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Enw'r arwydd</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation type="unfinished"></translation>
@@ -19466,7 +18629,7 @@ Nam yw hwn (o'r blaen, buasai'r rhaglen wedi chwalu erbyn rwan).</tran
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation type="unfinished"></translation>
@@ -19477,7 +18640,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished">Dangos arwydd amseriad wedi'i amcangyfrif</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation type="unfinished"></translation>
</message>
@@ -19510,7 +18673,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished">Mewnosod faint o hanner-tonau i drawsgyweirio:</translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation type="unfinished">Amser: %1 (%2.%3s)</translation>
</message>
@@ -19559,16 +18722,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Cycling slashes...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation type="unfinished">Dim parhad nodau wedi'i ddewis</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation type="unfinished"></translation>
</message>
@@ -19593,7 +18751,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
@@ -20407,10 +19565,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<context>
<name>Rosegarden::ProgressDialog</name>
<message>
- <source>Processing...</source>
- <translation type="obsolete">Prosesu...</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/ProgressDialog.cpp" line="+65"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
@@ -20607,13 +19761,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">rheolydd %1</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -20701,12 +19848,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation type="unfinished">Dim</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation type="unfinished">2-yn-amseriad-3</translation>
</message>
@@ -20751,10 +19898,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished">Ar ol cwanteiddio</translation>
</message>
<message>
- <source>Show advanced options</source>
- <translation type="obsolete">Dangos &Anodiadau</translation>
- </message>
- <message>
<location line="+6"/>
<source>Re-beam</source>
<translation type="unfinished">Ail-drawstio</translation>
@@ -20775,18 +19918,10 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished">Hollti-a-clymu cordiau sy'n croesi</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation type="unfinished">Cwanteiddydd Rhwydell</translation>
</message>
- <message>
- <source>Show Advanced Options</source>
- <translation type="obsolete">Dangos &Anodiadau</translation>
- </message>
- <message>
- <source>Hide Advanced Options</source>
- <translation type="obsolete">Anodiadau cudd</translation>
- </message>
</context>
<context>
<name>Rosegarden::RawNoteRuler</name>
@@ -21098,12 +20233,6 @@ There may be some incompatibilities with the file format.</source>
<context>
<name>Rosegarden::RosegardenDocument</name>
<message>
- <source>The current file has been modified.
-Do you want to save it?</source>
- <translation type="obsolete">Mae'r ffeil cyfredol wedi'i addasu.
-Ydych eisiau ei gadw?</translation>
- </message>
- <message>
<location filename="../../src/document/RosegardenDocument.cpp" line="+345"/>
<source>Rosegarden - Warning</source>
<translation type="unfinished"></translation>
@@ -21126,8 +20255,8 @@ Ydych eisiau ei gadw?</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -21139,7 +20268,7 @@ Ydych eisiau ei gadw?</translation>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation type="unfinished"></translation>
</message>
@@ -21211,7 +20340,12 @@ Please select any you wish to delete permanently from the hard disk.
<translation type="unfinished">Cyfuno</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation type="unfinished"></translation>
</message>
@@ -21226,7 +20360,7 @@ Please select any you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
@@ -21238,11 +20372,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Cadw ffeil...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation type="unfinished"></translation>
</message>
@@ -21321,11 +20451,7 @@ er mwyn sicrhau y bydd o'n dal i gael ei ail-lwytho mewn fersiynau dyfodol.
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <source>No non-audio segments in composition</source>
- <translation type="obsolete">Dim cylchrannau di-sain yn y cyfansoddiad</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation type="unfinished">Rhaid i'r dewisiad gynnwys dim ond cylchrannau sain neu di-sain</translation>
</message>
@@ -21336,7 +20462,7 @@ er mwyn sicrhau y bydd o'n dal i gael ei ail-lwytho mewn fersiynau dyfodol.
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -21345,7 +20471,7 @@ er mwyn sicrhau y bydd o'n dal i gael ei ail-lwytho mewn fersiynau dyfodol.
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -21365,7 +20491,7 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -21375,10 +20501,6 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Allforio ffeil sain ...</translation>
- </message>
- <message>
<location line="+28"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation type="unfinished"></translation>
@@ -21438,14 +20560,14 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished">Dechrau...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation type="unfinished">Chwyddo:</translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation type="unfinished">&%1%2</translation>
@@ -21474,12 +20596,12 @@ Ydych eisiau ei agor yn lle?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -21518,12 +20640,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -21543,33 +20665,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation type="unfinished">Pob ffeil</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation type="unfinished">Agor Ffeil</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation type="unfinished"></translation>
</message>
@@ -21579,16 +20701,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation type="unfinished">Methu agor ffeil '%1'</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation type="unfinished">Cadw ffeil...</translation>
</message>
@@ -21628,14 +20750,6 @@ Error was : %2</source>
<translation type="unfinished">Cau'r ffeil...</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">Argraffu...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Rhagolygu...</translation>
- </message>
- <message>
<location line="+13"/>
<source>Exiting...</source>
<translation type="unfinished">Terfynu...</translation>
@@ -21693,12 +20807,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2767"/>
+ <location line="-2756"/>
<source>Jog Selection</source>
<translation type="unfinished">Gwaredu'r Dewisiad</translation>
</message>
@@ -21745,12 +20859,12 @@ Error was : %2</source>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation type="unfinished">Gosod Tempo Eang</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation type="unfinished">Dangos/cuddio'r bar offer...</translation>
</message>
@@ -21818,12 +20932,12 @@ Cylchrannau -> Dat-ehangu Cylchrannau.
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -21833,13 +20947,13 @@ Cylchrannau -> Dat-ehangu Cylchrannau.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21863,8 +20977,8 @@ Cylchrannau -> Dat-ehangu Cylchrannau.
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21874,7 +20988,7 @@ Cylchrannau -> Dat-ehangu Cylchrannau.
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21892,8 +21006,8 @@ Cylchrannau -> Dat-ehangu Cylchrannau.
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21902,12 +21016,12 @@ Cylchrannau -> Dat-ehangu Cylchrannau.
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation type="unfinished"></translation>
</message>
@@ -21917,7 +21031,7 @@ Cylchrannau -> Dat-ehangu Cylchrannau.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation type="unfinished">Agor Ffeil MIDI</translation>
</message>
@@ -21927,12 +21041,12 @@ Cylchrannau -> Dat-ehangu Cylchrannau.
<translation type="unfinished">Cyfuno Ffeil MIDI</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation type="unfinished">Mewnforio ffeil MIDI...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation type="unfinished">Enrhifo nodiant...</translation>
</message>
@@ -21964,59 +21078,23 @@ Cylchrannau -> Dat-ehangu Cylchrannau.
<translation type="unfinished"></translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Agor Ffeil Rosegarden 2.1</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Mewnforio ffeil Rosegarden 2.1...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Methu llwytho'r ffeil Rosegarden 2.1. Ymddengys ei fod yn llygredig.</translation>
- </message>
- <message>
- <source>Export and import of Rosegarden Project files</source>
- <translation type="obsolete">Mewnforio ffeil Rosegarden 2.1...</translation>
- </message>
- <message>
- <source>The Rosegarden Project Packager helper script</source>
- <translation type="obsolete">Ffeiliau Rosegarden-4</translation>
- </message>
- <message>
- <source>Notation previews through LilyPond</source>
- <translation type="obsolete">Allforio ffeil Lilypond...</translation>
- </message>
- <message>
- <source>%1 - for LilyPond preview support</source>
- <translation type="obsolete">Maint ffont Lilypad</translation>
- </message>
- <message>
- <source>%1 - for audio file import</source>
- <translation type="obsolete">Llwybr ffeil sain:</translation>
- </message>
- <message>
- <source><ul></source>
- <translation type="obsolete">(rhagosod)</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation type="unfinished"></translation>
@@ -22063,7 +21141,7 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation type="unfinished"></translation>
@@ -22076,7 +21154,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -22084,7 +21162,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation type="unfinished">Allforio fel...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -22100,7 +21178,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -22167,14 +21245,14 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation type="unfinished">Allforio ffeil MusicXML...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation type="unfinished">Ffeiliau XML</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-936"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation type="unfinished"></translation>
@@ -22191,7 +21269,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1008"/>
+ <location line="+1003"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -22275,7 +21353,7 @@ Would you like to set it now?</source>
<translation type="unfinished">Mewnosod label newydd</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation type="unfinished">Chwarae</translation>
</message>
@@ -22285,7 +21363,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation type="unfinished"></translation>
</message>
@@ -22356,7 +21434,7 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5907"/>
+ <location line="-5853"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -22371,7 +21449,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation type="unfinished">Dileu'r priodwedd yma</translation>
</message>
@@ -22423,7 +21501,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation type="unfinished">Newid Lliw'r Gylchran...</translation>
</message>
@@ -22466,7 +21544,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation type="unfinished"></translation>
</message>
@@ -22499,7 +21577,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">&Uno</translation>
</message>
@@ -22507,7 +21585,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation type="unfinished">Ail-&labelu...</translation>
</message>
@@ -22544,22 +21622,22 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation type="unfinished">Symud Cylchran</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation type="unfinished">Symud Cylchrannau</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation type="unfinished"></translation>
</message>
@@ -22754,12 +21832,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation type="unfinished">Recordio ai MIDI neu sain</translation>
</message>
@@ -22835,7 +21913,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
@@ -22857,17 +21935,17 @@ Would you like to set it now?</source>
<translation type="unfinished">Creu rhagolwg sain ....</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Ail-feintio Digwyddiad</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation type="unfinished"></translation>
</message>
@@ -22877,7 +21955,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation type="unfinished"></translation>
</message>
@@ -22890,25 +21968,17 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation type="unfinished">Newid i Erfyn Dewis</translation>
</message>
- <message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation type="unfinished">
- <numerusform>
- </numerusform>
- </translation>
- </message>
<message>
- <location line="+154"/>
+ <location line="+348"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation type="unfinished"></translation>
</message>
@@ -22937,8 +22007,15 @@ Would you like to set it now?</source>
<source>Click and drag to copy segments</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <location line="-287"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <location line="+6"/>
+ <location line="+293"/>
<source>Click and drag to copy segment</source>
<translation type="unfinished"></translation>
</message>
@@ -23008,24 +22085,12 @@ Would you like to set it now?</source>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Hollti Cylchran</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23852,26 +22917,6 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">C#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">F#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">G#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location line="-276"/>
<source>%1: %2</source>
<translation type="unfinished">&%1%2</translation>
@@ -23883,13 +22928,6 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
</context>
<context>
- <name>Rosegarden::Studio</name>
- <message>
- <source>Audio</source>
- <translation type="obsolete">Sain</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SustainInsertionCommand</name>
<message>
<location filename="../../src/commands/notation/SustainInsertionCommand.h" line="+51"/>
@@ -24763,7 +23801,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation type="unfinished"><dim offeryn></translation>
</message>
@@ -24778,7 +23816,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation type="unfinished"><di-deitl></translation>
</message>
<message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation type="unfinished">Ymladd</translation>
</message>
@@ -24791,39 +23829,31 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Trosi Cylchran wedi ei Ailadrodd i mewn i Copiau go Iawn</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Trosi Cylchrannau wedi ei Ailadrodd i mewn i Copiau go Iawn</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -24869,7 +23899,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation type="unfinished">Tra&ciau</translation>
</message>
@@ -24880,12 +23910,12 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation type="unfinished"><di-deitl></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation type="unfinished">Safon chwarae =</translation>
</message>
@@ -25026,117 +24056,173 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Trebl</translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Bas</translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Wythfed &Is</translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Di&leu</translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished">S&forzando</translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Alto</translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Tenor</translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Amrywiad</translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Amrywiad</translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Bas</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>treble</source>
+ <translation type="obsolete">Trebl</translation>
+ </message>
+ <message>
+ <source>bass</source>
+ <translation type="obsolete">Bas</translation>
+ </message>
+ <message>
+ <source>crotales</source>
+ <translation type="obsolete">Wythfed &Is</translation>
+ </message>
+ <message>
+ <source>celesta</source>
+ <translation type="obsolete">Di&leu</translation>
+ </message>
+ <message>
+ <source>mezzosoprano</source>
+ <translation type="obsolete">S&forzando</translation>
+ </message>
+ <message>
+ <source>alto</source>
+ <translation type="obsolete">Alto</translation>
+ </message>
+ <message>
+ <source>tenor</source>
+ <translation type="obsolete">Tenor</translation>
+ </message>
+ <message>
+ <source>baritone</source>
+ <translation type="obsolete">Amrywiad</translation>
+ </message>
+ <message>
+ <source>varbaritone</source>
+ <translation type="obsolete">Amrywiad</translation>
+ </message>
+ <message>
+ <source>subbass</source>
+ <translation type="obsolete">Bas</translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation type="unfinished">Trawsgyweirio</translation>
</message>
@@ -25177,7 +24263,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation type="unfinished">Sain</translation>
@@ -25809,24 +24895,6 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
</context>
<context>
- <name>RosegardenApplication</name>
- <message>
- <source>Rosegarden - A sequencer and musical notation editor</source>
- <translation type="obsolete">Rosegarden - Dilyniannydd a golygydd nodiant cerddorol</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">%1 (wedi'i recordio)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/de.ts b/data/locale/de.ts
index b8ee79d..2c10469 100644
--- a/data/locale/de.ts
+++ b/data/locale/de.ts
@@ -48,10 +48,6 @@
<translation>Voreingestelltes Wiedergabe Gerät</translation>
</message>
<message>
- <source><qt><p>Create new playback devices here. Click the device name to change it. Select a device here and connect it to a MIDI output port by clicking on a port to the right.</p></qt></source>
- <translation type="obsolete"><qt><p>Hier kann ein neues Wiedergabegerät angelegt werden. Durch anklicken des Gerätenamens kann dieser geändert werden. Durch anklicken eines Ports auf der rechten Seite kann ein Gerät ausgewählt und mit einem MIDI Ausgang verbunden werden.</p></qt></translation>
- </message>
- <message>
<location line="+44"/>
<location filename="../../src/gui/studio/DeviceManagerDialogUi.h" line="+7"/>
<source><qt><p>Bank definitions allow you to tell Rosegarden about the programs or patches available for use on the equipment (hardware or software synth) connected to this device.</p><p>You must have something defined for any program or bank changes you wish to transmit, as Rosegarden hides all bank and program numbers that are undefined.</p></qt></source>
@@ -297,10 +293,6 @@
<translation>Ausklingen - %1 abwechselnd auf Max und Min setzen, dabei bis auf 0 verringern</translation>
</message>
<message>
- <source>Half-wave crescendo - set %1 rising from min to max n a half sine wave contour</source>
- <translation type="obsolete">Halbwellen Crescendo - setzte %1 aufsteigend von min bis max in einer halben Sinuswelle als Einhüllende</translation>
- </message>
- <message>
<location filename="../../src/base/parameterpattern/HalfSinePattern.cpp" line="+28"/>
<source>Half-wave crescendo - set %1 rising from min to max in a half sine wave contour</source>
<translation type="unfinished"></translation>
@@ -339,23 +331,23 @@
<translation>Die Schriftartenübersetzungsdatei %1 kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&Datei</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>&Audiodatei hinzufügen...</translation>
</message>
@@ -365,37 +357,37 @@
<translation>Audiodatei &exportieren...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>Schlie&ßen</translation>
</message>
<message>
- <location line="-4676"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Editieren</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>Audiodatei hera&usnehmen</translation>
</message>
@@ -420,155 +412,151 @@
<translation>Vorschau spielen</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>&Hilfe</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">&Rosegarden Handbuch</translation>
- </message>
- <message>
- <location line="-3206"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3121"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>Richtlinien für Fehler&berichte</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>Ãœber Roseg&arden</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Allgemeine Symbolleiste</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>&Nichts rückgängig zu machen</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2636"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>Nichts zu wiederh&olen</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2530"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>&Kopieren</translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>&Einfügen</translation>
</message>
<message>
- <location line="-4369"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2802"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Zum Auswahlwerkzeug wechseln</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Zum Einfügen von Noten wechseln</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Zum Löschwerkzeug wechseln</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>&Speichern</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="-1382"/>
<source>&Insert Event</source>
<translation>Event e&infügen</translation>
</message>
@@ -588,33 +576,33 @@
<translation>Er&weiterter Event-Editor</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>A&usschneiden</translation>
</message>
<message>
- <location line="-4206"/>
+ <location line="-1366"/>
<source>&Select All</source>
<translation>Alle&s auswählen</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+281"/>
+ <location line="-1114"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>Auswah&l entfernen</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1363"/>
+ <location line="-1114"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>&Filter-Auswahl</translation>
</message>
<message>
- <location line="-1644"/>
+ <location line="-1435"/>
<source>Set Se&gment Start Time...</source>
<translation>Se&gment Anfangszeiten setzen...</translation>
</message>
@@ -624,82 +612,82 @@
<translation>Seg&ment Dauer setzen...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Anzeige</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>&Musikalische Zeiten</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>&Reale Zeiten</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>&Unveränderte Zeit</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Se&gment</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Editieren mi&t</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Im Matri&xeditor öffnen</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Im &Notationseditor öffnen</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>Ãœber &QT</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>&Segno hinzufügen</translation>
</message>
@@ -729,7 +717,7 @@
<translation>Gepunktete ha&lbe Note</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>Zu &Noten umschalten</translation>
</message>
@@ -749,7 +737,7 @@
<translation>Umschaltun&g Punktierung aus</translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>&Symbole-Symbolleiste anzeigen</translation>
</message>
@@ -759,7 +747,7 @@
<translation>Ebenen-S&ymbolleiste anzeigen</translation>
</message>
<message>
- <location line="+1539"/>
+ <location line="+1540"/>
<source>Duration Toolbar</source>
<translation>Dauer-Symbolleiste</translation>
</message>
@@ -769,41 +757,41 @@
<translation>Symbole-Symbolleiste</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+2059"/>
+ <location line="-2438"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>Return</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="-353"/>
+ <location line="+29"/>
<source>Ctrl+Shift+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+T</translation>
@@ -815,11 +803,6 @@
<translation>Ctrl+D</translation>
</message>
<message>
- <source>Enter, Media Play, Ctrl+Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Enter, Media Play, Ctrl+Return</translation>
- </message>
- <message>
<location line="+132"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
@@ -867,7 +850,7 @@
<translation>End</translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>Zeige Symbolleis&te</translation>
</message>
@@ -877,39 +860,39 @@
<translation>St&atusanzeige verstecken</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Aktion-Symbolleiste</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Zeit-Symbolleiste</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Bedienfeld-Symbolleiste </translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Zoom-Symbolleiste</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -959,7 +942,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Markierung einfügen</translation>
</message>
@@ -979,42 +962,42 @@
<translation>Markierung editieren</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2747"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Zum Bewegungswerkzeug wechseln</translation>
</message>
<message>
- <location line="-1279"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4706"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Zum Zeichenwerkzeug wechseln</translation>
</message>
<message>
- <location line="-1252"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4697"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Zum Größenänderungswerkzeug wechseln</translation>
</message>
<message>
- <location line="-1133"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4641"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>&Löschen</translation>
</message>
<message>
- <location line="-4082"/>
+ <location line="-1755"/>
<source>&Grid</source>
<translation>&Raster</translation>
</message>
@@ -1090,57 +1073,57 @@
</message>
<message>
<location line="+41"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&Komposition</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Te&mpoänderung hinzufügen...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>Änderun&g der Taktart hinzufügen... </translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Im &Eventlisteneditor öffnen</translation>
</message>
<message>
- <location line="-3737"/>
- <location line="+1570"/>
+ <location line="-2477"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>An&passen</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Quantisieren</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>&Quantisieren...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>Letzte Quantisierung wiede&rholen</translation>
</message>
@@ -1151,36 +1134,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>Gleich hohe Not&en zusammenfassen</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>Jog nach &links</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>&Jog nach rechts</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>Anschlagstärke er&höhen</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>Anschlagstärke ve&rringern </translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation>Aktuelle Anschlagstärke &setzen</translation>
</message>
@@ -1196,339 +1179,331 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>Dauer &halbieren</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>&Dauer verdoppeln</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>&Strecken oder Stauchen...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>Trans&ponieren</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>Halbton a&ufwärts</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>Halbton a&bwärts</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>&Oktave höher</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>Okta&ve herunter</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>&Transponiere um Halbtonschritte...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Transponiere um ein &Interval...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>Auswahl sp&iegeln</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>Tonhöhenverlauf sp&iegeln</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>&Zeitlich spiegeln (retro)</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>Zei&tlich und tonhöhig spiegeln</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>Trigger Se&gment...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>&Werkzeuge</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>Au&swählen und editieren</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>&Zeichnen</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>&Löschen</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Bewegen</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>&Größe ändern</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>&Aufteilen</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>Ans&chlagstärke</translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation>Cursor zurück und auswäh&len</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>Cursor vorwärt&s und auswählen </translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>S&chleife auswählen</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>Schleife l&öschen</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>&Bedienfeld</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>&Wiedergabe</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&Stop</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>&Zurückspulen</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Schnelles &Vorspulen</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Zum An&fang zurückspulen</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Schnell zum &Ende spulen</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>S&olo</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>Ansicht fo&lgt der Wiedergabe</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>&Panik</translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>&Obere Oktave</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>A&kkord-Einfügemodus</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>Schritt&weise Aufnahme</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>&Symbolleisten</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>L&ineale</translation>
</message>
<message>
- <location line="-3397"/>
+ <location line="-2611"/>
<source>Select &All Events</source>
<translation>&Alle Events auswählen</translation>
</message>
<message>
<location line="+116"/>
- <location line="+1301"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>&Akkordnamenlineal anzeigen</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>&Tempolineal anzeigen</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>Leiste für A&nschlagstärke zeigen</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Zeige Lineal für Tonhöhen-&Änderung</translation>
</message>
<message>
- <location line="-409"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1604"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Werkzeug-Symbolleiste</translation>
</message>
<message>
- <location line="-2815"/>
- <location line="+2123"/>
+ <location line="-3129"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Lineal-Symbolleiste</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">Nichts rückgängig z&u machen</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Nichts zu wiede&rholen</translation>
- </message>
- <message>
- <location line="-3028"/>
+ <location line="-4224"/>
<source>Show To&ols</source>
<translation>&Werkzeuge anzeigen</translation>
</message>
@@ -1538,14 +1513,14 @@
<translation>&Trigger löschen</translation>
</message>
<message>
- <location line="+851"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="+982"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>&Aufnehmen</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>Ein&stellungen</translation>
</message>
@@ -1630,7 +1605,7 @@
<translation>Zeige nicht z&ugeordnete Fader</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Zum Einfüge-Werkzeug umschalten</translation>
</message>
@@ -1640,13 +1615,13 @@
<translation>Pausen nach Löschen zusammenfassen</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>&Drucken...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>Vorschau d&rucken...</translation>
</message>
@@ -1741,21 +1716,21 @@
<translation>&Zeige Spur Anfang</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Im &Percussion Matrix Editor öffnen</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>Schlüsselveränderung hinzu&fügen...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>&Tonartveränderung hinzufügen...</translation>
</message>
@@ -1770,13 +1745,13 @@
<translation>Pedalf&reigabe hinzufügen</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>&Umwandeln der Notation für ...</translation>
</message>
<message>
- <location line="-2184"/>
+ <location line="-74"/>
<source>Search and Selec&t</source>
<translation type="unfinished"></translation>
</message>
@@ -1786,7 +1761,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>N&ote</source>
<translation>N&ote/n</translation>
</message>
@@ -2083,8 +2058,8 @@
<translation>Notenhälse wiede&rherstellen</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>Sa&tz (phrase)</translation>
</message>
@@ -2154,14 +2129,14 @@
<translation>Bindebogen unterhal&b</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>&Festmachen</translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>&Lösen</translation>
</message>
@@ -2326,13 +2301,13 @@
<translation>Feines Ti&ming</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>Jog nach &rechts</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>Sicht&barkeit</translation>
</message>
@@ -2377,26 +2352,26 @@
<translation>Nächste Notenzeile a&bwärts</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>&Vorheriges Segment</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>&Nächstes Segment</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>Schritt &zurück</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>Schritt &vorwärts</translation>
</message>
@@ -2541,14 +2516,14 @@
<translation>&Gitarrenakkord</translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>Note e&infügen</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>&Untere Oktave</translation>
</message>
@@ -2568,13 +2543,13 @@
<translation>Eingabe&modus für Verzierungen</translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>&Werkzeug-Symbolleiste anzeigen</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>Vor&zeichen-Symbolleiste anzeigen</translation>
</message>
@@ -2594,18 +2569,18 @@
<translation>&Gruppen-Symbolleiste anzeigen</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>&Bedienfeld-Symbolleiste anzeigen</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>&Layout-Symbolleiste anzeigen</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+O</translation>
@@ -2618,13 +2593,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Ins</translation>
@@ -2635,7 +2610,7 @@
<translation>&Akkordnamenlineal anzeigen</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation>&Rohnotenlineal anzeigen</translation>
</message>
@@ -2650,7 +2625,7 @@
<translation>Zeige Lily&Pond Anweisungen</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>Schlüssel-Symbolleiste</translation>
</message>
@@ -2670,42 +2645,42 @@
<translation>Vortragszeichen-Symbolleiste</translation>
</message>
<message>
- <location line="-3023"/>
+ <location line="-4219"/>
<source>Show T&ransport Toolbar</source>
<translation>&Bedienfeld-Symbolleiste anzeigen</translation>
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>Rosegarden &Handbuch</translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>Einstellungen...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="-826"/>
<source>Cursor Back and Se&lect</source>
<translation>Cursor zurück und auswäh&len</translation>
</message>
<message>
- <location line="+1074"/>
- <location line="+1996"/>
+ <location line="+1523"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>&Einstellungen...</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation>&Lineal-Symbolleiste anzeigen</translation>
</message>
<message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>Schritt zurück (links)</translation>
</message>
@@ -2715,30 +2690,30 @@
<translation>Wiedergabe</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>Schritt vorwärts (rechts)</translation>
</message>
<message>
- <location line="-2680"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-3611"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="-4678"/>
+ <location line="-945"/>
<source>&Action</source>
<translation>&Aktion</translation>
</message>
@@ -2758,224 +2733,224 @@
<translation>Hilfe</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-1680"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation>F1</translation>
</message>
<message>
- <location line="-4686"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-4368"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2595"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4365"/>
+ <location line="-2765"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4392"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-2671"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location line="-4420"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="-2823"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation>Delete</translation>
</message>
<message>
- <location line="-4270"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-2728"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4428"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-3873"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4206"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-2674"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4401"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-2725"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4120"/>
- <location line="+1363"/>
+ <location line="-2540"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1563"/>
- <location line="+36"/>
+ <location line="-2871"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation>F2</translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3923"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation>F5</translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4706"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation>F3</translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4697"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation>F4</translation>
</message>
<message>
- <location line="-4078"/>
+ <location line="-4463"/>
<source>Nothing to &Undo</source>
<translation>Nichts rückgängig zu machen (&U)</translation>
</message>
@@ -2985,181 +2960,181 @@
<translation>Nichts zu wiederholen (&R)</translation>
</message>
<message>
- <location line="+43"/>
- <location line="+4120"/>
+ <location line="-151"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Delete, Ctrl+D</translation>
</message>
<message>
- <location line="-3804"/>
- <location line="+1724"/>
+ <location line="+316"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>&Tonhöhen-Sequenz eingeben...</translation>
</message>
<message>
- <location line="-2000"/>
- <location line="+2350"/>
+ <location line="-3196"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation>0</translation>
</message>
<message>
- <location line="-2340"/>
- <location line="+2331"/>
+ <location line="-3536"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2321"/>
- <location line="+2312"/>
+ <location line="-3517"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2302"/>
- <location line="+2293"/>
+ <location line="-3498"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation>8</translation>
</message>
<message>
- <location line="-2283"/>
- <location line="+2274"/>
+ <location line="-3479"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2264"/>
- <location line="+2255"/>
+ <location line="-3460"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2246"/>
- <location line="+2237"/>
+ <location line="-3442"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2228"/>
- <location line="+2219"/>
+ <location line="-3424"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2205"/>
- <location line="+1302"/>
+ <location line="-3401"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>&Kontroll Lineal hinzufügen</translation>
</message>
<message>
- <location line="-1261"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2456"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation>=</translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation>+</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation>-</translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Left</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Right</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Up</translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Down</translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation>Up</translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation>Down</translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Up</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Down</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Alt+I</translation>
@@ -3172,705 +3147,701 @@
</message>
<message>
<location line="+6"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation>Regler Event ausschneiden (&X)</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation>Regler Event kopieren (&C)</translation>
</message>
<message>
- <source>Paste Events (&V)</source>
- <translation type="obsolete">Regler Event einfügen (&V)</translation>
- </message>
- <message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation>Regler für jede Note platzieren (&P)</translation>
</message>
<message>
- <location line="-1712"/>
- <location line="+1724"/>
+ <location line="-2908"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Left</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Right</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>Cursor einen &Takt zurück und auswählen</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Left</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>Cursor vor&wärts und auswählen</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Right</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+;</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgUp</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgDown</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation>Left</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation>Right</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Left</translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Right</translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation>Pause</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation>F7</translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>II Kreuz</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II b</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation>S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II Kreuz</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III b</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV Kreuz</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V b</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V Kreuz</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI b</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI Kreuz</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII b</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation>L</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+E</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation>R</translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Shift+R</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation>U</translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+I</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+I</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation>Y</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Y</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+X</translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation>X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Shift+X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation>V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Shift+V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation>N</translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+M</translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation>M</translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation>H</translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation>&Rosegarden Handbuch</translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation>&Nichts rückgängig zu machen</translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation>Nichts zu wiederh&olen</translation>
</message>
<message>
- <location line="-2588"/>
+ <location line="+43"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Shift+X</translation>
@@ -3887,7 +3858,7 @@
<translation>Taktschläge raten (&G)</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Add Clef Change in This Link Only...</source>
<translation>Nur in diesem Link die Änderung des Notenschlüssels hinzufügen...</translation>
</message>
@@ -3939,7 +3910,7 @@
<translation>Alt+0</translation>
</message>
<message>
- <location line="-1384"/>
+ <location line="-2580"/>
<source>Show A&ctions Toolbar</source>
<translation>A&ktion-Symbolleiste anzeigen</translation>
</message>
@@ -3950,40 +3921,24 @@
</message>
<message>
<location line="+196"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation>Regler (&N)</translation>
</message>
<message>
- <source>Cut controller events (&X)</source>
- <translation type="obsolete">Regler Event ausschneiden (&X)</translation>
- </message>
- <message>
- <source>&Copy controller events</source>
- <translation type="obsolete">Regler Event kopieren (&C)</translation>
- </message>
- <message>
- <source>Paste events (&V)</source>
- <translation type="obsolete">Regler Event einfügen (&V)</translation>
- </message>
- <message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation>Werte für die Regler ein&stellen</translation>
</message>
<message>
- <source>&Place a controller for each note</source>
- <translation type="obsolete">Regler für jede Note &platzieren</translation>
- </message>
- <message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation>Regler Sequenz einfügen (&o)...</translation>
</message>
<message>
- <location line="-810"/>
+ <location line="-1645"/>
<source>Panning &Law</source>
<translation>Stereo-Pan-Modus (&L)</translation>
</message>
@@ -4008,7 +3963,7 @@
<translation>&Alternative -3dB Regel (konstante Lautstärke, 0dB Mitte)</translation>
</message>
<message>
- <location line="+116"/>
+ <location line="+950"/>
<source>&Move to Staff Above...</source>
<translation>Zum Notensystem oberhalb verschieben (&M)...</translation>
</message>
@@ -4033,18 +3988,14 @@
<translation>Takt Informationen ausgeben (debug)</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation>Im Tonlagen T&racker öffnen</translation>
</message>
<message>
- <source>Add Clef Change in this link only...</source>
- <translation type="obsolete">Nur in diesem Link die Änderung des Notenschlüssels hinzufügen...</translation>
- </message>
- <message>
- <location line="-2445"/>
+ <location line="+17"/>
<source>Ctrl+Alt++</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt++</translation>
@@ -4127,14 +4078,14 @@
<translation>Ctrl+U</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+R</translation>
@@ -4152,8 +4103,8 @@
<translation>Ctrl+)</translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation>~</translation>
@@ -4186,28 +4137,33 @@
<translation>Auswahl als &Figuration markieren</translation>
</message>
<message>
- <location line="+11"/>
- <location line="+1472"/>
+ <location line="-1260"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+N</translation>
</message>
<message>
- <location line="-3015"/>
- <location line="+1554"/>
+ <location line="-2739"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+=</translation>
</message>
<message>
- <location line="-1604"/>
- <location line="+1550"/>
+ <location line="-2800"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="-258"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+316"/>
<source>Cycle &Dots</source>
<translation>Zahl der &Punkte zu einer Note zyklisch erhöhen</translation>
</message>
@@ -4477,21 +4433,21 @@
<translation>Umschaltun&g Punktierung aus</translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation>P</translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation>Eingabemo&dus für Tuolen</translation>
</message>
@@ -4662,7 +4618,7 @@
<translation>Ebenen-Symbolleiste</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Zum Einfügewerkzeug wechseln</translation>
</message>
@@ -4717,7 +4673,7 @@
<translation>Mache sichtbar</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Automatisch mit Balken wo angemessen</translation>
</message>
@@ -4757,7 +4713,7 @@
<translation>Doppel B</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>&Neu</translation>
</message>
@@ -4767,23 +4723,11 @@
<translation>&Importieren</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Rosegarden &Projekt-Datei importieren...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">&MIDI-Datei importieren...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>&Hydrogen-Datei importieren...</translation>
</message>
<message>
- <source>Import MusicXM&L file...</source>
- <translation type="obsolete">MusicXM&L Datei importieren...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Merge</source>
<translation>Zusa&mmenfügen</translation>
@@ -4794,44 +4738,16 @@
<translation>Mit &Datei zusammenfügen...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Mit &MIDI-Datei zusammenfügen...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Mit &Hydrogen-Datei zusammenfügen...</translation>
</message>
<message>
- <source>Merge MusicXM&L file...</source>
- <translation type="obsolete">Mit MusicXM&L--Datei zusammenfügen...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Export</source>
<translation>&Exportieren</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Rosegarden &Projekt-Datei exportieren...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">&MIDI-Datei exportieren...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">&Csound-Datei exportieren...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">M&up-Datei exportieren...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Music&XML-Datei exportieren...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>&Öffnen...</translation>
@@ -4842,10 +4758,6 @@
<translation>Öf&fne letzte Datei</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Speichern &als...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>Speichern als Vorla&ge...</translation>
@@ -4942,10 +4854,6 @@
<translation>Tempi vom &Beat-Segment setzen</translation>
</message>
<message>
- <source>Fit existing beats to beat segment</source>
- <translation type="obsolete">Existierende Takte an Takt-Segment anpassen</translation>
- </message>
- <message>
<location line="+2"/>
<source>Change &Composition Start and End...</source>
<translation>&Anfang und Ende der Komposition ändern...</translation>
@@ -4966,13 +4874,13 @@
<translation>&Setze schnelle Markierung an der Wiedergabeposition </translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>S&pringe zu schneller Markierung</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation>&Studio</translation>
</message>
@@ -5027,53 +4935,49 @@
<translation>Aktuelles Dokument als &Standardstudio speichern</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Im Stan&dard Editor öffnen</translation>
- </message>
- <message>
- <location line="+66"/>
- <location line="+452"/>
+ <location line="-476"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>N&eu bezeichnen...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>Letzte Qu&antisierung wiederholen </translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>Strecken &oder Stauchen...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>Star&tzeit setzen...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>&Dauer setzen...</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation>&Anakrusis erzeugen ...</translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Verbinden</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>Auf&teilen</translation>
</message>
@@ -5188,26 +5092,26 @@
<translation>Instrumente neu zuo&rdnen...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>G&röße verändern</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation>P&unch-In-Aufnahme</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>&Haupt-Symbolleiste anzeigen</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>&Spuren-Symbolleiste anzeigen</translation>
</message>
@@ -5222,27 +5126,19 @@
<translation>&Zoom-Symbolleiste anzeigen</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>St&atusanzeige zeigen</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>&Wiedegabepositionslineal anzeigen</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">&X11 Rosegarden Datei importieren...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Mit &X11 Rosegarden Datei zusammenfügen...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>MIDI Mi&xer</translation>
@@ -5258,10 +5154,6 @@
<translation>&Tempolineal anzeigen</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">&LilyPond-Datei exportieren...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>&Bedienfeld anzeigen</translation>
@@ -5308,26 +5200,26 @@
<translation>Editor-Symbolleiste</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Zum Beginn zurückspulen</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Schnell zum Ende spulen</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>Rosegarden &Support</translation>
</message>
<message>
- <location line="-620"/>
+ <location line="-2483"/>
<source>Import Rosegarden &Project File...</source>
<translation>Rosegarden &Projekt-Datei importieren...</translation>
</message>
@@ -5402,13 +5294,13 @@
<translation>Existierende Takte an Takt-Segment anpassen</translation>
</message>
<message>
- <location line="+53"/>
- <location line="+371"/>
+ <location line="-570"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation>Im Standard Editor öffnen (&D)</translation>
</message>
<message>
- <location line="-257"/>
+ <location line="+114"/>
<source>&Update all Figurations</source>
<translation>Alle Figurationen anpassen (&U)</translation>
</message>
@@ -5419,7 +5311,7 @@
<translation>Ctrl+Enter; Enter, Media Play, Ctrl+Return</translation>
</message>
<message>
- <location line="+300"/>
+ <location line="+151"/>
<source>Insert Tempo Change</source>
<translation>Tempoveränderung einfügen</translation>
</message>
@@ -5459,7 +5351,7 @@
<translation>Tempo- und Taktarteditor öffnen</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>Objekt b&earbeiten</translation>
</message>
@@ -5479,7 +5371,7 @@
<translation>&Einstellungen</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>Als neues getriggertes &Segment einfügen </translation>
</message>
@@ -8463,16 +8355,16 @@
<translation><keine></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>Synthesizer Plugin</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>Audio</translation>
@@ -10568,10 +10460,6 @@
<translation>allgemein</translation>
</message>
<message>
- <source>Blue pastel</source>
- <translation type="obsolete">blau pastell</translation>
- </message>
- <message>
<location line="+2"/>
<source>Red pastel</source>
<translation>rot pastell</translation>
@@ -10617,20 +10505,15 @@
<translation>Unbekannt</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10645,10 +10528,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 Regler %2 %3</translation>
</message>
@@ -10663,7 +10546,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Willkommen!</translation>
</message>
@@ -10771,7 +10654,7 @@
<translation><qt><p>Keine Spuren sind für Aufnahmen vorbereitet.</p><p>Bitte mindestes eine Aufnahme-LED <img src=":pixmaps/tooltip/record-leds.png"> auswählen und erneut probieren</p></qt></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>Audio-Aufnahme kann nicht gestartet werden.</p><p>Bitte einen gültigen Aufnahme-Pfad in <b>Komposition->Dokumenteigenschaften bearbeiten...->Audio</b> definieren.</p></qt></translation>
</message>
@@ -10783,40 +10666,52 @@
<translation>Ungültige Sound Datei </translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>Daten im 'long'-Format haben die falsche Länge im MIDI-Strom</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>Daten im 'int'-Format haben die falsche Länge im MIDI-Strom</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>Das Ende der MIDI Datei wurde beim Lesen erreicht</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation>Es wurde versucht mehr Bytes als erwartet von der Spur zu erhalten</translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation>Es wurde versucht über das Ende der MIDI-Datei zu lesen</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>Ungültiges Event gefunden</translation>
+ <translation type="obsolete">Ungültiges Event gefunden</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation>'Running'-Status beim ersten Event der Spur benutzt</translation>
</message>
@@ -10923,7 +10818,7 @@
<translation>Synthesizer Plugin </translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation>Dieses Event ist an ein anderes Event angebunden.</translation>
</message>
@@ -10960,10 +10855,6 @@
<translation>Kein Sound-Treiber verfügbar: Software ohne Sound-Unterstützung kompiliert?</translation>
</message>
<message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
<location filename="../../src/base/figuration/SegmentFigData.cpp" line="+53"/>
<source>Replace segment contents</source>
<translation>Inhalt des Segmentes ersetzen</translation>
@@ -11008,6 +10899,58 @@
<source>Update Figurations</source>
<translation>Figurationen anpassen</translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Lilyond erlaubt weder Leerräume noch Rückstriche in Dateinamen.
+
+Wollen Sie stattdessen
+
+ %1
+
+ benutzen?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Der Export ist fehlgeschlagen. Die Datei konnte nicht zum Schreiben geöffnet werden.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished">Export war erfolgreich, aber die Komposition war leer.</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished">Export nicht stummgeschalteter Spuren fehlgeschlagen. Es gibt keine nicht stummgeschaltetet Spuren oder sie beinhalten keine Segmente. </translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished">Export der ausgewählten Spuren fehlgeschlagen- Es gibt keine Segmente auf den ausgewählten Spuren.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished">Export der ausgewählten Segmente fehlgeschlagen. Es wurde keine Segmente ausgewählt.</translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">Warnung: Ãœberlanger Takt hier abgeschnitten</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">Warnung: Takt zu kurz, wird mit Pausen aufgefüllt</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11023,20 +10966,8 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation><p>Copyright 2000-2014 Das Rosgarden Entwicklungs Team</p><p>Version: %1 Qt version: %2<br>Schlüssel: %3</p><p>Rosegarden wurde von einem weltweiten Team von Freiwilligen entwickelt. Eine Liste der Beteiligten ist unter <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> zu sehen. <br>Weitere Informationen über Rosegarden sind unter <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a> erhältlich.</p><p>Lizenz: GNU General Public License Version 2 oder später</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="obsolete"><p>Copyright 2000-2012 Das Rosgarden Entwicklungs Team</p><p>Version: %1 Qt version: %2<br>Schlüssel: %3</p><p>Rosegarden wurde von einem weltweiten Team von Freiwilligen entwickelt. Eine Liste der Beteiligten ist unter <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> zu sehen. <br>Weitere Informationen über Rosegarden sind unter <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a> erhältlich.</p><p>Lizenz: GNU General Public License Version 2 oder später</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2011 Das Rosgarden Entwicklungs Team</p><p>Version: %1 Qt version: %2<br>Schlüssel: %3</p><p>Rosegarden wurde von einem weltweiten Team von Freiwilligen entwickelt. Eine Liste der Beteiligten ist unter <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> zu sehen. <br>Weitere Informationen über Rosegarden sind unter <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a> erhältlich.</p><p>Lizenz: GNU General Public License Version 2</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-20010 Das Rosgarden Entwicklungs Team</p><p>Version: %1 Qt version: %2<br>Schlüssel: %3</p><p>Rosegarden wurde von einem weltweiten Team von Freiwilligen entwickelt. Eine Liste der Beteiligten ist unter <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> zu sehen. <br>Weitere Informationen über Rosegarden sind unter <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a> erhältlich.</p><p>Lizenz: GNU General Public License Version 2</p></translation>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <translation type="unfinished"><p>Copyright 2000-2012 Das Rosgarden Entwicklungs Team</p><p>Version: %1 Qt version: %2<br>Schlüssel: %3</p><p>Rosegarden wurde von einem weltweiten Team von Freiwilligen entwickelt. Eine Liste der Beteiligten ist unter <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> zu sehen. <br>Weitere Informationen über Rosegarden sind unter <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a> erhältlich.</p><p>Lizenz: GNU General Public License Version 2 oder später</p> {2000-2015 ?} {1 ?} {2<?} {3<?} {2 ?}</translation>
</message>
</context>
<context>
@@ -11097,12 +11028,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>Kann nicht zwei identische, überlappende Anzeigen hinzufügen</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>&Bindebogen hinzufügen</translation>
</message>
@@ -11597,14 +11528,6 @@
<translation>Audiodatei wird gerade konvertiert...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">Die Sampleraten der Audiodatei werden neu berechnet...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">Umwandele und resample die Audiodatei...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation>Audiodatei wird importiert...</translation>
@@ -11618,24 +11541,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Anklicken um den Namen des Instrumentes zu ändern</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>Den Knopf oberhalb anklicken um den Namen des Instrumentes zu ändern</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><kein Synthesizer></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><kein Plugin></translation>
</message>
@@ -11688,10 +11611,6 @@
<translation>Datei</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><keine Audiodateien></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Datei speichern unter</translation>
@@ -11817,10 +11736,6 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<translation>Neue Bezeichnung eingeben</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">importiere eine entfernte (remote) Audiodatei</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>Importiere eine Audiodatei, welche konvertiert oder resampled werden muss</translation>
@@ -11855,7 +11770,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Audio Mixer</translation>
</message>
@@ -11871,20 +11786,20 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Pan</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>Lautsärke</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Mono oder Stereo</translation>
</message>
@@ -11895,21 +11810,21 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><keine></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>Zum laden eines Audio Plugins anklicken</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>Anklicken um den Namen dieses Instrumentes zu ändern</translation>
</message>
@@ -11929,7 +11844,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<translation>Den Knopf oberhalb anklicken um den Namen dieses Instrumentes zu ändern</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Grp %1</translation>
</message>
@@ -11945,14 +11860,14 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<translation>Master</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><kein Plugin></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</translation>
</message>
@@ -12511,7 +12426,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<translation><Neue Bank %1></translation>
</message>
<message>
- <location line="+508"/>
+ <location line="+514"/>
<source>Some internal error: no device selected</source>
<translation>Interner Fehler: Kein Gerät ausgewählt</translation>
</message>
@@ -12527,7 +12442,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<translation>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</translation>
</message>
<message>
- <location line="-774"/>
+ <location line="-780"/>
<source><new bank></source>
<translation><Neue Bank></translation>
</message>
@@ -12547,7 +12462,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<translation>Diese Bank wirklich löschen?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>Diese Tasten-Übersetzungstabelle wirklich löschen?</translation>
</message>
@@ -12715,6 +12630,120 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished">,</translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -13038,7 +13067,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13263,7 +13292,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Anschlagstärke</translation>
</message>
@@ -13279,7 +13308,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Nicht unterstützter Event-Typ</translation>
</message>
@@ -13294,12 +13323,13 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<translation>Regler Events</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>Regler Linie einfügen</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>Regler Event-Nummer</translation>
</message>
@@ -13307,7 +13337,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>&Kopieren</translation>
</message>
@@ -13317,7 +13347,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<translation>(Auszug)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(kopiert)</translation>
</message>
@@ -13387,7 +13417,7 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>A&usschneiden</translation>
</message>
@@ -13427,10 +13457,6 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Ernerut verbinden Befehl</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>Bereich löschen</translation>
@@ -13455,12 +13481,12 @@ Bitte wählen Sie diejenigen aus, die permanent von der Festplatte gelöscht wer
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation>[ kein Anschluß ]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -14088,46 +14114,10 @@ Dies könnte Probleme verursachen, wenn so später ein berechneter Wert übersch
<translation>Muster</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Flach - %1 auf den Wert setzen</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Abwechselnd - %1 abwechselnd auf Max und Min setzen</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo - %1 von Min auf Max steigen lassen</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo - %1 von Max auf Min verringern</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Ausklingen - %1 abwechselnd auf Max und Min setzen, dabei bis auf 0 verringern</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>Wert</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Erster Wert</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Zweiter Wert</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">LSB-Wert</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">MSB Wert</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14522,22 +14512,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>Herunterladen %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Verbindungsaufbau zu FTP Server schlug fehl</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Login fehlgeschlagen</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Wechsel in richtiges Verzeichnis nicht möglich</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">FTP Verbindung unterbrochen</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Download abgebrochen</translation>
@@ -14813,10 +14787,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>Rosegarden muss neu gestartet werden, damit die Änderungen in der Darstellung aktiv werden.</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">KPrinter (KDE 3)</translation>
- </message>
- <message>
<location line="-196"/>
<source>HPLIP (Qt 4)</source>
<translation>HPLIP (Qt 4)</translation>
@@ -14869,10 +14839,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>Adobe Acrobat Reader (kostenpflichtig)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation>Für Vorschau von LilyPond Ausgaben benutzt</translation>
@@ -14940,13 +14906,6 @@ Would you like to try and locate this file or skip it?</source>
</message>
</context>
<context>
- <name>Rosegarden::Guitar::Fingering</name>
- <message>
- <source>couldn't parse fingering '%1' in '%2'</source>
- <translation type="obsolete">Konnte den Fingersatz '%1' in '%2' nicht erkennen ('parsen')</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::GuitarChordEditorDialog</name>
<message>
<location filename="../../src/gui/editors/guitar/GuitarChordEditorDialog.cpp" line="+40"/>
@@ -15471,7 +15430,7 @@ Beispieltext aus Datei:</translation>
<translation>Instrumentenparameter</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Spur</translation>
</message>
@@ -15479,7 +15438,7 @@ Beispieltext aus Datei:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation>kein</translation>
</message>
@@ -15864,7 +15823,6 @@ Beispieltext aus Datei:</translation>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15872,7 +15830,7 @@ Would you like to use
%1
instead?</source>
- <translation>Lilyond erlaubt weder Leerräume noch Rückstriche in Dateinamen.
+ <translation type="obsolete">Lilyond erlaubt weder Leerräume noch Rückstriche in Dateinamen.
Wollen Sie stattdessen
@@ -15881,39 +15839,32 @@ Wollen Sie stattdessen
benutzen?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation>Der Export ist fehlgeschlagen. Die Datei konnte nicht zum Schreiben geöffnet werden.</translation>
+ <translation type="obsolete">Der Export ist fehlgeschlagen. Die Datei konnte nicht zum Schreiben geöffnet werden.</translation>
</message>
<message>
- <location line="+169"/>
<source>Export succeeded, but the composition was empty.</source>
- <translation>Export war erfolgreich, aber die Komposition war leer.</translation>
+ <translation type="obsolete">Export war erfolgreich, aber die Komposition war leer.</translation>
</message>
<message>
- <location line="+42"/>
<source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation>Export nicht stummgeschalteter Spuren fehlgeschlagen. Es gibt keine nicht stummgeschaltetet Spuren oder sie beinhalten keine Segmente. </translation>
+ <translation type="obsolete">Export nicht stummgeschalteter Spuren fehlgeschlagen. Es gibt keine nicht stummgeschaltetet Spuren oder sie beinhalten keine Segmente. </translation>
</message>
<message>
- <location line="+6"/>
<source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation>Export der ausgewählten Spuren fehlgeschlagen- Es gibt keine Segmente auf den ausgewählten Spuren.</translation>
+ <translation type="obsolete">Export der ausgewählten Spuren fehlgeschlagen- Es gibt keine Segmente auf den ausgewählten Spuren.</translation>
</message>
<message>
- <location line="+5"/>
<source>Export of selected segments failed. No segments are selected.</source>
- <translation>Export der ausgewählten Segmente fehlgeschlagen. Es wurde keine Segmente ausgewählt.</translation>
+ <translation type="obsolete">Export der ausgewählten Segmente fehlgeschlagen. Es wurde keine Segmente ausgewählt.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>Warnung: Ãœberlanger Takt hier abgeschnitten</translation>
+ <translation type="obsolete">Warnung: Ãœberlanger Takt hier abgeschnitten</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>Warnung: Takt zu kurz, wird mit Pausen aufgefüllt</translation>
+ <translation type="obsolete">Warnung: Takt zu kurz, wird mit Pausen aufgefüllt</translation>
</message>
</context>
<context>
@@ -15939,10 +15890,6 @@ Wollen Sie stattdessen
<translation>Grundlegende Optionen</translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Ausgewählte Spuren</translation>
- </message>
- <message>
<location line="+31"/>
<source>Compatibility level</source>
<translation>LilyPond Kompatibilitätsstufe</translation>
@@ -16037,10 +15984,6 @@ Wollen Sie stattdessen
<translation>Kurzbezeichnungen des Notensystems drucken</translation>
</message>
<message>
- <source><qt>Useful for large, complex scores, this prints the short name every time there is a line break in the score, making it easier to follow which line belongs to which instrument across pages</qt></source>
- <translation type="obsolete"><qt>Nützlich für große, komplexe Partituren; hier werden die Kurzbezeichnungen bei jedem Zeilenumbruch in der Paritur gedruckt. Dadurch kann man leichter über mehrere Seiten verfolgen, welche Zeile zu welchem Instrument gehört.</qt> </translation>
- </message>
- <message>
<location line="+42"/>
<source>Notation language</source>
<translation>Sprache der Notenschrift</translation>
@@ -16433,10 +16376,6 @@ Wollen Sie stattdessen
<context>
<name>Rosegarden::LoopRuler</name>
<message>
- <source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Double-click to start playback.</p></qt></source>
- <translation type="obsolete"><qt><p>Klick und ziehen um den Wiedergabe Zeiger zu verschieben.</p><p>Shift-Klick und ziehen um einen Bereich für Schleifen oder Bearbeitung zu definieren.</p><p>Shift-Klick um eine Schleife oder Bereich zu löschen.</p><p>Doppelklick um die Wiedergabe zu starten.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/rulers/LoopRuler.cpp" line="+80"/>
<source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Ctrl-click and drag to move the playback pointer with snap to beat.</p><p>Double-click to start playback.</p></qt></source>
<translation><qt><p>Klick und ziehen um den Wiedergabe Zeiger zu verschieben.</p><p>Shift-Klick und ziehen um einen Bereich für Schleifen oder Bearbeitung zu definieren.</p><p>Shift-Klick um eine Schleife oder Bereich zu löschen.</p><p>Ctrl-Klick und ziehen um den Wiedergabe Zeiger zu verschieben und auf einen Takt einrasten zu lassen.</p><p>Doppelklick um die Wiedergabe zu starten.</p></qt></translation>
@@ -16635,7 +16574,7 @@ verursacht.</translation>
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation><qt>Bestimme Variationen des obigen Programmes, falls sie im Studio verfügbar sind</qt></translation>
</message>
@@ -16645,14 +16584,6 @@ verursacht.</translation>
<translation><qt>MIDI Bank definieren, von der Programme ausgewählt werden sollen.</qt></translation>
</message>
<message>
- <source>auto</source>
- <translation type="obsolete">auto</translation>
- </message>
- <message>
- <source>fixed</source>
- <translation type="obsolete">fest</translation>
- </message>
- <message>
<location line="+26"/>
<source><qt>Set the MIDI program or "patch"</p></qt></source>
<translation><qt>MIDI Programm oder "patch" definieren</qt></translation>
@@ -16728,12 +16659,7 @@ verursacht.</translation>
<translation>Empfang von extern</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Keine Verbindung</translation>
</message>
@@ -16957,6 +16883,15 @@ verursacht.</translation>
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17162,12 +17097,12 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Drücken der Shift-Taste vermeidet das Einrasten am Taktschlag oder Gitter</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Event kopieren und bewegen</translation>
</message>
@@ -17326,7 +17261,7 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<translation>Ändern der Anschlagstärken</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>Klicken und ziehen, zum anpassen der Anschlagstärken von ausgewählten Noten</translation>
</message>
@@ -17339,12 +17274,12 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation>Unbekannte Noten-Einfügeaktion %1</translation>
</message>
<message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation><ohne Titel></translation>
</message>
@@ -17407,7 +17342,7 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<translation>Aus</translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:matrix-en</translation>
</message>
@@ -17423,8 +17358,7 @@ Doppel-Klick öffnet den Marker Editor.</translation>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -17434,7 +17368,7 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<translation>Ermittelte Tonart wird angezeigt</translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation>Ermittelte Taktart wird angezeigt</translation>
</message>
@@ -17449,10 +17383,6 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<translation>Anzahl der Halbtöne, um die transponiert werden soll:</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Anschlagstärke der Events setzen</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation>Getriggertes Segment</translation>
@@ -17463,20 +17393,15 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<translation>Trigger löschen</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>Matrix</translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Kann Note nicht einfügen: Keine Rasterdauer gewählt</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Vergößerung</translation>
</message>
@@ -17496,7 +17421,7 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<translation>Vergrößerung zurücksetzen</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Rad rotieren lassen, um das aktive Segment zu ändern</qt></translation>
</message>
@@ -17603,13 +17528,6 @@ Doppel-Klick öffnet den Marker Editor.</translation>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">Tasten-Ãœbersetzungstabelle</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="+53"/>
@@ -17626,7 +17544,7 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>MIDI Mixer</translation>
</message>
@@ -17641,7 +17559,7 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<translation>Instrument</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</translation>
</message>
@@ -17938,13 +17856,13 @@ Doppel-Klick öffnet den Marker Editor.</translation>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Notation</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Default Layout-Modus</translation>
</message>
@@ -18519,7 +18437,7 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> Font: </translation>
</message>
@@ -18539,7 +18457,7 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation> Abstände: </translation>
</message>
<message numerus="yes">
- <location line="-118"/>
+ <location line="-120"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> %n Event ausgewählt </numerusform>
@@ -18552,11 +18470,7 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation> Keine Auswahl </translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Triole</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation>Akkord</translation>
</message>
@@ -18573,7 +18487,7 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation>%1 %2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation>Abstandsaktion %1 ist unbekannt</translation>
</message>
@@ -18598,42 +18512,37 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation>LilyPond-Vorschau Einstellungen</translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Der Export ist fehlgeschlagen. Die Datei konnte nicht zum Schreiben geöffnet werden.</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Die Zwischenablage ist leer</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>Mehrere Segments können nicht in eins eingefügt werden</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+381"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>Drucken mit LilyPond...</translation>
</message>
@@ -18648,29 +18557,29 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation><qt><p>Es konnte kein temporäres File für den Export von LilyPond angelegt werden.</p><p>Dies bedeutet möglicherweise, dass der Speicherplatz auf <pre>%1</pre> komplett belegt ist.</p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation><qt><p>Das eingeschränkte Einfügen erfordert ausreichend leeren Platz (Pausen) an der Einfügeposition, um alle einzufügenden Events aufzunehmen.</p><p>Es wurde nicht ausreichend Platz gefunden.</p><p>Wenn Sie trotzdem einfügen wollen, sollten Sie einen der anderen Einfügemodi aus dem <b>Einfügen...</b>-Menü in Betracht ziehen. Sie können dort auch einen anderen Standard-Einfügemodus als den eingeschränkten wählen.</p></qt></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>Inhalt der Zwischenablage einfügen...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>Kein Einfügen an diesem Punkt möglich.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation>Events auf Notensystem oberhalb verschieben</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>Anschlagstärke erhöhen...</translation>
</message>
@@ -18680,15 +18589,7 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation>Anschlagstärke verringern...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Anschlagstärke der Events setzen</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Anschlagstärke setzen...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation>EventText ändern</translation>
</message>
@@ -18703,7 +18604,7 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation>Noten zusammenfassen...</translation>
</message>
<message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation>Unbekannte Noten-Einfügeaktion %1</translation>
</message>
@@ -18713,13 +18614,13 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation>Note einfügen</translation>
</message>
<message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation>Punktierung hinzufügen...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation>Verzierung auf Spur %1 Takt %2</translation>
</message>
@@ -18729,10 +18630,6 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation>Verzierung in Takt %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Verzierung hinzufügen</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>Verzierung verwenden</translation>
@@ -18768,7 +18665,7 @@ Dies ist ein Fehler (das Programm ist vermutlich inzwischen abgestürzt)</transl
<translation>Halten</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>Für dieses Gerät ist kein Sustain-Regler definiert.
@@ -18780,7 +18677,7 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<translation>Ermittelte Taktart wird angezeigt</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - Segment Spur #%3 - Notation</translation>
</message>
@@ -18813,7 +18710,7 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<translation>Anzahl der Halbtöne, um die transponiert werden soll:</translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>Zeit: %1 (%2.%3s)</translation>
</message>
@@ -18862,16 +18759,11 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<source>Cycling slashes...</source>
<translation>Zahl der Wiederholungsstriche zyklisch erhöhen...</translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>Note kann nicht eingefügt werden: Keine Dauer ausgewählt</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
@@ -18896,7 +18788,7 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<translation>Schließe die Spur-Beschriftungen</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Rad rotieren lassen, um das aktive Segment zu ändern</qt></translation>
@@ -19118,10 +19010,6 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">Tonhöhen-Sequenz</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>Voreinstellung</translation>
@@ -19132,10 +19020,6 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<translation>Voreinstellung:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">Nutzer</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -19358,23 +19242,11 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<translation>http://rosegardenmusic.com/wiki/doc:pitchbendsequencedialog-controllerbranch-en</translation>
</message>
<message>
- <source>User %1</source>
- <translation type="obsolete">Nutzer %1</translation>
- </message>
- <message>
<location line="-901"/>
<source>Pre Bend</source>
<translation>Pre Bend</translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Wert (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Dauer (%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation>Dauer der Steigung (%):</translation>
@@ -19395,31 +19267,11 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<translation>End Wert (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">Amplitude des Vibrato am Anfang (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">Amplitude des Vibrato am Ende (%):</translation>
- </message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation>Änderungs Sequenz</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Wellenlänge des Vibrato:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">Auflösung:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Ungültige Endzeit. Wurde Events ausgewählt?</translation>
@@ -19754,10 +19606,6 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
- <message>
- <source><qt><h3>Processing...</h3></qt></source>
- <translation type="obsolete"><qt><h3>Verarbeitung...</h3></qt></translation>
- </message>
</context>
<context>
<name>Rosegarden::ProjectPackager</name>
@@ -19950,13 +19798,6 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1 Regler</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -20044,12 +19885,12 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Kein</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>2-auf-3</translation>
</message>
@@ -20114,7 +19955,7 @@ Bitte überprüfen Sie die Einstellungen im Verwalte MIDI Geräte Dialog im Haup
<translation>Ãœberlappende Akkorde aufteilen und verbinden</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Vollständiges Quantisieren</translation>
</message>
@@ -20415,10 +20256,6 @@ Möglicherweise gibt es Inkompatibilitäten zwischen den Dateiformaten.</transla
<translation>Rosegarden</translation>
</message>
<message>
- <source>Open Directory</source>
- <translation type="obsolete">Verzeichnis öffnen</translation>
- </message>
- <message>
<location line="+1335"/>
<source>Loading plugins...</source>
<translation>Plugins werden geladen...</translation>
@@ -20458,8 +20295,8 @@ Möglicherweise gibt es Inkompatibilitäten zwischen den Dateiformaten.</transla
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20471,7 +20308,7 @@ Möglicherweise gibt es Inkompatibilitäten zwischen den Dateiformaten.</transla
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>Kann Dokument nicht unter %1 speichern</translation>
</message>
@@ -20550,7 +20387,12 @@ Bitte wählen diejenigen aus, die Sie permanent von der Festplatte entfernen mö
<translation>Zusammenfügen</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>Kann tempoäre Datei nicht im Verzeichnis %1' anlegen: %2</translation>
</message>
@@ -20565,7 +20407,7 @@ Bitte wählen diejenigen aus, die Sie permanent von der Festplatte entfernen mö
<translation>Fehler bei der Umbenennung der temporären Ausgabe-Datei %1' in %2'</translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
@@ -20580,11 +20422,7 @@ Dokumenteigenschaften bevor Sie Audio aufnehmen.
Möchten Sie den Pfad jetzt setzen?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Datei speichern...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation>Fehler beim Schreiben auf %1'</translation>
</message>
@@ -20644,10 +20482,6 @@ Empfehlung: speichern Sie diese Datei aus dieser Version von Rosegarden heraus
um sicherzustellen, daß sie auch in Zukunft gelesen werden kann.</translation>
</message>
<message>
- <source><qt><h2>Channels were remapped</h2><p>Beginning with version 10.02, Rosegarden no longer provides controls for changing the channel associated with each MIDI instrument. Instead, each instrument uses the same channel as its instrument number. For example, "MIDI Input System Device #12" always uses channel 12.</p><p>The file you just loaded contained instruments whose channels differed from the instrument numbers. These channels have been reassigned so that instrument #1 will always use channel 1, regardless of what channel it might have used previously. In most cases, you will experience no difference, but you may have to make some small changes to this file in order for it to play as intended. We recommend that you save this file in order to avoid seeing this warning in the future.</p><p>We apologize for any inconvenience.</p></qt></source>
- <translation type="obsolete"><qt><h2>Die Kanäle wurden neu zugewiesen</h2><p>Ab Version 10.02 bietet Rosegarden nicht länger die Möglichkeit, die Kanäle, die mit einem MIDI-Instrument verbunden sind, zu ändern. Stattdessen nutzt jedes Instument den Kanal mit der entsprechenden Nummer des Instrumentes. Zum Beispiel nutzt "Allgemeines MIDI Gerät #12" immer den Kanal 12.</p><p>Die gerade geladene Datei enthält Instrumente, deren Nummer vom Kanal abweicht. Diese Kanäle wurden so umsortiert, dass Instrument #1 immer Kanal 1 benutzt, unabhängig von der vorherigen Zuordnung. In den meisten Fällen gibt es keinen Unterschied zu vorher, aber es müssen evtl. kleine Änderungen erfolgen, damit die Datei so spielt wie geplant. Wir empfehlen diese Datei zu speichern, damit die Warnung in Zukunft nicht mehr erscheint.</p><p>Wir bitten alle Unannehmlichkeiten zu entschuldigen.</p></qt></translation>
- </message>
- <message>
<location line="+650"/>
<source>Insert Recorded MIDI</source>
<translation>MIDI-Aufnahme einfügen</translation>
@@ -20667,7 +20501,7 @@ um sicherzustellen, daß sie auch in Zukunft gelesen werden kann.</translation>
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>Die Auswahl darf nur Audio- oder Nichtaudiosegmente enthalten</translation>
</message>
@@ -20678,7 +20512,7 @@ um sicherzustellen, daß sie auch in Zukunft gelesen werden kann.</translation>
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20687,7 +20521,7 @@ um sicherzustellen, daß sie auch in Zukunft gelesen werden kann.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20708,7 +20542,7 @@ See Edit -> Preferences -> Audio.</source>
Siehe: Editieren -> Einstellungen -> Audio.</translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation>Kann abgelgte Date nicht hinzufügen. JACK Audio Server ist nicht verfügbar.</translation>
</message>
@@ -20718,10 +20552,6 @@ Siehe: Editieren -> Einstellungen -> Audio.</translation>
<translation>Kann abgelgte Date nicht hinzufügen. Diese Version von Rosegarden wurde nicht mit Audio-Unterstützung gebaut.</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">importiere eine entfernte (remote) Audiodatei</translation>
- </message>
- <message>
<location line="+28"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>Importiere eine Audiodatei, welche konvertiert oder resampled werden muss</translation>
@@ -20781,14 +20611,14 @@ Siehe: Editieren -> Einstellungen -> Audio.</translation>
<translation>Beginn...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> Zoom: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -20817,12 +20647,12 @@ Wollen Sie diese stattdessen öffnen?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Unbetitelt</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20862,12 +20692,12 @@ Fehler war: %2</translation>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Alle unterstützten Dateien</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20887,33 +20717,33 @@ Fehler war: %2</translation>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Alle Dateien</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Strg+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -20923,16 +20753,16 @@ Fehler war: %2</translation>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>Datei %1 kann nicht geöfnet werden</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>Datei speichern...</translation>
</message>
@@ -21034,12 +20864,12 @@ Fehler war: %2</translation>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21096,12 +20926,12 @@ Möchten Sie den Pfad jetzt setzen?</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Globales Tempo setzen</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>Symbolleiste umschalten...</translation>
</message>
@@ -21169,12 +20999,12 @@ Segmente->Segmente zusammenfassen.
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Rosegarden Projekt Dateien</translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation><qt><p>Bevor Audio-Daten aufgezeichnet werden können muss ein Dateiname für die Komposition festgelegt werden.</p><p>Audio-Dateien werden unter <b>%1</b> als <b>rg-[<i>Dateiname</i>]-[<i>Instrument</i>]-<i>Datum</i>_<i>Uhrzeit</i>-<i>n</i>.wav</b> abgespeichert. Sie möchten daher vielleicht die Instrumente umbenennen. Weitere Informationen sind im <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a> erhältlich.</p></qt></translation>
</message>
@@ -21184,13 +21014,13 @@ Segmente->Segmente zusammenfassen.
<translation>Eingabe</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-en</translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21214,8 +21044,8 @@ Segmente->Segmente zusammenfassen.
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21225,7 +21055,7 @@ Segmente->Segmente zusammenfassen.
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21243,8 +21073,8 @@ Segmente->Segmente zusammenfassen.
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21253,12 +21083,12 @@ Segmente->Segmente zusammenfassen.
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation>http://rosegardenmusic.com/tutorials/</translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation><h3>Neuere Version verfügbar</h3></translation>
</message>
@@ -21268,7 +21098,7 @@ Segmente->Segmente zusammenfassen.
<translation><p>SIe benutzen Version %1. Version %2 ist nun verfügbar.</p><p>Bitte schauen SIe auf der <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Webseite von Rosegarden</a> nach weiteren Infomationen.</p></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>MIDI-Datei öffnen</translation>
</message>
@@ -21278,12 +21108,12 @@ Segmente->Segmente zusammenfassen.
<translation>Mit MIDI-Datei zusammenfügen</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>MIDI-Datei importiertieren...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>Notation wird berechnet...</translation>
</message>
@@ -21315,36 +21145,24 @@ Segmente->Segmente zusammenfassen.
<translation>Disee X11 Rosegarden Datei kann nicht geladen werden. Sie scheint beschädigt zu sein.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Hydrogen Datei öffnen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Hydrogen Datei importiertieren...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Diese Hydrogen Datei kann nicht geladen werden. Sie scheint beschädigt zu sein.</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>Es konnte kein temporäres File für den Export von LilyPond angelegt werden.</p><p>Dies bedeutet möglicherweise, dass der Speicherplatz auf <pre>%1</pre> komplett belegt ist.</p></qt></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>Der Rosegarden Sequenzer Process ist unerwartet abgebrochen. Aufnahme und Wiedergabe stehen in dieser Sitzung nicht mehr zur Verfügung.
Bitte Beenden und erneut Starten, damit der Ton wieder funktioniert.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>Sequencer starten...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>Datei%1 mit einem neuen Dateinamen speichern...</translation>
@@ -21387,7 +21205,7 @@ Kein Segment wird geteilt.</translation>
<translation>Originale Tempi und Taktangaben löschen</translation>
</message>
<message>
- <location line="+1394"/>
+ <location line="+1388"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation>MusicXML Datei öffnen</translation>
@@ -21419,7 +21237,7 @@ Für Hilfestellung bei den Audio und MIDI-Einstellungen gehe nach http://rosegar
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21427,7 +21245,7 @@ Für Hilfestellung bei den Audio und MIDI-Einstellungen gehe nach http://rosegar
<translation>Exportieren als...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Speichern der Rosegarden-Datei beim Komprimieren fehlgeschlagen: %1</translation>
</message>
@@ -21443,7 +21261,7 @@ Für Hilfestellung bei den Audio und MIDI-Einstellungen gehe nach http://rosegar
<translation>Standard MIDI Dateien</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21510,9 +21328,9 @@ Für Hilfestellung bei den Audio und MIDI-Einstellungen gehe nach http://rosegar
<translation>MusicXML-Datei wird exportiert...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>XML-Dateien</translation>
</message>
@@ -21607,21 +21425,17 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<translation>Neue Bezeichnung eingeben</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Abspiel-Liste</translation>
</message>
<message>
- <source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
- <translation type="obsolete">http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</translation>
- </message>
- <message>
<location line="+51"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>MIDI Panik Event in Transmissionswarteschlange eingestellt....</translation>
</message>
@@ -21701,7 +21515,7 @@ Fehler: %2</translation>
<translation><qt><p>Klick und hoch, runter, rechts oder links ziehen um den Wert zu ändern.</p><p>Doppelklick um den Wert direkt einzugeben.</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Neuen Wert wählen</translation>
</message>
@@ -21753,7 +21567,7 @@ Fehler: %2</translation>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Segmentfarbe ändern...</translation>
</message>
@@ -21796,7 +21610,7 @@ Fehler: %2</translation>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Ein Klick auf das Segment löscht dieses</translation>
</message>
@@ -21829,7 +21643,7 @@ Fehler: %2</translation>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation>&Verbinden</translation>
</message>
@@ -21837,7 +21651,7 @@ Fehler: %2</translation>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>Um&benennen...</translation>
</message>
@@ -21874,22 +21688,22 @@ Fehler: %2</translation>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>Segment bewegen</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>Segmente bewegen</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Drücken der Shift-Taste vermeidet das Einrasten am Taktschlag oder Gitter</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>Klicken und ziehen bewegt ein Segment</translation>
</message>
@@ -22085,12 +21899,12 @@ gelöscht werden, bevor eine neue Transponierung gesetzt werden kann.</translati
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>Halten der Shift-Taste verhindert ein Einrasten an Taktlinien </translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>MIDI- oder Audio-Aufnahme in diesem Bereich. Drag'n Drop wird unterstützt</translation>
</message>
@@ -22166,7 +21980,7 @@ gelöscht werden, bevor eine neue Transponierung gesetzt werden kann.</translati
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
@@ -22190,17 +22004,17 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<translation>Audio-Vorschau wird erzeugt...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Segmentgröße verändern</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Drücken der Shift-Taste vermeidet das Einrasten am Taktschlag oder Gitter</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>Halten der Shift-Taste verhindert ein Einrasten zum Taktschlag/Gitter; Halten der Ctrl-Taste bewirkt eine Skalierung der Segment-Inhalte</translation>
</message>
@@ -22210,7 +22024,7 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>Klicken und ziehen verändert die Länge des Segments; Bei halten der Ctrl-Taste werden auch die Segment-Inhalte skaliert/verändert </translation>
</message>
@@ -22223,25 +22037,25 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Klicken und ziehen um Segmente auszuwählen </translation>
</message>
<message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Bewege Segment</numerusform>
- <numerusform>Bewege Segmente</numerusform>
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+154"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Drücken der Shift-Taste vermeidet das Einrasten am Taktschlag oder Gitter</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>Für eine Auswahl klicken und ziehen; Mittel-Klick und ziehen erstellt ein neues leeres Segment</translation>
</message>
@@ -22266,19 +22080,11 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<translation>Klicken und ziehen bewegt ein Segment; Bei halten der Strg-Taste wird eine Kopie erstellt; Strg + Alt erzeugt eine verlinkte Kopie, Doppelklick zum editieren</translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">Klicken und ziehen bewegt das Segment. Bei halten der STRG-Taste wird eine Kopie erstellt</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation>Klicken und ziehen kopiert ein Segment</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">Klicken und ziehen bewegt ein Segment; Bei halten der Strg-Taste wird eine Kopie erstellt; Doppelklick zum editieren</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation>Klicken und ziehen kopiert ein Segment</translation>
@@ -22349,24 +22155,12 @@ Möchten Sie den Pfad jetzt setzen?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Segment teilen</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Klick auf Segment teilt es in zwei; Halten Sie Shift gedrückt, um das Einrasten an Taktschlägen zu vermeiden</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>Klicken auf ein Segment, teilt es in zwei </translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -24082,7 +23876,7 @@ Das Beenden anderer laufender Anwendung könnte u.U. die Leistung von Rosegarden
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><kein Instrument></translation>
</message>
@@ -24097,20 +23891,7 @@ Das Beenden anderer laufender Anwendung könnte u.U. die Leistung von Rosegarden
<translation><ohne Titel></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Warnung</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Der angegebene Audio-Dateipfad existiert entweder nicht oder ist nicht schreibbar.
-Bitte setzen Sie den Audio-Dateipfad auf ein gültiges Verzeichnis in dem
-Dokumenteigenschaften bevor Sie Audio aufnehmen.
-Möchten Sie den Pfad jetzt setzen?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Spur stummschalten</translation>
</message>
@@ -24123,25 +23904,17 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Wiederholungssegment in echte Kopien umwandeln</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Wiederholungssegmente in echte Kopien umwandeln</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform>%n Wiederholungssegment in echte Kopien umwandeln</numerusform>
@@ -24149,7 +23922,7 @@ Möchten Sie den Pfad jetzt setzen?</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform>%n verlinktes Segment in echte Kopien umwandeln</numerusform>
@@ -24157,7 +23930,7 @@ Möchten Sie den Pfad jetzt setzen?</translation>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24170,10 +23943,6 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<context>
<name>Rosegarden::TrackLabel</name>
<message>
- <source><qt>Click and hold with either mouse button to assign this track to an instrument.</qt></source>
- <translation type="obsolete"><qt>Klicken und einen beliebigen Mausknopf festhalten um diese Spur einem Instrument zuzuordnen.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/editors/segment/TrackLabel.cpp" line="+61"/>
<source><qt><p>Click to select all the segments on this track.</p><p>Shift+click to add to or to remove from the selection all the segments on this track.</p><p>Click and hold with either mouse button to assign this track to an instrument.</p></qt></source>
<translation><qt><p>Anklicken um alle Segmente in dieser Spur auszuwählen.</p><p>Shift + Anklicken um Segmente in dieser Spur zur Auswahl hinzuzufügen oder zu entfernen.</p><p>Anklicken und mit einem beliebigen Mausknopf festhalten um diese Spur einem Instrument zuzuweisen.</p></qt></translation>
@@ -24207,7 +23976,7 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Spur</translation>
</message>
@@ -24218,12 +23987,12 @@ Möchten Sie den Pfad jetzt setzen?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><ohne Titel></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Wiedergabeparameter</translation>
</message>
@@ -24364,7 +24133,103 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<translation><qt><p>Neue Segmente werden mit diesem Schlüssel, der am Anfang eingefügt wird, erzeugt</p></qt></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+2"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Sopran</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Bass</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Crotales</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Xylophon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Gitarre</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Kontrabass</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Celesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Alte Celesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">französisch</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Sopran</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Mezzo-Sopran</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Alt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Tenor</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Bariton</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Varbariton</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Sub-Bass</translation>
+ </message>
+ <message>
+ <location line="+39"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation><qt><p>Mit Hilfe der Notenlinien die kleinste spielbare Note, die vorgeschlagen wurde, auswählen</p></qt></translation>
</message>
@@ -24394,87 +24259,71 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<translation><qt><p>Lade die Voreinstellungen für die Parameter eines Segmentes aus unserer umfassenden Datenbank mit reellen Instrumenten.</p><p>Wenn neue Segmente angelegt werden, bekommen diese Segmente bei der Erzeugung diese Parameter zugeordnet. Um diese Parameter bei vorhandenen Segmente zu benutzem (z.B. um einen vorhandenen Teil für die Wiedergabe auf einer B-Trompete zu konvertieren), kann der Menuepunkt <b>Segmente -> Umwandeln der Notation für</b> im Notations-Editor benutzt werden.</p></qt></translation>
</message>
<message>
- <location line="+13"/>
<source>treble</source>
- <translation>Sopran</translation>
+ <translation type="obsolete">Sopran</translation>
</message>
<message>
- <location line="+1"/>
<source>bass</source>
- <translation>Bass</translation>
+ <translation type="obsolete">Bass</translation>
</message>
<message>
- <location line="+1"/>
<source>crotales</source>
- <translation>Crotales</translation>
+ <translation type="obsolete">Crotales</translation>
</message>
<message>
- <location line="+1"/>
<source>xylophone</source>
- <translation>Xylophon</translation>
+ <translation type="obsolete">Xylophon</translation>
</message>
<message>
- <location line="+1"/>
<source>guitar</source>
- <translation>Gitarre</translation>
+ <translation type="obsolete">Gitarre</translation>
</message>
<message>
- <location line="+1"/>
<source>contrabass</source>
- <translation>Kontrabass</translation>
+ <translation type="obsolete">Kontrabass</translation>
</message>
<message>
- <location line="+1"/>
<source>celesta</source>
- <translation>Celesta</translation>
+ <translation type="obsolete">Celesta</translation>
</message>
<message>
- <location line="+1"/>
<source>old celesta</source>
- <translation>Alte Celesta</translation>
+ <translation type="obsolete">Alte Celesta</translation>
</message>
<message>
- <location line="+1"/>
<source>french</source>
- <translation>französisch</translation>
+ <translation type="obsolete">französisch</translation>
</message>
<message>
- <location line="+1"/>
<source>soprano</source>
- <translation>Sopran</translation>
+ <translation type="obsolete">Sopran</translation>
</message>
<message>
- <location line="+1"/>
<source>mezzosoprano</source>
- <translation>Mezzo-Sopran</translation>
+ <translation type="obsolete">Mezzo-Sopran</translation>
</message>
<message>
- <location line="+1"/>
<source>alto</source>
- <translation>Alt</translation>
+ <translation type="obsolete">Alt</translation>
</message>
<message>
- <location line="+1"/>
<source>tenor</source>
- <translation>Tenor</translation>
+ <translation type="obsolete">Tenor</translation>
</message>
<message>
- <location line="+1"/>
<source>baritone</source>
- <translation>Bariton</translation>
+ <translation type="obsolete">Bariton</translation>
</message>
<message>
- <location line="+1"/>
<source>varbaritone</source>
- <translation>Varbariton</translation>
+ <translation type="obsolete">Varbariton</translation>
</message>
<message>
- <location line="+1"/>
<source>subbass</source>
- <translation>Sub-Bass</translation>
+ <translation type="obsolete">Sub-Bass</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+36"/>
<source>Transpose</source>
<translation>Transponieren</translation>
</message>
@@ -24515,7 +24364,7 @@ Möchten Sie den Pfad jetzt setzen?</translation>
<translation><qt><p>Neue Segmente werden in dieser Farbe erzeugt</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Audio</translation>
@@ -24911,13 +24760,6 @@ Möchten Sie den Pfad jetzt setzen?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Ui</name>
- <message>
- <source>[ No port ]</source>
- <translation type="obsolete">[ kein Anschluß ]</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::UnGraceCommand</name>
<message>
<location filename="../../src/commands/notation/UnGraceCommand.h" line="+43"/>
@@ -25154,13 +24996,6 @@ Möchten Sie den Pfad jetzt setzen?</translation>
</message>
</context>
<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">(aufgenommen)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/en.ts b/data/locale/en.ts
index efd6a8b..b28ae11 100644
--- a/data/locale/en.ts
+++ b/data/locale/en.ts
@@ -331,23 +331,23 @@
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation></translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation></translation>
</message>
@@ -357,54 +357,54 @@
<translation></translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation></translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation></translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation></translation>
</message>
@@ -429,346 +429,346 @@
<translation></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation></translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation></translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation></translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation></translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation></translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation></translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation></translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation></translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation></translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation></translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation></translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation></translation>
</message>
@@ -778,82 +778,82 @@
<translation></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation></translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation></translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation></translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation></translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation></translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation></translation>
</message>
@@ -883,7 +883,7 @@
<translation></translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation></translation>
</message>
@@ -903,12 +903,12 @@
<translation></translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation></translation>
</message>
@@ -918,7 +918,7 @@
<translation></translation>
</message>
<message>
- <location line="+623"/>
+ <location line="-2120"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -960,7 +960,7 @@
<translation></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation></translation>
</message>
@@ -970,89 +970,89 @@
<translation></translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
<source>&Interpret Active Segment</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
<source>Interpret &Text Dynamics</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+5"/>
<source>Adjust velocity to follow text dynamics (f, p, mf...)</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>Interpret &Hairpins</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+5"/>
<source>Adjust velocity to follow hairpin dynamics</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>Interpret &Slurs and Marks</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+5"/>
<source>Articulate slurs, staccato, tenuto, etc.</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source>Interpret &Beats</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+5"/>
<source>Place accents on certain beats according to the time signature</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation></translation>
</message>
@@ -1067,123 +1067,123 @@
<translation></translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation></translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation></translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation></translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3804"/>
- <location line="+1724"/>
+ <location line="+316"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation></translation>
</message>
<message>
- <location line="-2009"/>
+ <location line="-3205"/>
<source>&Grid</source>
<translation></translation>
</message>
@@ -1199,13 +1199,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation></translation>
</message>
@@ -1216,13 +1216,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation></translation>
</message>
@@ -1233,13 +1233,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation></translation>
</message>
@@ -1250,13 +1250,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation></translation>
</message>
@@ -1267,13 +1267,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation></translation>
</message>
@@ -1284,37 +1284,37 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation></translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation></translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation></translation>
</message>
@@ -1325,149 +1325,149 @@
</message>
<message>
<location line="+7"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1284"/>
- <location line="+1550"/>
+ <location line="-2479"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2744"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation></translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation></translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation></translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation></translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -1480,679 +1480,679 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>Do</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>Do sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>Re flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>Re</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>Re sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>Mi flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>Mi</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>Fa</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>Fa sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>Sol flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>Sol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>Sol sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>La flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>La</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>La sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>Ti</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>Ti</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2516"/>
<source>Panning &Law</source>
<translation></translation>
</message>
@@ -2177,7 +2177,7 @@
<translation></translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+929"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2214,14 +2214,19 @@
<translation></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="+4"/>
+ <source>Check for Parallels...</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-1269"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation></translation>
</message>
<message>
- <location line="-2452"/>
+ <location line="+10"/>
<source>Add &Layer</source>
<translation></translation>
</message>
@@ -2455,14 +2460,14 @@
<translation></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2480,8 +2485,8 @@
<translation></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2499,27 +2504,27 @@
<translation></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation></translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation></translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation></translation>
</message>
@@ -2530,36 +2535,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation></translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation></translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation></translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation></translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation></translation>
</message>
@@ -2575,301 +2580,301 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation></translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation></translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation></translation>
</message>
<message>
- <location line="-1683"/>
- <location line="+1158"/>
+ <location line="-2879"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation></translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation></translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation></translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation></translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation></translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation></translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation></translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation></translation>
</message>
<message>
- <location line="-3692"/>
+ <location line="-1831"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation></translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation></translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation></translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation></translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation></translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation></translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation></translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation></translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation></translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation></translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation></translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation></translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation></translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation></translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation></translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation></translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation></translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation></translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation></translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation></translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation></translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation></translation>
</message>
@@ -2954,7 +2959,7 @@
<translation></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation></translation>
</message>
@@ -2964,23 +2969,23 @@
<translation></translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation></translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation></translation>
</message>
<message>
- <location line="-1153"/>
+ <location line="-2348"/>
<source>Show T&ransport Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-609"/>
+ <location line="+1414"/>
<source>Insert into Selected Audio Track</source>
<translation></translation>
</message>
@@ -2995,25 +3000,25 @@
<translation></translation>
</message>
<message>
- <location line="+1492"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-531"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation></translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation></translation>
</message>
<message>
- <location line="+290"/>
+ <location line="-826"/>
<source>Cursor Back and Se&lect</source>
<translation></translation>
</message>
<message>
- <location line="+1004"/>
+ <location line="+2199"/>
<source>C&ut and Close</source>
<translation></translation>
</message>
@@ -3058,13 +3063,13 @@
<translation></translation>
</message>
<message>
- <location line="+28"/>
- <location line="+1996"/>
+ <location line="-718"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation></translation>
</message>
<message>
- <location line="-1994"/>
+ <location line="+2"/>
<source>Note &Font</source>
<translation></translation>
</message>
@@ -3109,26 +3114,26 @@
<translation></translation>
</message>
<message>
- <location line="-1270"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2465"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation></translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation></translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation></translation>
</message>
<message>
- <location line="-1493"/>
+ <location line="-2689"/>
<source>Nothing to &Undo</source>
<translation></translation>
</message>
@@ -3139,48 +3144,48 @@
</message>
<message>
<location line="+355"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation></translation>
</message>
<message>
- <location line="-1030"/>
- <location line="+1936"/>
+ <location line="-2226"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation></translation>
</message>
<message>
- <location line="-2544"/>
+ <location line="+87"/>
<source>Search and Selec&t</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+18"/>
@@ -3195,10 +3200,10 @@
<message>
<location line="+3"/>
<source>Show &Interpret Toolbar</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>Add Clef Change in This Link Only...</source>
<translation></translation>
</message>
@@ -3514,8 +3519,8 @@
<translation></translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation></translation>
</message>
@@ -3575,14 +3580,14 @@
<translation></translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation></translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation></translation>
</message>
@@ -3840,13 +3845,13 @@
<translation></translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation></translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation></translation>
</message>
@@ -3861,8 +3866,8 @@
<translation></translation>
</message>
<message>
- <location line="-1627"/>
- <location line="+1754"/>
+ <location line="-2823"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation></translation>
</message>
@@ -3872,21 +3877,21 @@
<translation></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+1472"/>
+ <location line="-1713"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3015"/>
- <location line="+1554"/>
+ <location line="-2739"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -3980,21 +3985,21 @@
<translation></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1154"/>
+ <location line="+36"/>
<source>Double Whole Note (5)</source>
<translation></translation>
</message>
@@ -4164,26 +4169,26 @@
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation></translation>
</message>
@@ -4323,14 +4328,14 @@
<translation></translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation></translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation></translation>
</message>
@@ -4350,13 +4355,13 @@
<translation></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation></translation>
</message>
@@ -4376,23 +4381,23 @@
<translation></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+1989"/>
+ <location line="-753"/>
<source>Show Cho&rd Name Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+767"/>
<source>Show &Annotations</source>
<translation></translation>
</message>
@@ -4402,7 +4407,7 @@
<translation></translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation></translation>
</message>
@@ -4422,7 +4427,7 @@
<translation></translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation></translation>
</message>
@@ -4438,34 +4443,34 @@
</message>
<message>
<location line="-190"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1920"/>
+ <location line="-1092"/>
<source>&Action</source>
<translation></translation>
</message>
<message>
- <location line="+619"/>
- <location line="+1302"/>
+ <location line="-1404"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-406"/>
- <location line="+2123"/>
+ <location line="-1601"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-1726"/>
+ <location line="-1727"/>
<source>Show &Rulers Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+1509"/>
+ <location line="+1510"/>
<source>Tuplet Insert Mo&de</source>
<translation></translation>
</message>
@@ -4486,7 +4491,7 @@
<translation></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation></translation>
</message>
@@ -4536,7 +4541,7 @@
<translation></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation></translation>
</message>
@@ -4576,7 +4581,7 @@
<translation></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation></translation>
</message>
@@ -4777,49 +4782,49 @@
<translation></translation>
</message>
<message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation></translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation></translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation></translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation></translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation></translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation></translation>
</message>
@@ -4929,26 +4934,26 @@
<translation></translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation></translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation></translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation></translation>
</message>
@@ -4963,15 +4968,15 @@
<translation></translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation></translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation></translation>
</message>
@@ -5021,26 +5026,26 @@
<translation></translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation></translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation></translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation></translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-1942"/>
<source>Ctrl+Enter, Enter, Media Play, Ctrl+Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -5051,7 +5056,7 @@
<translation></translation>
</message>
<message>
- <location line="+225"/>
+ <location line="+76"/>
<source>Insert Tempo Change</source>
<translation></translation>
</message>
@@ -5091,7 +5096,7 @@
<translation></translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation></translation>
</message>
@@ -5111,36 +5116,36 @@
<translation></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation></translation>
</message>
<message>
- <location line="-4383"/>
+ <location line="+1943"/>
<source>Delete Marker</source>
<translation></translation>
</message>
<message>
- <location line="+469"/>
- <location line="+1693"/>
+ <location line="-4082"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation></translation>
</message>
<message>
- <location line="-1499"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-2695"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation></translation>
</message>
<message>
- <location line="-2594"/>
+ <location line="-851"/>
<source>Show &Track Headers</source>
<translation></translation>
</message>
<message>
- <location line="+217"/>
+ <location line="+218"/>
<source>&Triplet</source>
<translation></translation>
</message>
@@ -5155,12 +5160,12 @@
<translation></translation>
</message>
<message>
- <location line="+881"/>
+ <location line="-3570"/>
<source>Respell as Flat</source>
<translation></translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+1742"/>
<source>Import Rosegarden &Project File...</source>
<translation></translation>
</message>
@@ -5248,13 +5253,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -5271,21 +5276,21 @@
<translation></translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="-1489"/>
<source>Im&port Studio from File...</source>
<translation></translation>
</message>
@@ -5296,27 +5301,27 @@
<translation></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation></translation>
</message>
@@ -5348,19 +5353,19 @@
<translation></translation>
</message>
<message>
- <location line="-1986"/>
- <location line="+2111"/>
+ <location line="+125"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation></translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-747"/>
<source>&Set Quick Marker at Playback Position</source>
<translation></translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation></translation>
</message>
@@ -5455,7 +5460,7 @@
<message>
<location line="+1"/>
<source>Classical Guitar</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
@@ -6666,7 +6671,7 @@
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-1877"/>
+ <location filename="../QMenuStrings.cpp" line="-634"/>
<location filename="../InstrumentStrings.cpp" line="+1"/>
<source>Triangle</source>
<translation></translation>
@@ -8350,16 +8355,16 @@
<translation></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation></translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation></translation>
@@ -10500,20 +10505,15 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation></translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation></translation>
</message>
@@ -10528,10 +10528,10 @@
<translation></translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation></translation>
</message>
@@ -10546,7 +10546,7 @@
<translation></translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation></translation>
</message>
@@ -10654,45 +10654,53 @@
<translation></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
- <source>Attempt to read past MIDI file end</source>
- <translation></translation>
+ <location line="+15"/>
+ <source>Attempt to read past MIDI file end</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
- <translation></translation>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation></translation>
</message>
@@ -10792,7 +10800,7 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation></translation>
</message>
@@ -10889,6 +10897,52 @@
<source>Update Figurations</source>
<translation></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -10904,7 +10958,7 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation></translation>
</message>
</context>
@@ -10966,12 +11020,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation></translation>
</message>
@@ -11357,7 +11411,7 @@
<message>
<location line="+6"/>
<source>Start JACK automatically</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+12"/>
@@ -11479,24 +11533,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation></translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation></translation>
</message>
@@ -11699,7 +11753,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation></translation>
</message>
@@ -11715,20 +11769,20 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation></translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation></translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation></translation>
</message>
@@ -11739,21 +11793,21 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation></translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation></translation>
</message>
@@ -11773,7 +11827,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation></translation>
</message>
@@ -11789,14 +11843,14 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation></translation>
</message>
@@ -12375,7 +12429,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation></translation>
</message>
@@ -12559,6 +12613,120 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -12876,13 +13044,13 @@ Please select the ones you wish to delete permanently from the hard disk.
<message>
<location line="+10"/>
<source>Auto-Expand when Editing</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
</context>
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation></translation>
</message>
@@ -13107,7 +13275,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation></translation>
</message>
@@ -13123,7 +13291,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation></translation>
</message>
@@ -13138,12 +13306,13 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation></translation>
</message>
@@ -13151,7 +13320,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation></translation>
</message>
@@ -13161,7 +13330,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation></translation>
</message>
@@ -13231,7 +13400,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation></translation>
</message>
@@ -13307,7 +13476,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation></translation>
</message>
@@ -13836,12 +14005,12 @@ This could cause problems if it overrides a different computed value later on.</
<message>
<location line="+5"/>
<source>Use notation duration</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
<source>Select rests</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+13"/>
@@ -14533,17 +14702,17 @@ Would you like to try and locate this file or skip it?</source>
<message>
<location line="+87"/>
<source>MuPDF</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
<source>ePDFView</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
<source>xdg-open (recommended)</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+14"/>
@@ -15238,7 +15407,7 @@ Example text from file:</source>
<translation></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation></translation>
</message>
@@ -15246,7 +15415,7 @@ Example text from file:</source>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation></translation>
</message>
@@ -15629,55 +15798,6 @@ Example text from file:</source>
</message>
</context>
<context>
- <name>Rosegarden::LilyPondExporter</name>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
- <source>LilyPond does not allow spaces or backslashes in filenames.
-
-Would you like to use
-
- %1
-
- instead?</source>
- <translation></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+1823"/>
- <source>warning: overlong bar truncated here</source>
- <translation></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>warning: bar too short, padding with rests</source>
- <translation></translation>
- </message>
-</context>
-<context>
<name>Rosegarden::LilyPondOptionsDialog</name>
<message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="+64"/>
@@ -15741,7 +15861,7 @@ Would you like to use
<message>
<location line="+1"/>
<source>2.14</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
@@ -15856,12 +15976,12 @@ Would you like to use
<message>
<location line="+3"/>
<source>Allow fingerings inside staff</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+2"/>
<source><qt>When checked, LilyPond is allowed print fingerings inside the staff. This can improve rendering in polyphonic scores with fingerings in different voices, and is on by default.</qt></source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+40"/>
@@ -15962,7 +16082,7 @@ Would you like to use
<message>
<location line="+28"/>
<source><qt>Useful for large, complex scores, this prints the short name every time there is a line break in the score, making it easier to follow which line belongs to which instrument across pages; requires LilyPond 2.10 or higher</qt></source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+13"/>
@@ -16380,7 +16500,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation></translation>
</message>
@@ -16427,17 +16547,17 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<message>
<location line="+20"/>
<source><qt>Send bank select</qt></source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+33"/>
<source><qt>Send program change</qt></source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+26"/>
<source><qt>Send bank select for variation</qt></source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+19"/>
@@ -16447,12 +16567,12 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<message>
<location line="+12"/>
<source>Auto</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
<source>Fixed</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+10"/>
@@ -16465,12 +16585,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation></translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation></translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation></translation>
</message>
@@ -16694,6 +16809,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -16897,12 +17021,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation></translation>
</message>
@@ -17061,7 +17185,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation></translation>
</message>
@@ -17137,7 +17261,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation></translation>
</message>
@@ -17153,8 +17277,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation></translation>
</message>
@@ -17169,7 +17292,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation></translation>
</message>
@@ -17194,20 +17317,15 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation></translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation></translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation></translation>
</message>
@@ -17227,7 +17345,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation></translation>
</message>
@@ -17350,7 +17468,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation></translation>
</message>
@@ -17365,7 +17483,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation></translation>
</message>
@@ -17662,13 +17780,13 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation></translation>
</message>
@@ -18241,7 +18359,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation></translation>
</message>
@@ -18261,7 +18379,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message numerus="yes">
- <location line="-118"/>
+ <location line="-120"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> %n event selected</numerusform>
@@ -18269,7 +18387,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+2656"/>
+ <location line="+2683"/>
<source>Chord</source>
<translation></translation>
</message>
@@ -18279,7 +18397,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="-2238"/>
+ <location line="-2263"/>
<source>Unknown spacing action %1</source>
<translation></translation>
</message>
@@ -18304,12 +18422,12 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation></translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation></translation>
</message>
@@ -18321,16 +18439,15 @@ This is a bug (the program would previously have crashed by now)</source>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation></translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation></translation>
</message>
@@ -18345,26 +18462,26 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation></translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation></translation>
</message>
<message>
- <location line="-873"/>
+ <location line="-877"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+296"/>
@@ -18372,7 +18489,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+718"/>
+ <location line="+724"/>
<source>Raising velocities...</source>
<translation></translation>
</message>
@@ -18437,7 +18554,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation></translation>
@@ -18448,7 +18565,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation></translation>
</message>
@@ -18488,7 +18605,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation></translation>
</message>
@@ -18563,16 +18680,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Cycling slashes...</source>
<translation></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation></translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation></translation>
</message>
@@ -18597,7 +18709,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation></translation>
@@ -19233,12 +19345,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<message>
<location line="+30"/>
<source>Tunings</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+19"/>
<source>Pitch estimate method</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
</context>
<context>
@@ -19694,12 +19806,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation></translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation></translation>
</message>
@@ -19764,7 +19876,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation></translation>
</message>
@@ -20101,8 +20213,8 @@ There may be some incompatibilities with the file format.</source>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20114,7 +20226,7 @@ There may be some incompatibilities with the file format.</source>
<translation></translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation></translation>
</message>
@@ -20186,7 +20298,12 @@ Please select any you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation></translation>
</message>
@@ -20201,7 +20318,7 @@ Please select any you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+187"/>
+ <location line="+190"/>
<source>Error while writing on '%1'</source>
<translation></translation>
</message>
@@ -20258,7 +20375,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<translation></translation>
</message>
<message>
- <location line="+1220"/>
+ <location line="+1221"/>
<source>Warning</source>
<translation></translation>
</message>
@@ -20270,7 +20387,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="-571"/>
+ <location line="-572"/>
<source>Insert Recorded MIDI</source>
<translation></translation>
</message>
@@ -20289,7 +20406,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation></translation>
</message>
@@ -20300,7 +20417,7 @@ Would you like to set it now?</source>
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20309,7 +20426,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20329,7 +20446,7 @@ See Edit -> Preferences -> Audio.</source>
<translation></translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation></translation>
</message>
@@ -20398,14 +20515,14 @@ See Edit -> Preferences -> Audio.</source>
<translation></translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation></translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation></translation>
@@ -20433,12 +20550,12 @@ Do you want to open it instead ?</source>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation></translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20476,12 +20593,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation></translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20501,33 +20618,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation></translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation></translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation></translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation></translation>
</message>
@@ -20537,16 +20654,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation></translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation></translation>
</message>
@@ -20648,12 +20765,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation></translation>
</message>
<message>
- <location line="-2767"/>
+ <location line="-2756"/>
<source>Jog Selection</source>
<translation></translation>
</message>
@@ -20706,12 +20823,12 @@ No segment will be split.</source>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation></translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation></translation>
</message>
@@ -20776,7 +20893,7 @@ No segment will be split.</source>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation></translation>
</message>
@@ -20798,7 +20915,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+1999"/>
+ <location line="+1994"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation></translation>
</message>
@@ -20808,7 +20925,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation></translation>
</message>
@@ -20818,7 +20935,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+615"/>
+ <location line="+595"/>
<source><h3>Invalid audio path</h3></source>
<translation></translation>
</message>
@@ -20848,8 +20965,8 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="-7445"/>
- <location line="+312"/>
+ <location line="-7414"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -20873,8 +20990,8 @@ No segment will be split.</source>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -20884,7 +21001,7 @@ No segment will be split.</source>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -20902,8 +21019,8 @@ No segment will be split.</source>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -20922,7 +21039,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation></translation>
</message>
@@ -20932,12 +21049,12 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation></translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation></translation>
</message>
@@ -20969,23 +21086,23 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation></translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation></translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation></translation>
@@ -21021,7 +21138,7 @@ Please exit and restart Rosegarden to restore sound capability.</source>
<translation></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation></translation>
@@ -21034,7 +21151,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21042,7 +21159,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation></translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation></translation>
</message>
@@ -21058,7 +21175,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21125,9 +21242,9 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation></translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation></translation>
</message>
@@ -21216,7 +21333,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation></translation>
</message>
@@ -21226,7 +21343,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation></translation>
</message>
@@ -21267,7 +21384,7 @@ Error was : %2</source>
<translation></translation>
</message>
<message>
- <location line="-5561"/>
+ <location line="-5507"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21282,7 +21399,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation></translation>
</message>
@@ -21334,7 +21451,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation></translation>
</message>
@@ -21377,7 +21494,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation></translation>
</message>
@@ -21410,7 +21527,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation></translation>
</message>
@@ -21418,7 +21535,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation></translation>
</message>
@@ -21455,22 +21572,22 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation></translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation></translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation></translation>
</message>
@@ -21521,7 +21638,7 @@ Would you like to set it now?</source>
<message>
<location line="+14"/>
<source><qt>Click to edit the segment label for any selected segments</qt></source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+8"/>
@@ -21665,12 +21782,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation></translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation></translation>
</message>
@@ -21746,7 +21863,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation></translation>
</message>
@@ -21768,27 +21885,27 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation></translation>
</message>
<message>
<location line="+2"/>
<source>Hold Ctrl to rescale contents</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation></translation>
</message>
@@ -21801,17 +21918,25 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation></translation>
</message>
+ <message numerus="yes">
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <location line="+323"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation></translation>
</message>
@@ -21845,14 +21970,6 @@ Would you like to set it now?</source>
<source>Click and drag to copy segment</source>
<translation></translation>
</message>
- <message numerus="yes">
- <location line="-294"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Move Segment</numerusform>
- <numerusform>Move %n Segments</numerusform>
- </translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSingleRepeatToCopyCommand</name>
@@ -21921,15 +22038,10 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation></translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -21985,52 +22097,52 @@ Would you like to set it now?</source>
<message>
<location filename="../../src/gui/dialogs/SelectDialog.cpp" line="+49"/>
<source>Search and Select</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+12"/>
<source>Duration</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
<source>Pitch</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
<source>Special</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
<source>Advanced</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+7"/>
<source>Replace existing selection</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
<source>Extend existing selection</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+38"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-search-and-select-en</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+275"/>
<source>Include notes with shorter performance durations</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+4"/>
<source>Include notes with longer performance durations</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
</context>
<context>
@@ -23640,7 +23752,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation></translation>
</message>
@@ -23655,7 +23767,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation></translation>
</message>
<message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation></translation>
</message>
@@ -23668,17 +23780,17 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform></numerusform>
@@ -23686,7 +23798,7 @@ Quitting other running applications may improve Rosegarden's performance.</
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform></numerusform>
@@ -23694,7 +23806,7 @@ Quitting other running applications may improve Rosegarden's performance.</
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation></translation>
</message>
@@ -23740,7 +23852,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation></translation>
</message>
@@ -23751,12 +23863,12 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation></translation>
</message>
@@ -23897,117 +24009,133 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
- <translation></translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation></translation>
</message>
@@ -24048,7 +24176,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation></translation>
diff --git a/data/locale/en_GB.ts b/data/locale/en_GB.ts
index e81932a..1be9042 100644
--- a/data/locale/en_GB.ts
+++ b/data/locale/en_GB.ts
@@ -331,23 +331,23 @@
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation></translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation></translation>
</message>
@@ -357,54 +357,54 @@
<translation></translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation></translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation></translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation></translation>
</message>
@@ -429,346 +429,346 @@
<translation></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation></translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation></translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation></translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation></translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation></translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation></translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation></translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation></translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation></translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation></translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation></translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation></translation>
</message>
@@ -778,82 +778,82 @@
<translation></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation></translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation></translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation></translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation></translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation></translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation></translation>
</message>
@@ -883,7 +883,7 @@
<translation></translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation></translation>
</message>
@@ -903,12 +903,12 @@
<translation></translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation></translation>
</message>
@@ -918,7 +918,7 @@
<translation></translation>
</message>
<message>
- <location line="+623"/>
+ <location line="-2120"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -960,7 +960,7 @@
<translation></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation></translation>
</message>
@@ -970,39 +970,39 @@
<translation></translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation></translation>
</message>
@@ -1052,7 +1052,7 @@
<translation></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation></translation>
</message>
@@ -1067,123 +1067,123 @@
<translation></translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation></translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation></translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation></translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3804"/>
- <location line="+1724"/>
+ <location line="+316"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation></translation>
</message>
<message>
- <location line="-2009"/>
+ <location line="-3205"/>
<source>&Grid</source>
<translation></translation>
</message>
@@ -1199,13 +1199,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation></translation>
</message>
@@ -1216,13 +1216,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation></translation>
</message>
@@ -1233,13 +1233,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation></translation>
</message>
@@ -1250,13 +1250,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation></translation>
</message>
@@ -1267,13 +1267,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation></translation>
</message>
@@ -1284,37 +1284,37 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation></translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation></translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation></translation>
</message>
@@ -1325,149 +1325,149 @@
</message>
<message>
<location line="+7"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1284"/>
- <location line="+1550"/>
+ <location line="-2479"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2744"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation></translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation></translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation></translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation></translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -1480,679 +1480,679 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>Do</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>Do sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>Re flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>Re</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>Re sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>Mi flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>Mi</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>Fa</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>Fa sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>Sol flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>Sol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>Sol sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>La flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>La</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>La sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>Ti flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>Ti</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2516"/>
<source>Panning &Law</source>
<translation></translation>
</message>
@@ -2177,7 +2177,7 @@
<translation></translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+929"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2214,14 +2214,19 @@
<translation></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="+4"/>
+ <source>Check for Parallels...</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-1269"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation></translation>
</message>
<message>
- <location line="-2452"/>
+ <location line="+10"/>
<source>Add &Layer</source>
<translation></translation>
</message>
@@ -2455,14 +2460,14 @@
<translation></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2480,8 +2485,8 @@
<translation></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2499,27 +2504,27 @@
<translation></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation></translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation></translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation></translation>
</message>
@@ -2530,36 +2535,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation></translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation></translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation></translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation></translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation></translation>
</message>
@@ -2575,301 +2580,301 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation></translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation></translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation></translation>
</message>
<message>
- <location line="-1683"/>
- <location line="+1158"/>
+ <location line="-2879"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation></translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation></translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation></translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation></translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation></translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation></translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation></translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation></translation>
</message>
<message>
- <location line="-3692"/>
+ <location line="-1831"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation></translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation></translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation></translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation></translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation></translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation></translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation></translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation></translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation></translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation></translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation></translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation></translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation></translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation></translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation></translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation></translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation></translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation></translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation></translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation></translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation></translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation></translation>
</message>
@@ -2954,7 +2959,7 @@
<translation></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation></translation>
</message>
@@ -2964,23 +2969,23 @@
<translation></translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation></translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation></translation>
</message>
<message>
- <location line="-1153"/>
+ <location line="-2348"/>
<source>Show T&ransport Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-609"/>
+ <location line="+1414"/>
<source>Insert into Selected Audio Track</source>
<translation></translation>
</message>
@@ -2995,25 +3000,25 @@
<translation></translation>
</message>
<message>
- <location line="+1492"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-531"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation></translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation></translation>
</message>
<message>
- <location line="+290"/>
+ <location line="-826"/>
<source>Cursor Back and Se&lect</source>
<translation></translation>
</message>
<message>
- <location line="+1004"/>
+ <location line="+2199"/>
<source>C&ut and Close</source>
<translation></translation>
</message>
@@ -3058,13 +3063,13 @@
<translation></translation>
</message>
<message>
- <location line="+28"/>
- <location line="+1996"/>
+ <location line="-718"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation></translation>
</message>
<message>
- <location line="-1994"/>
+ <location line="+2"/>
<source>Note &Font</source>
<translation></translation>
</message>
@@ -3109,26 +3114,26 @@
<translation></translation>
</message>
<message>
- <location line="-1270"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2465"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation></translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation></translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation></translation>
</message>
<message>
- <location line="-1493"/>
+ <location line="-2689"/>
<source>Nothing to &Undo</source>
<translation></translation>
</message>
@@ -3139,46 +3144,46 @@
</message>
<message>
<location line="+355"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation></translation>
</message>
<message>
- <location line="-1030"/>
- <location line="+1936"/>
+ <location line="-2226"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation></translation>
</message>
<message>
- <location line="-2544"/>
+ <location line="+87"/>
<source>Search and Selec&t</source>
<translation></translation>
</message>
@@ -3198,7 +3203,7 @@
<translation></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>Add Clef Change in This Link Only...</source>
<translation></translation>
</message>
@@ -3514,8 +3519,8 @@
<translation></translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation></translation>
</message>
@@ -3575,14 +3580,14 @@
<translation></translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation></translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation></translation>
</message>
@@ -3840,13 +3845,13 @@
<translation></translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation></translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation></translation>
</message>
@@ -3861,8 +3866,8 @@
<translation></translation>
</message>
<message>
- <location line="-1627"/>
- <location line="+1754"/>
+ <location line="-2823"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation></translation>
</message>
@@ -3872,21 +3877,21 @@
<translation></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+1472"/>
+ <location line="-1713"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3015"/>
- <location line="+1554"/>
+ <location line="-2739"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -3980,21 +3985,21 @@
<translation></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1154"/>
+ <location line="+36"/>
<source>Double Whole Note (5)</source>
<translation></translation>
</message>
@@ -4164,26 +4169,26 @@
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation></translation>
</message>
@@ -4323,14 +4328,14 @@
<translation></translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation></translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation></translation>
</message>
@@ -4350,13 +4355,13 @@
<translation></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation></translation>
</message>
@@ -4376,23 +4381,23 @@
<translation></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+1989"/>
+ <location line="-753"/>
<source>Show Cho&rd Name Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+767"/>
<source>Show &Annotations</source>
<translation></translation>
</message>
@@ -4402,7 +4407,7 @@
<translation></translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation></translation>
</message>
@@ -4422,7 +4427,7 @@
<translation></translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation></translation>
</message>
@@ -4438,34 +4443,34 @@
</message>
<message>
<location line="-190"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1920"/>
+ <location line="-1092"/>
<source>&Action</source>
<translation></translation>
</message>
<message>
- <location line="+619"/>
- <location line="+1302"/>
+ <location line="-1404"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-406"/>
- <location line="+2123"/>
+ <location line="-1601"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-1726"/>
+ <location line="-1727"/>
<source>Show &Rulers Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+1509"/>
+ <location line="+1510"/>
<source>Tuplet Insert Mo&de</source>
<translation></translation>
</message>
@@ -4486,7 +4491,7 @@
<translation></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation></translation>
</message>
@@ -4536,7 +4541,7 @@
<translation></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation></translation>
</message>
@@ -4576,7 +4581,7 @@
<translation></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation></translation>
</message>
@@ -4777,49 +4782,49 @@
<translation></translation>
</message>
<message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation></translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation></translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation></translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation></translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation></translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation></translation>
</message>
@@ -4929,26 +4934,26 @@
<translation></translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation></translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation></translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation></translation>
</message>
@@ -4963,15 +4968,15 @@
<translation></translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation></translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation></translation>
</message>
@@ -5021,26 +5026,26 @@
<translation></translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation></translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation></translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation></translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-1942"/>
<source>Ctrl+Enter, Enter, Media Play, Ctrl+Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -5051,7 +5056,7 @@
<translation></translation>
</message>
<message>
- <location line="+225"/>
+ <location line="+76"/>
<source>Insert Tempo Change</source>
<translation></translation>
</message>
@@ -5091,7 +5096,7 @@
<translation></translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation></translation>
</message>
@@ -5111,36 +5116,36 @@
<translation></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation></translation>
</message>
<message>
- <location line="-4383"/>
+ <location line="+1943"/>
<source>Delete Marker</source>
<translation></translation>
</message>
<message>
- <location line="+469"/>
- <location line="+1693"/>
+ <location line="-4082"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation></translation>
</message>
<message>
- <location line="-1499"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-2695"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation></translation>
</message>
<message>
- <location line="-2594"/>
+ <location line="-851"/>
<source>Show &Track Headers</source>
<translation></translation>
</message>
<message>
- <location line="+217"/>
+ <location line="+218"/>
<source>&Triplet</source>
<translation></translation>
</message>
@@ -5155,12 +5160,12 @@
<translation></translation>
</message>
<message>
- <location line="+881"/>
+ <location line="-3570"/>
<source>Respell as Flat</source>
<translation></translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+1742"/>
<source>Import Rosegarden &Project File...</source>
<translation></translation>
</message>
@@ -5248,13 +5253,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -5271,21 +5276,21 @@
<translation></translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="-1489"/>
<source>Im&port Studio from File...</source>
<translation></translation>
</message>
@@ -5296,27 +5301,27 @@
<translation></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation></translation>
</message>
@@ -5348,19 +5353,19 @@
<translation></translation>
</message>
<message>
- <location line="-1986"/>
- <location line="+2111"/>
+ <location line="+125"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation></translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-747"/>
<source>&Set Quick Marker at Playback Position</source>
<translation></translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation></translation>
</message>
@@ -6666,7 +6671,7 @@
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-1877"/>
+ <location filename="../QMenuStrings.cpp" line="-634"/>
<location filename="../InstrumentStrings.cpp" line="+1"/>
<source>Triangle</source>
<translation></translation>
@@ -8350,16 +8355,16 @@
<translation></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation></translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation></translation>
@@ -10500,20 +10505,15 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation></translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation></translation>
</message>
@@ -10528,10 +10528,10 @@
<translation></translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation></translation>
</message>
@@ -10546,7 +10546,7 @@
<translation></translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation></translation>
</message>
@@ -10654,45 +10654,53 @@
<translation></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
<translation></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation></translation>
</message>
@@ -10792,7 +10800,7 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation></translation>
</message>
@@ -10889,6 +10897,54 @@
<source>Update Figurations</source>
<translation></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use "%1" instead?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation></translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -10904,7 +10960,7 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation></translation>
</message>
</context>
@@ -10966,12 +11022,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation></translation>
</message>
@@ -11479,24 +11535,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation></translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation></translation>
</message>
@@ -11699,7 +11755,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation></translation>
</message>
@@ -11715,20 +11771,20 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation></translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation></translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation></translation>
</message>
@@ -11739,21 +11795,21 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation></translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation></translation>
</message>
@@ -11773,7 +11829,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation></translation>
</message>
@@ -11789,14 +11845,14 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation></translation>
</message>
@@ -12375,7 +12431,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation></translation>
</message>
@@ -12544,17 +12600,131 @@ Please select the ones you wish to delete permanently from the hard disk.
<source>Tie &Below</source>
<translation></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeVelocityCommand</name>
+</context>
+<context>
+ <name>Rosegarden::ChangeVelocityCommand</name>
+ <message>
+ <location filename="../../src/commands/edit/ChangeVelocityCommand.h" line="+45"/>
+ <source>&Increase Velocity</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Reduce Velocity</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation></translation>
+ </message>
<message>
- <location filename="../../src/commands/edit/ChangeVelocityCommand.h" line="+45"/>
- <source>&Increase Velocity</source>
+ <location line="+4"/>
+ <source>hidden octaves</source>
<translation></translation>
</message>
<message>
- <location line="+1"/>
- <source>&Reduce Velocity</source>
+ <location line="+4"/>
+ <source>for</source>
<translation></translation>
</message>
</context>
@@ -12882,7 +13052,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation></translation>
</message>
@@ -13107,7 +13277,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation></translation>
</message>
@@ -13123,7 +13293,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation></translation>
</message>
@@ -13138,12 +13308,13 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation></translation>
</message>
@@ -13151,7 +13322,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation></translation>
</message>
@@ -13161,7 +13332,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation></translation>
</message>
@@ -13231,7 +13402,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation></translation>
</message>
@@ -13307,7 +13478,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation></translation>
</message>
@@ -15240,7 +15411,7 @@ Example text from file:</source>
<translation></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation></translation>
</message>
@@ -15248,7 +15419,7 @@ Example text from file:</source>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation></translation>
</message>
@@ -15631,55 +15802,6 @@ Example text from file:</source>
</message>
</context>
<context>
- <name>Rosegarden::LilyPondExporter</name>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
- <source>LilyPond does not allow spaces or backslashes in filenames.
-
-Would you like to use
-
- %1
-
- instead?</source>
- <translation></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+1823"/>
- <source>warning: overlong bar truncated here</source>
- <translation></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>warning: bar too short, padding with rests</source>
- <translation></translation>
- </message>
-</context>
-<context>
<name>Rosegarden::LilyPondOptionsDialog</name>
<message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="+64"/>
@@ -16382,7 +16504,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation></translation>
</message>
@@ -16467,12 +16589,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation></translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation></translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation></translation>
</message>
@@ -16696,6 +16813,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -16899,12 +17025,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation></translation>
</message>
@@ -17063,7 +17189,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation></translation>
</message>
@@ -17139,7 +17265,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation></translation>
</message>
@@ -17155,8 +17281,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation></translation>
</message>
@@ -17171,7 +17296,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation></translation>
</message>
@@ -17196,20 +17321,15 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation></translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation></translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation></translation>
</message>
@@ -17229,7 +17349,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation></translation>
</message>
@@ -17352,7 +17472,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation></translation>
</message>
@@ -17367,7 +17487,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation></translation>
</message>
@@ -17664,13 +17784,13 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation></translation>
</message>
@@ -18243,7 +18363,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation></translation>
</message>
@@ -18263,7 +18383,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message numerus="yes">
- <location line="-118"/>
+ <location line="-120"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> %n event selected</numerusform>
@@ -18271,7 +18391,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+2656"/>
+ <location line="+2683"/>
<source>Chord</source>
<translation></translation>
</message>
@@ -18281,7 +18401,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="-2238"/>
+ <location line="-2263"/>
<source>Unknown spacing action %1</source>
<translation></translation>
</message>
@@ -18306,12 +18426,12 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation></translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation></translation>
</message>
@@ -18323,16 +18443,15 @@ This is a bug (the program would previously have crashed by now)</source>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation></translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation></translation>
</message>
@@ -18347,24 +18466,24 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation></translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation></translation>
</message>
<message>
- <location line="-873"/>
+ <location line="-877"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation></translation>
</message>
@@ -18374,7 +18493,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+718"/>
+ <location line="+724"/>
<source>Raising velocities...</source>
<translation></translation>
</message>
@@ -18439,7 +18558,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation></translation>
@@ -18450,7 +18569,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation></translation>
</message>
@@ -18490,7 +18609,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation></translation>
</message>
@@ -18565,16 +18684,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Cycling slashes...</source>
<translation></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation></translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation></translation>
</message>
@@ -18599,7 +18713,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation></translation>
@@ -19696,12 +19810,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation></translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation></translation>
</message>
@@ -19766,7 +19880,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation></translation>
</message>
@@ -20103,8 +20217,8 @@ There may be some incompatibilities with the file format.</source>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20116,7 +20230,7 @@ There may be some incompatibilities with the file format.</source>
<translation></translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation></translation>
</message>
@@ -20188,7 +20302,12 @@ Please select any you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation></translation>
</message>
@@ -20203,7 +20322,7 @@ Please select any you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+187"/>
+ <location line="+190"/>
<source>Error while writing on '%1'</source>
<translation></translation>
</message>
@@ -20260,7 +20379,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<translation></translation>
</message>
<message>
- <location line="+1220"/>
+ <location line="+1221"/>
<source>Warning</source>
<translation></translation>
</message>
@@ -20272,7 +20391,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="-571"/>
+ <location line="-572"/>
<source>Insert Recorded MIDI</source>
<translation></translation>
</message>
@@ -20291,7 +20410,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation></translation>
</message>
@@ -20302,7 +20421,7 @@ Would you like to set it now?</source>
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20311,7 +20430,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20331,7 +20450,7 @@ See Edit -> Preferences -> Audio.</source>
<translation></translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation></translation>
</message>
@@ -20400,14 +20519,14 @@ See Edit -> Preferences -> Audio.</source>
<translation></translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation></translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation></translation>
@@ -20435,12 +20554,12 @@ Do you want to open it instead ?</source>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation></translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20478,12 +20597,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation></translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20503,33 +20622,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation></translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation></translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation></translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation></translation>
</message>
@@ -20539,16 +20658,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation></translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation></translation>
</message>
@@ -20650,12 +20769,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation></translation>
</message>
<message>
- <location line="-2767"/>
+ <location line="-2756"/>
<source>Jog Selection</source>
<translation></translation>
</message>
@@ -20708,12 +20827,12 @@ No segment will be split.</source>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation></translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation></translation>
</message>
@@ -20778,7 +20897,7 @@ No segment will be split.</source>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation></translation>
</message>
@@ -20800,7 +20919,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+1999"/>
+ <location line="+1994"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation></translation>
</message>
@@ -20810,7 +20929,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation></translation>
</message>
@@ -20820,7 +20939,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+615"/>
+ <location line="+595"/>
<source><h3>Invalid audio path</h3></source>
<translation></translation>
</message>
@@ -20850,8 +20969,8 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="-7445"/>
- <location line="+312"/>
+ <location line="-7414"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -20875,8 +20994,8 @@ No segment will be split.</source>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -20886,7 +21005,7 @@ No segment will be split.</source>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -20904,8 +21023,8 @@ No segment will be split.</source>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -20924,7 +21043,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation></translation>
</message>
@@ -20934,12 +21053,12 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation></translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation></translation>
</message>
@@ -20971,23 +21090,23 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation></translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation></translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation></translation>
@@ -21023,7 +21142,7 @@ Please exit and restart Rosegarden to restore sound capability.</source>
<translation></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation></translation>
@@ -21036,7 +21155,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21044,7 +21163,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation></translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation></translation>
</message>
@@ -21060,7 +21179,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21127,9 +21246,9 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation></translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation></translation>
</message>
@@ -21218,7 +21337,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation></translation>
</message>
@@ -21228,7 +21347,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation></translation>
</message>
@@ -21269,7 +21388,7 @@ Error was : %2</source>
<translation></translation>
</message>
<message>
- <location line="-5561"/>
+ <location line="-5507"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21284,7 +21403,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation></translation>
</message>
@@ -21336,7 +21455,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Change Segment Colour...</translation>
</message>
@@ -21379,7 +21498,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation></translation>
</message>
@@ -21412,7 +21531,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation></translation>
</message>
@@ -21420,7 +21539,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation></translation>
</message>
@@ -21457,22 +21576,22 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation></translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation></translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation></translation>
</message>
@@ -21667,12 +21786,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation></translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation></translation>
</message>
@@ -21748,7 +21867,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation></translation>
</message>
@@ -21770,17 +21889,17 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation></translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation></translation>
</message>
@@ -21790,7 +21909,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation></translation>
</message>
@@ -21803,17 +21922,25 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation></translation>
</message>
+ <message numerus="yes">
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation>
+ <numerusform>Move Segment</numerusform>
+ <numerusform>Move %n Segments</numerusform>
+ </translation>
+ </message>
<message>
- <location line="+323"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation></translation>
</message>
@@ -21847,14 +21974,6 @@ Would you like to set it now?</source>
<source>Click and drag to copy segment</source>
<translation></translation>
</message>
- <message numerus="yes">
- <location line="-294"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Move Segment</numerusform>
- <numerusform>Move %n Segments</numerusform>
- </translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSingleRepeatToCopyCommand</name>
@@ -21923,15 +22042,10 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation></translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23642,7 +23756,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation></translation>
</message>
@@ -23657,7 +23771,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation></translation>
</message>
<message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation></translation>
</message>
@@ -23670,33 +23784,31 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform></numerusform>
- <numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform></numerusform>
- <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation></translation>
</message>
@@ -23742,7 +23854,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation></translation>
</message>
@@ -23753,12 +23865,12 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation></translation>
</message>
@@ -23899,117 +24011,133 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation></translation>
</message>
@@ -24050,7 +24178,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation><qt><p>New segments will be created using this colour</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation></translation>
diff --git a/data/locale/en_US.ts b/data/locale/en_US.ts
index 7b29bb5..a0cdd01 100644
--- a/data/locale/en_US.ts
+++ b/data/locale/en_US.ts
@@ -331,23 +331,23 @@
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation></translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation></translation>
</message>
@@ -357,54 +357,54 @@
<translation></translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation></translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation></translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation></translation>
</message>
@@ -429,346 +429,346 @@
<translation></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation></translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation></translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation></translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation></translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation></translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation></translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation></translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation></translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation></translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation></translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation></translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation></translation>
</message>
@@ -778,82 +778,82 @@
<translation></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation></translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation></translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation></translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation></translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation></translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation></translation>
</message>
@@ -883,7 +883,7 @@
<translation></translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation></translation>
</message>
@@ -903,12 +903,12 @@
<translation></translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation></translation>
</message>
@@ -918,7 +918,7 @@
<translation></translation>
</message>
<message>
- <location line="+623"/>
+ <location line="-2120"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -960,7 +960,7 @@
<translation></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation></translation>
</message>
@@ -970,39 +970,39 @@
<translation></translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation></translation>
</message>
@@ -1052,7 +1052,7 @@
<translation></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation></translation>
</message>
@@ -1067,123 +1067,123 @@
<translation></translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation></translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation></translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation></translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3804"/>
- <location line="+1724"/>
+ <location line="+316"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation></translation>
</message>
<message>
- <location line="-2009"/>
+ <location line="-3205"/>
<source>&Grid</source>
<translation></translation>
</message>
@@ -1199,13 +1199,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation></translation>
</message>
@@ -1216,13 +1216,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation></translation>
</message>
@@ -1233,13 +1233,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation></translation>
</message>
@@ -1250,13 +1250,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation></translation>
</message>
@@ -1267,13 +1267,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation></translation>
</message>
@@ -1284,37 +1284,37 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation></translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation></translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation></translation>
</message>
@@ -1325,149 +1325,149 @@
</message>
<message>
<location line="+7"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1284"/>
- <location line="+1550"/>
+ <location line="-2479"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2744"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation></translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation></translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation></translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation></translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -1480,679 +1480,679 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>Do</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>Do sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>Re flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>Re</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>Re sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>Mi flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>Mi</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>Fa</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>Fa sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>Sol flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>Sol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>Sol sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>La flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>La</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>La sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>Ti</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>Ti</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2516"/>
<source>Panning &Law</source>
<translation></translation>
</message>
@@ -2177,7 +2177,7 @@
<translation></translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+929"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2214,14 +2214,19 @@
<translation></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="+4"/>
+ <source>Check for Parallels...</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-1269"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation></translation>
</message>
<message>
- <location line="-2452"/>
+ <location line="+10"/>
<source>Add &Layer</source>
<translation></translation>
</message>
@@ -2455,14 +2460,14 @@
<translation></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2480,8 +2485,8 @@
<translation></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2499,27 +2504,27 @@
<translation></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation></translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation></translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation></translation>
</message>
@@ -2530,36 +2535,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation></translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation></translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation></translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation></translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation></translation>
</message>
@@ -2575,301 +2580,301 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation></translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation></translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation></translation>
</message>
<message>
- <location line="-1683"/>
- <location line="+1158"/>
+ <location line="-2879"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation></translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation></translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation></translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation></translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation></translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation></translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation></translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation></translation>
</message>
<message>
- <location line="-3692"/>
+ <location line="-1831"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation></translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation></translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation></translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation></translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation></translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation></translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation></translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation></translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation></translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation></translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation></translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation></translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation></translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation></translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation></translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation></translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation></translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation></translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation></translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation></translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation></translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation></translation>
</message>
@@ -2954,7 +2959,7 @@
<translation></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation></translation>
</message>
@@ -2964,23 +2969,23 @@
<translation></translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation></translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation></translation>
</message>
<message>
- <location line="-1153"/>
+ <location line="-2348"/>
<source>Show T&ransport Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-609"/>
+ <location line="+1414"/>
<source>Insert into Selected Audio Track</source>
<translation></translation>
</message>
@@ -2995,25 +3000,25 @@
<translation></translation>
</message>
<message>
- <location line="+1492"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-531"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation></translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation></translation>
</message>
<message>
- <location line="+290"/>
+ <location line="-826"/>
<source>Cursor Back and Se&lect</source>
<translation></translation>
</message>
<message>
- <location line="+1004"/>
+ <location line="+2199"/>
<source>C&ut and Close</source>
<translation></translation>
</message>
@@ -3058,13 +3063,13 @@
<translation></translation>
</message>
<message>
- <location line="+28"/>
- <location line="+1996"/>
+ <location line="-718"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation></translation>
</message>
<message>
- <location line="-1994"/>
+ <location line="+2"/>
<source>Note &Font</source>
<translation></translation>
</message>
@@ -3109,26 +3114,26 @@
<translation></translation>
</message>
<message>
- <location line="-1270"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2465"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation></translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation></translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation></translation>
</message>
<message>
- <location line="-1493"/>
+ <location line="-2689"/>
<source>Nothing to &Undo</source>
<translation></translation>
</message>
@@ -3139,46 +3144,46 @@
</message>
<message>
<location line="+355"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation></translation>
</message>
<message>
- <location line="-1030"/>
- <location line="+1936"/>
+ <location line="-2226"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation></translation>
</message>
<message>
- <location line="-2544"/>
+ <location line="+87"/>
<source>Search and Selec&t</source>
<translation></translation>
</message>
@@ -3198,7 +3203,7 @@
<translation></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>Add Clef Change in This Link Only...</source>
<translation></translation>
</message>
@@ -3514,8 +3519,8 @@
<translation></translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation></translation>
</message>
@@ -3575,14 +3580,14 @@
<translation></translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation></translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation></translation>
</message>
@@ -3840,13 +3845,13 @@
<translation></translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation></translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation></translation>
</message>
@@ -3861,8 +3866,8 @@
<translation></translation>
</message>
<message>
- <location line="-1627"/>
- <location line="+1754"/>
+ <location line="-2823"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation></translation>
</message>
@@ -3872,21 +3877,21 @@
<translation></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+1472"/>
+ <location line="-1713"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3015"/>
- <location line="+1554"/>
+ <location line="-2739"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -3980,21 +3985,21 @@
<translation></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1154"/>
+ <location line="+36"/>
<source>Double Whole Note (5)</source>
<translation></translation>
</message>
@@ -4164,26 +4169,26 @@
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation></translation>
</message>
@@ -4323,14 +4328,14 @@
<translation></translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation></translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation></translation>
</message>
@@ -4350,13 +4355,13 @@
<translation></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation></translation>
</message>
@@ -4376,23 +4381,23 @@
<translation></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+1989"/>
+ <location line="-753"/>
<source>Show Cho&rd Name Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+767"/>
<source>Show &Annotations</source>
<translation></translation>
</message>
@@ -4402,7 +4407,7 @@
<translation></translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation></translation>
</message>
@@ -4422,7 +4427,7 @@
<translation></translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation></translation>
</message>
@@ -4438,34 +4443,34 @@
</message>
<message>
<location line="-190"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-1920"/>
+ <location line="-1092"/>
<source>&Action</source>
<translation></translation>
</message>
<message>
- <location line="+619"/>
- <location line="+1302"/>
+ <location line="-1404"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation></translation>
</message>
<message>
- <location line="-406"/>
- <location line="+2123"/>
+ <location line="-1601"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="-1726"/>
+ <location line="-1727"/>
<source>Show &Rulers Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+1509"/>
+ <location line="+1510"/>
<source>Tuplet Insert Mo&de</source>
<translation></translation>
</message>
@@ -4486,7 +4491,7 @@
<translation></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation></translation>
</message>
@@ -4536,7 +4541,7 @@
<translation></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation></translation>
</message>
@@ -4576,7 +4581,7 @@
<translation></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation></translation>
</message>
@@ -4777,49 +4782,49 @@
<translation></translation>
</message>
<message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation></translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation></translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation></translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation></translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation></translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation></translation>
</message>
@@ -4929,26 +4934,26 @@
<translation></translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation></translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation></translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation></translation>
</message>
@@ -4963,15 +4968,15 @@
<translation></translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation></translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation></translation>
</message>
@@ -5021,26 +5026,26 @@
<translation></translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation></translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation></translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation></translation>
</message>
<message>
- <location line="-79"/>
+ <location line="-1942"/>
<source>Ctrl+Enter, Enter, Media Play, Ctrl+Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -5051,7 +5056,7 @@
<translation></translation>
</message>
<message>
- <location line="+225"/>
+ <location line="+76"/>
<source>Insert Tempo Change</source>
<translation></translation>
</message>
@@ -5091,7 +5096,7 @@
<translation></translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation></translation>
</message>
@@ -5111,36 +5116,36 @@
<translation></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation></translation>
</message>
<message>
- <location line="-4383"/>
+ <location line="+1943"/>
<source>Delete Marker</source>
<translation></translation>
</message>
<message>
- <location line="+469"/>
- <location line="+1693"/>
+ <location line="-4082"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation></translation>
</message>
<message>
- <location line="-1499"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-2695"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation></translation>
</message>
<message>
- <location line="-2594"/>
+ <location line="-851"/>
<source>Show &Track Headers</source>
<translation></translation>
</message>
<message>
- <location line="+217"/>
+ <location line="+218"/>
<source>&Triplet</source>
<translation></translation>
</message>
@@ -5155,12 +5160,12 @@
<translation></translation>
</message>
<message>
- <location line="+881"/>
+ <location line="-3570"/>
<source>Respell as Flat</source>
<translation></translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+1742"/>
<source>Import Rosegarden &Project File...</source>
<translation></translation>
</message>
@@ -5248,13 +5253,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -5271,21 +5276,21 @@
<translation></translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="-1489"/>
<source>Im&port Studio from File...</source>
<translation></translation>
</message>
@@ -5296,27 +5301,27 @@
<translation></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation></translation>
</message>
@@ -5348,19 +5353,19 @@
<translation></translation>
</message>
<message>
- <location line="-1986"/>
- <location line="+2111"/>
+ <location line="+125"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation></translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-747"/>
<source>&Set Quick Marker at Playback Position</source>
<translation></translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation></translation>
</message>
@@ -6666,7 +6671,7 @@
<translation></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-1877"/>
+ <location filename="../QMenuStrings.cpp" line="-634"/>
<location filename="../InstrumentStrings.cpp" line="+1"/>
<source>Triangle</source>
<translation></translation>
@@ -8350,16 +8355,16 @@
<translation></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation></translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation></translation>
@@ -10500,20 +10505,15 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation></translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation></translation>
</message>
@@ -10528,10 +10528,10 @@
<translation></translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation></translation>
</message>
@@ -10546,7 +10546,7 @@
<translation></translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation></translation>
</message>
@@ -10654,45 +10654,53 @@
<translation></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
<translation></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation></translation>
</message>
@@ -10792,7 +10800,7 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation></translation>
</message>
@@ -10889,6 +10897,54 @@
<source>Update Figurations</source>
<translation></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use "%1" instead?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation></translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -10904,7 +10960,7 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation></translation>
</message>
</context>
@@ -10966,12 +11022,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation></translation>
</message>
@@ -11479,24 +11535,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation></translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation></translation>
</message>
@@ -11699,7 +11755,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation></translation>
</message>
@@ -11715,20 +11771,20 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation></translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation></translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation></translation>
</message>
@@ -11739,21 +11795,21 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation></translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation></translation>
</message>
@@ -11773,7 +11829,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation></translation>
</message>
@@ -11789,14 +11845,14 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation></translation>
</message>
@@ -12375,7 +12431,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation></translation>
</message>
@@ -12544,17 +12600,131 @@ Please select the ones you wish to delete permanently from the hard disk.
<source>Tie &Below</source>
<translation></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeVelocityCommand</name>
+</context>
+<context>
+ <name>Rosegarden::ChangeVelocityCommand</name>
+ <message>
+ <location filename="../../src/commands/edit/ChangeVelocityCommand.h" line="+45"/>
+ <source>&Increase Velocity</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Reduce Velocity</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation></translation>
+ </message>
<message>
- <location filename="../../src/commands/edit/ChangeVelocityCommand.h" line="+45"/>
- <source>&Increase Velocity</source>
+ <location line="+4"/>
+ <source>hidden octaves</source>
<translation></translation>
</message>
<message>
- <location line="+1"/>
- <source>&Reduce Velocity</source>
+ <location line="+4"/>
+ <source>for</source>
<translation></translation>
</message>
</context>
@@ -12882,7 +13052,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation></translation>
</message>
@@ -13107,7 +13277,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation></translation>
</message>
@@ -13123,7 +13293,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation></translation>
</message>
@@ -13138,12 +13308,13 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation></translation>
</message>
@@ -13151,7 +13322,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation></translation>
</message>
@@ -13161,7 +13332,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation></translation>
</message>
@@ -13231,7 +13402,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation></translation>
</message>
@@ -13307,7 +13478,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation></translation>
</message>
@@ -15238,7 +15409,7 @@ Example text from file:</source>
<translation></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation></translation>
</message>
@@ -15246,7 +15417,7 @@ Example text from file:</source>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation></translation>
</message>
@@ -15629,55 +15800,6 @@ Example text from file:</source>
</message>
</context>
<context>
- <name>Rosegarden::LilyPondExporter</name>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
- <source>LilyPond does not allow spaces or backslashes in filenames.
-
-Would you like to use
-
- %1
-
- instead?</source>
- <translation></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation></translation>
- </message>
- <message>
- <location line="+1823"/>
- <source>warning: overlong bar truncated here</source>
- <translation></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>warning: bar too short, padding with rests</source>
- <translation></translation>
- </message>
-</context>
-<context>
<name>Rosegarden::LilyPondOptionsDialog</name>
<message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="+64"/>
@@ -16380,7 +16502,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation></translation>
</message>
@@ -16465,12 +16587,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation></translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation></translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation></translation>
</message>
@@ -16694,6 +16811,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -16897,12 +17023,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation></translation>
</message>
@@ -17061,7 +17187,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation></translation>
</message>
@@ -17137,7 +17263,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation></translation>
</message>
@@ -17153,8 +17279,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation></translation>
</message>
@@ -17169,7 +17294,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation></translation>
</message>
@@ -17194,20 +17319,15 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation></translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation></translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation></translation>
</message>
@@ -17227,7 +17347,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation></translation>
</message>
@@ -17350,7 +17470,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation></translation>
</message>
@@ -17365,7 +17485,7 @@ Double-click to open the marker editor.</source>
<translation></translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation></translation>
</message>
@@ -17662,13 +17782,13 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation></translation>
</message>
@@ -18241,7 +18361,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation></translation>
</message>
@@ -18261,7 +18381,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message numerus="yes">
- <location line="-118"/>
+ <location line="-120"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> %n event selected</numerusform>
@@ -18269,7 +18389,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+2656"/>
+ <location line="+2683"/>
<source>Chord</source>
<translation></translation>
</message>
@@ -18279,7 +18399,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="-2238"/>
+ <location line="-2263"/>
<source>Unknown spacing action %1</source>
<translation></translation>
</message>
@@ -18304,12 +18424,12 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation></translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation></translation>
</message>
@@ -18321,16 +18441,15 @@ This is a bug (the program would previously have crashed by now)</source>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation></translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation></translation>
</message>
@@ -18345,24 +18464,24 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation></translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation></translation>
</message>
<message>
- <location line="-873"/>
+ <location line="-877"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation></translation>
</message>
@@ -18372,7 +18491,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+718"/>
+ <location line="+724"/>
<source>Raising velocities...</source>
<translation></translation>
</message>
@@ -18437,7 +18556,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation></translation>
@@ -18448,7 +18567,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation></translation>
</message>
@@ -18488,7 +18607,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation></translation>
</message>
@@ -18563,16 +18682,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Cycling slashes...</source>
<translation></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation></translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation></translation>
</message>
@@ -18597,7 +18711,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation></translation>
@@ -19694,12 +19808,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation></translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation></translation>
</message>
@@ -19764,7 +19878,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation></translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation></translation>
</message>
@@ -20101,8 +20215,8 @@ There may be some incompatibilities with the file format.</source>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20114,7 +20228,7 @@ There may be some incompatibilities with the file format.</source>
<translation></translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation></translation>
</message>
@@ -20186,7 +20300,12 @@ Please select any you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation></translation>
</message>
@@ -20201,7 +20320,7 @@ Please select any you wish to delete permanently from the hard disk.
<translation></translation>
</message>
<message>
- <location line="+187"/>
+ <location line="+190"/>
<source>Error while writing on '%1'</source>
<translation></translation>
</message>
@@ -20258,7 +20377,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<translation></translation>
</message>
<message>
- <location line="+1220"/>
+ <location line="+1221"/>
<source>Warning</source>
<translation></translation>
</message>
@@ -20270,7 +20389,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="-571"/>
+ <location line="-572"/>
<source>Insert Recorded MIDI</source>
<translation></translation>
</message>
@@ -20289,7 +20408,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation></translation>
</message>
@@ -20300,7 +20419,7 @@ Would you like to set it now?</source>
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20309,7 +20428,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20329,7 +20448,7 @@ See Edit -> Preferences -> Audio.</source>
<translation></translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation></translation>
</message>
@@ -20398,14 +20517,14 @@ See Edit -> Preferences -> Audio.</source>
<translation></translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation></translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation></translation>
@@ -20433,12 +20552,12 @@ Do you want to open it instead ?</source>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation></translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20476,12 +20595,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation></translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20501,33 +20620,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation></translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation></translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation></translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation></translation>
</message>
@@ -20537,16 +20656,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation></translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation></translation>
</message>
@@ -20648,12 +20767,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation></translation>
</message>
<message>
- <location line="-2767"/>
+ <location line="-2756"/>
<source>Jog Selection</source>
<translation></translation>
</message>
@@ -20706,12 +20825,12 @@ No segment will be split.</source>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation></translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation></translation>
</message>
@@ -20776,7 +20895,7 @@ No segment will be split.</source>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation></translation>
</message>
@@ -20798,7 +20917,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+1999"/>
+ <location line="+1994"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation></translation>
</message>
@@ -20808,7 +20927,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation></translation>
</message>
@@ -20818,7 +20937,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+615"/>
+ <location line="+595"/>
<source><h3>Invalid audio path</h3></source>
<translation></translation>
</message>
@@ -20848,8 +20967,8 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="-7445"/>
- <location line="+312"/>
+ <location line="-7414"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -20873,8 +20992,8 @@ No segment will be split.</source>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -20884,7 +21003,7 @@ No segment will be split.</source>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -20902,8 +21021,8 @@ No segment will be split.</source>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -20922,7 +21041,7 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation></translation>
</message>
@@ -20932,12 +21051,12 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation></translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation></translation>
</message>
@@ -20969,23 +21088,23 @@ No segment will be split.</source>
<translation></translation>
</message>
<message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation></translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation></translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation></translation>
@@ -21021,7 +21140,7 @@ Please exit and restart Rosegarden to restore sound capability.</source>
<translation></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation></translation>
@@ -21034,7 +21153,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21042,7 +21161,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation></translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation></translation>
</message>
@@ -21058,7 +21177,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21125,9 +21244,9 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation></translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation></translation>
</message>
@@ -21216,7 +21335,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation></translation>
</message>
@@ -21226,7 +21345,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation></translation>
</message>
@@ -21267,7 +21386,7 @@ Error was : %2</source>
<translation></translation>
</message>
<message>
- <location line="-5561"/>
+ <location line="-5507"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21282,7 +21401,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation></translation>
</message>
@@ -21334,7 +21453,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation></translation>
</message>
@@ -21377,7 +21496,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation></translation>
</message>
@@ -21410,7 +21529,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation></translation>
</message>
@@ -21418,7 +21537,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation></translation>
</message>
@@ -21455,22 +21574,22 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation></translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation></translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation></translation>
</message>
@@ -21665,12 +21784,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation></translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation></translation>
</message>
@@ -21746,7 +21865,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation></translation>
</message>
@@ -21768,17 +21887,17 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation></translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation></translation>
</message>
@@ -21788,7 +21907,7 @@ Would you like to set it now?</source>
<translation></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation></translation>
</message>
@@ -21801,17 +21920,25 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation></translation>
</message>
+ <message numerus="yes">
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation>
+ <numerusform>Move Segment</numerusform>
+ <numerusform>Move %n Segments</numerusform>
+ </translation>
+ </message>
<message>
- <location line="+323"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation></translation>
</message>
@@ -21845,14 +21972,6 @@ Would you like to set it now?</source>
<source>Click and drag to copy segment</source>
<translation></translation>
</message>
- <message numerus="yes">
- <location line="-294"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Move Segment</numerusform>
- <numerusform>Move %n Segments</numerusform>
- </translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSingleRepeatToCopyCommand</name>
@@ -21921,15 +22040,10 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation></translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation></translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23640,7 +23754,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation></translation>
</message>
@@ -23655,7 +23769,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation></translation>
</message>
<message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation></translation>
</message>
@@ -23668,33 +23782,31 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform></numerusform>
- <numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform></numerusform>
- <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation></translation>
</message>
@@ -23740,7 +23852,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation></translation>
</message>
@@ -23751,12 +23863,12 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation></translation>
</message>
@@ -23897,117 +24009,133 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
+ <comment>Clef name</comment>
<translation></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation></translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation></translation>
</message>
@@ -24048,7 +24176,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation></translation>
diff --git a/data/locale/es.ts b/data/locale/es.ts
index 90ebadc..22a5b5f 100644
--- a/data/locale/es.ts
+++ b/data/locale/es.ts
@@ -294,18 +294,6 @@
<translation>Repique - establecer %1 alternando desde el máximo al mÃnimo con ambos cayendo hacia cero</translation>
</message>
<message>
- <source>Half-wave crescendo - set %1 rising from min to maxin a half sine wave contour</source>
- <translation type="obsolete">Crescendo de media onda - establecer %1creciendo desde el mÃnimo al máximo en contorno de onda media sinusoidal </translation>
- </message>
- <message>
- <source>Half-wave diminuendo - set %1 falling from max to minin a half sine wave contour</source>
- <translation type="obsolete">Diminuendo de media onda - establecer %1cayendo desde el máximo al mÃnimo en contorno de onda media sinusoidal</translation>
- </message>
- <message>
- <source>Half-wave crescendo - set %1 rising from min to max n a half sine wave contour</source>
- <translation type="obsolete">Crescendo de media onda - establecer %1creciendo desde el mÃnimo al máximo en contorno de onda media sinusoidal</translation>
- </message>
- <message>
<location filename="../../src/base/parameterpattern/HalfSinePattern.cpp" line="+28"/>
<source>Half-wave crescendo - set %1 rising from min to max in a half sine wave contour</source>
<translation>Crescendo de media onda - establecer %1creciendo desde el mÃnimo al máximo en contorno de onda media sinusoidal</translation>
@@ -344,23 +332,23 @@
<translation>No se puede abrir el archivo de mapeado de tipografÃa %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&Archivo</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>&Añadir archivo de audio...</translation>
</message>
@@ -370,54 +358,54 @@
<translation>&Exportar archivo de audio...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>&Cerrar</translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Editar</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>&Descargar archivo de audio</translation>
</message>
@@ -442,360 +430,356 @@
<translation>Tocar previsualización</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>A&yuda</translation>
</message>
<message>
- <location line="-4708"/>
+ <location line="-2600"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-1680"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation>F1</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">Tutorial &Rosegarden</translation>
- </message>
- <message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>&Directivas de reporte de errores</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>&Acerda de Rosegarden</translation>
</message>
<message>
- <location line="-4722"/>
+ <location line="-2617"/>
<source>&Action</source>
<translation>&Acción</translation>
</message>
<message>
- <location line="+15"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-512"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Barra de Herramientas General</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>&Nada que deshacer</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>Nada &que rehacer</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>&Copiar</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>&Pegar</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Cambiar a herramienta de selección</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Cambiar a inserción de notas</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Cambiar a herramienta de borrado</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>&Guardar</translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation>&Insertar evento</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation>&Borrar evento</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation>Delete</translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation>&Editar evento</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation>Editor &avanzado de eventos</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>Cor&tar</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation>Seleccionar &todo</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>E&liminar Selección</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>&Filtrar Selección</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation>E&stablecer el tiempo de comienzo del segmento...</translation>
</message>
@@ -805,82 +789,82 @@
<translation>E&stablecer la duración del segmento...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Ver</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>Tiempos &musicales</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>Tiempos &reales</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>Tiempos cr&udos</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Seg&mento</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Editar &con</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Abrir en el editor de matri&z</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Abrir en el editor de &partitura</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>Acerda de &Qt</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>Añadir &segno</translation>
</message>
@@ -910,7 +894,7 @@
<translation>Blanca con punti&llo</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>Cambiar a herramienta de ¬as</translation>
</message>
@@ -930,12 +914,12 @@
<translation>Sin &puntillo</translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>Mostrar barra de herramientas &SÃmbolos</translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>Barra de herramientas duración</translation>
</message>
@@ -945,41 +929,41 @@
<translation>Barra de herramientas SÃmbolos</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+2059"/>
+ <location line="-2438"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>Return</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="-353"/>
+ <location line="+29"/>
<source>Ctrl+Shift+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+T</translation>
@@ -991,11 +975,6 @@
<translation>Ctrl+D</translation>
</message>
<message>
- <source>Enter, Media Play, Ctrl+Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Enter, Media Play, Ctrl+Return</translation>
- </message>
- <message>
<location line="+132"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
@@ -1043,7 +1022,7 @@
<translation>End</translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>Mostrar &barra de herramientas</translation>
</message>
@@ -1053,39 +1032,39 @@
<translation>Esconder la b&arra de estado</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Barra de herramientas de Acciones</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Barra de herramientas de Tiempo</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Barra de herramientas de Transporte</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Barra de herramientas de Ampliación</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation>Barra de herramientas de Interpretaciones</translation>
</message>
@@ -1135,7 +1114,7 @@
<translation>Poner énfasis en ciertos pulsos según el compás</translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Insertar marcador</translation>
</message>
@@ -1155,131 +1134,123 @@
<translation>Editar marcador</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation>F2</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Cambiar a herramienta de movimiento</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation>F5</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Cambiar a herramienta de dibujo</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation>F3</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Cambiar a herramienta de redimensionamiento</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation>F4</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">&Nada que deshacer</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Nada &que rehacer</translation>
- </message>
- <message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>&Borrar</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Delete, Ctrl+D</translation>
</message>
<message>
- <location line="-3804"/>
- <location line="+1724"/>
+ <location line="+316"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>Insertar secuencia de infle&xión de tono...</translation>
</message>
<message>
- <location line="-2009"/>
+ <location line="-3205"/>
<source>&Grid</source>
<translation>&Rejilla</translation>
</message>
@@ -1295,13 +1266,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation>0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation>Ajustar a &1/48</translation>
</message>
@@ -1312,13 +1283,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation>Ajustar a 1/&24</translation>
</message>
@@ -1329,13 +1300,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation>Ajusta&r a 1/12</translation>
</message>
@@ -1346,13 +1317,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation>8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation>Ajustar a &3/16</translation>
</message>
@@ -1363,13 +1334,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation>Ajustar a 3/8</translation>
</message>
@@ -1380,37 +1351,37 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation>Ajustar a la Par&te</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation>Ajustar al &Compás</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation>Mostrar barra de herramientas de &Acciones</translation>
</message>
@@ -1421,142 +1392,142 @@
</message>
<message>
<location line="+7"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>Añadir regla de &Controlador</translation>
</message>
<message>
- <location line="-1282"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2477"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&Composición</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Añadir ca&mbio de tempo...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>Añadir cambio de m&edida del compás...</translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Abrir en el editor de lista de &eventos</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation>=</translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation>+</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation>-</translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Left</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Right</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Up</translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Down</translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation>Up</translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation>Down</translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Up</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Down</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Alt+I</translation>
@@ -1569,695 +1540,679 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation>Co&ntroladores</translation>
</message>
<message>
- <source>Cut controller events (&X)</source>
- <translation type="obsolete">Cortar eventos de controlador (&X)</translation>
- </message>
- <message>
- <source>&Copy controller events</source>
- <translation type="obsolete">&Pegar eventos de controlador</translation>
- </message>
- <message>
- <source>Paste events (&V)</source>
- <translation type="obsolete">Pegar eventos (&V)</translation>
- </message>
- <message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation>&Establecer valores de controlador</translation>
</message>
<message>
- <source>&Place a controller for each note</source>
- <translation type="obsolete">&Poner un controlador en cada nota</translation>
- </message>
- <message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation>Insertar se&cuencia de controladores...</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Left</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Right</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>Cursor atrás &compás y seleccionar</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Left</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>Cursor &adelante compás y seleccionar</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Right</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+;</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgUp</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgDown</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation>Left</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation>Right</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Left</translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Right</translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation>Pause</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation>F7</translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>I sostenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation>S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II sostenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV sostenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V sostenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI sostenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation>L</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+E</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Shift+R</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation>U</translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+I</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+I</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation>O</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation>Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+X</translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation>X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Shift+X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation>V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Shift+V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation>N</translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+M</translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation>M</translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation>H</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2516"/>
<source>Panning &Law</source>
<translation>&Regla de panning</translation>
</message>
@@ -2282,7 +2237,7 @@
<translation>Regla &alternativa -3dB (alimentación constante, centro 0dB)</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+929"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Shift+X</translation>
@@ -2316,7 +2271,7 @@
<message>
<location line="+1"/>
<source>Show &Interpret Toolbar</source>
- <translation>Mostrar barra de herramientas de Interpretaciones</translation>
+ <translation>Mostrar barra de herramientas de &Interpretaciones</translation>
</message>
<message>
<location line="+12"/>
@@ -2329,18 +2284,19 @@
<translation>Dump BarDataMap (debug)</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
- <source>Open in &Pitch Tracker</source>
- <translation>Abrir en &tracker de altura</translation>
+ <location line="+4"/>
+ <source>Check for Parallels...</source>
+ <translation>Buscar paralelos... </translation>
</message>
<message>
- <source>Add Clef Change in this link only...</source>
- <translation type="obsolete">Añadir cambio de clave unicamente en este vÃnculo...</translation>
+ <location line="-1269"/>
+ <location line="+623"/>
+ <location line="+652"/>
+ <source>Open in &Pitch Tracker</source>
+ <translation>Abrir en &tracker de altura</translation>
</message>
<message>
- <location line="-2452"/>
+ <location line="+10"/>
<source>Add &Layer</source>
<translation>Añadir &capa</translation>
</message>
@@ -2559,14 +2515,14 @@
<translation>Ctrl+U</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+R</translation>
@@ -2584,8 +2540,8 @@
<translation>Ctrl+)</translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation>~</translation>
@@ -2603,27 +2559,27 @@
<translation>></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>A&juste</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Cuantificación</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>Cuanti&ficar...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>&Repetir cuantificación anterior</translation>
</message>
@@ -2634,36 +2590,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>Fusionar notas d&e igual altura</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>Codear a la &izquierda</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>Codear al &derecho</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>&Incrementar velocidad</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>&Reducir velocidad</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation>&Poner a velocidad actual</translation>
</message>
@@ -2679,315 +2635,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>&Partir duraciones por la mitad</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>&Doblar duraciones</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>Estirar o enco&ger...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>Trans&portar</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>S&ubir un semitono</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>&Bajar un semitono</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>Subir una &Octava</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>Bajar una Octa&va</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>&Transporte por semitonos...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Transporte por &intervalo...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>&Convertir</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>&Inversión</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>&Retrógrada</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>&Inversión retrógrada</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>Activar &Segmento...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>&Herramientas</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>S&eleccionar y Editar</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>&Dibujar</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>&Eliminar</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Mover</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>Redimensi&onar</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>Divi&dir</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>&Velocidad</translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation>Cursor atr&ás y seleccionar</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>Cursor adelante y selec&cionar</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>Establecer repi&tición con la selección</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>Limpiar &repetición</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>T&ransporte</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>&Reproducir</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&Parar</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>Re&bobinar</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Avance &rápido</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Re&bobinar al principio</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Avance rá&pido al final</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>S&olo</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>Desp&lazamiento para seguir la reproducción</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>Apretar la &alarma</translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>Octava s&uperior</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>Modo de Inserción de &Acordes</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>Grabación &Paso a Paso</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>Barras de &herramientas</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>&Reglas</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>M&ostrar regla de Nombres de Acorde</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>Mostrar regla de &Tempo</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Barra de herramientas General</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>G&rabar</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>&Configuración</translation>
</message>
@@ -3072,7 +3028,7 @@
<translation>Mostrar deslizadores n&o asignados</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Cambiar a herramienta de inserción</translation>
</message>
@@ -3082,13 +3038,13 @@
<translation>Fusionar silencios después de borrar</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>Im&primir...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>Vista preli&minar...</translation>
</message>
@@ -3183,26 +3139,26 @@
<translation>Mos&trar cabeceras de pista</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Abrir en el editor de Matri&z de Percusión</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>Añadir ca&mbio de clave...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Añadir cambio de &tono...</translation>
</message>
<message>
- <location line="-1493"/>
+ <location line="-2689"/>
<source>Nothing to &Undo</source>
<translation>&Nada que deshacer</translation>
</message>
@@ -3213,50 +3169,46 @@
</message>
<message>
<location line="+355"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation>Cortar eventos de controlador (&X)</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation>&Copiar eventos de controlador</translation>
</message>
<message>
- <source>Paste Events (&V)</source>
- <translation type="obsolete">Pegar eventos (&V)</translation>
- </message>
- <message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation>&Poner un controlador en cada nota</translation>
</message>
<message>
- <location line="-1030"/>
- <location line="+1936"/>
+ <location line="-2226"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation>Tutorial &Rosegarden</translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation>&Nada que deshacer</translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation>Nada &que rehacer</translation>
</message>
<message>
- <location line="-2526"/>
+ <location line="+105"/>
<source>&Guess Beats</source>
<translation>&Vislumbrar pulsos</translation>
</message>
@@ -3266,7 +3218,7 @@
<translation>Mostrar barra de herramientas de &Capa</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+28"/>
<source>Add Clef Change in This Link Only...</source>
<translation>Añadir cambio de clave unicamente en este vÃnculo...</translation>
</message>
@@ -3281,13 +3233,13 @@
<translation>Añadir pedal libe&rado</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>&Convertir partitura...</translation>
</message>
<message>
- <location line="-2101"/>
+ <location line="+10"/>
<source>Unadopt an Adopted Segment</source>
<translation>Renunciar segmento adoptado</translation>
</message>
@@ -3609,8 +3561,8 @@
<translation>&Restablecer plicas</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>&Frase</translation>
</message>
@@ -3680,14 +3632,14 @@
<translation>Ligadura de expresión a&bajo</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>&Ligar</translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>&Desligar</translation>
</message>
@@ -3767,14 +3719,14 @@
<translation>&Normalizar silencios</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+N</translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation>&Fusionar silencios</translation>
</message>
@@ -3784,8 +3736,8 @@
<translation>&Notas</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+=</translation>
@@ -3959,13 +3911,13 @@
<translation>Te&mporización fina</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>Codear a la de&recha</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>&Visibilidad</translation>
</message>
@@ -4012,26 +3964,26 @@
<translation>Pentagrama &abajo</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>Segmento an&terior</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>Segmento &siguiente</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>Re&gresar un paso</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>Adelanta&r un paso</translation>
</message>
@@ -4176,14 +4128,14 @@
<translation>Acorde de &guitarra</translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>&Insertar nota</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>Octava &inferior</translation>
</message>
@@ -4203,13 +4155,13 @@
<translation>Modo de inserción de apo&yatura</translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>M&ostrar barra de herramientas de Herramientas</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>Mostrar barra de herramientas de &Alteraciones</translation>
</message>
@@ -4229,18 +4181,18 @@
<translation>Mostrar barra de herramientas de &Grupo</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>Mostrar barra de herramientas de &Transporte</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>Mostrar barra de herramientas de &Formato</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+O</translation>
@@ -4253,13 +4205,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Ins</translation>
@@ -4270,7 +4222,7 @@
<translation>Mostrar regla de Nombres de Aco&rde</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation>Mostrar ®la de Nota Cruda</translation>
</message>
@@ -4285,7 +4237,7 @@
<translation>Mostrar Directivos para &LilyPond</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>Barra de herramientas de Claves</translation>
</message>
@@ -4305,7 +4257,7 @@
<translation>Barra de herramientas de Marcadores</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation>Seleccionar &todos los eventos</translation>
</message>
@@ -4326,54 +4278,54 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>&Manual de Rosegarden</translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>Preferencias...</translation>
</message>
<message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>Mostrar la regla de &Velocidad</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Mostrar la regla de &Inflexión de Tono</translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation>Cursor atr&ás y seleccionar</translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Barra de herramientas de Reglas</translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>&Preferencias...</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation>Mostrar ba&rra de herramientas de Reglas</translation>
</message>
<message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>Regresar un paso (Izquierda)</translation>
</message>
@@ -4383,13 +4335,13 @@
<translation>Reproducir</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>Adelantar un paso (Derecha)</translation>
</message>
<message>
- <location line="-2671"/>
+ <location line="-1844"/>
<source>Insert into Selected Audio Track</source>
<translation>Insertar en pista de audio seleccionada</translation>
</message>
@@ -4399,8 +4351,8 @@
<translation>Distribuir audio en segmento de MIDI</translation>
</message>
<message>
- <location line="+635"/>
- <location line="+1550"/>
+ <location line="-1388"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4482,21 +4434,21 @@
<translation>Sin &puntillo</translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation>P</translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation>Modo de inserción de Grupos &Irregulares</translation>
</message>
@@ -4667,7 +4619,7 @@
<translation>Barra de herramientas de Capa</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Cambiar a herramienta de inserción</translation>
</message>
@@ -4722,7 +4674,7 @@
<translation>Hacer visible</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Ligadura automática donde sea apropiado</translation>
</message>
@@ -4762,7 +4714,7 @@
<translation>Doble bemol</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>&Nuevo</translation>
</message>
@@ -4772,23 +4724,11 @@
<translation>&Importar</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Importar archivo de &Proyecto de Rosegarden...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Importar archivo de &MIDI...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>Importar archivo de &Hydrogen...</translation>
</message>
<message>
- <source>Import MusicXM&L file...</source>
- <translation type="obsolete">Importar archivo de MusicXM&L...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Merge</source>
<translation>&Mezclar</translation>
@@ -4799,44 +4739,16 @@
<translation>Me&zclar archivo...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Mezclar archivo de &MIDI...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Mezclar archivo de &Hydrogen...</translation>
</message>
<message>
- <source>Merge MusicXM&L file...</source>
- <translation type="obsolete">Mezclar archivo de MusicXM&L...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Export</source>
<translation>&Exportar</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Exportar archivo de &Proyecto de Rosegarden...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Exportar archivo de &MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Exportar archivo de &Csound...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Exportar archivo de M&up...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Exportar archivo de Music&XML...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>&Abrir...</translation>
@@ -4847,10 +4759,6 @@
<translation>Abrir &reciente</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Guardar &como...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>Guardar como &Plantilla...</translation>
@@ -4947,10 +4855,6 @@
<translation>Esta&blecer tempos desde segmento de pulsos</translation>
</message>
<message>
- <source>Fit existing beats to beat segment</source>
- <translation type="obsolete">Hacer caber pulsos existentes con un segmento de pulsos</translation>
- </message>
- <message>
<location line="+2"/>
<source>Change &Composition Start and End...</source>
<translation>&Cambiar Comienzo y Final de la Composición...</translation>
@@ -4971,13 +4875,13 @@
<translation>Insertar Marcador &Rápido en la posición de reproducción</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>Sal&tar a Marcador Rápido</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation>E&studio</translation>
</message>
@@ -5037,53 +4941,49 @@
<translation>Conmutar repetición</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Abrir en editor pre&determinado</translation>
- </message>
- <message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>Ree&tiquetado...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>&Repetir cuantificación anterior</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>Estirar o enco&ger...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>E&stablecer el tiempo de comienzo...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>E&stablecer la duración...</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation>Hacer &anacrusa...</translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Unir</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>Di&vidir</translation>
</message>
@@ -5198,26 +5098,26 @@
<translation>&Remapear Instrumentos...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>&Cambiar tamaño</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation>&Grabar durante ejecución</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>&Mostrar barra de herramientas Principal</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>Mostrar barra de herramientas de &Pistas</translation>
</message>
@@ -5232,27 +5132,19 @@
<translation>Mostrar barra de herramientas de &Ampliación</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>Mostrar la b&arra de estado</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>Mostrar regla de Posición de Ejec&ución</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Importar archivo de &X11 Rosegarden...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Mezclar archivo de &X11 Rosegarden...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>Me&zclador MIDI</translation>
@@ -5263,10 +5155,6 @@
<translation>Mostrar regla de Te&mpo</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Exportar archivo de &LilyPond...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>Mostrar &Transporte</translation>
@@ -5313,26 +5201,26 @@
<translation>Barra de herramientas de Edición</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Rebobinar al principio</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Avance rápido hacia el final</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>&Donaciones</translation>
</message>
<message>
- <location line="-620"/>
+ <location line="-2483"/>
<source>Import Rosegarden &Project File...</source>
<translation>Importar archivo de &Proyecto de Rosegarden...</translation>
</message>
@@ -5407,13 +5295,13 @@
<translation>Hacer caber pulsos existentes con un segmento de pulsos</translation>
</message>
<message>
- <location line="+53"/>
- <location line="+371"/>
+ <location line="-570"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation>Abrir en editor pre&determinado</translation>
</message>
<message>
- <location line="-257"/>
+ <location line="+114"/>
<source>&Update all Figurations</source>
<translation>Actu&alizar todas figuraciones</translation>
</message>
@@ -5424,7 +5312,7 @@
<translation></translation>
</message>
<message>
- <location line="+300"/>
+ <location line="+151"/>
<source>Insert Tempo Change</source>
<translation>Insertar Cambio de Tempo</translation>
</message>
@@ -5464,7 +5352,7 @@
<translation>Abrir Editor de Tempo y Medida</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>&Editar Elemento</translation>
</message>
@@ -5484,7 +5372,7 @@
<translation>&Preferencias</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>Pegar como nuevo &Segmento Activado</translation>
</message>
@@ -8468,16 +8356,16 @@
<translation><nada></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>Plugin sinte</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>Audio </translation>
@@ -10618,20 +10506,15 @@
<translation>Desconocida</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10646,10 +10529,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%2 %3 controlador %1</translation>
</message>
@@ -10664,7 +10547,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>¡Bienvenido!</translation>
</message>
@@ -10772,7 +10655,7 @@
<translation><qt><p>Ninguna pista armada para grabar.</p><p>Arme al menos uno de los LEDs <img src=":pixmaps/tooltip/record-leds.png"> de grabación e intente de nuevo</p></qt></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>Fallo al grabar audio.</p><p>Establezca un camino de audio válido por <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></translation>
</message>
@@ -10838,40 +10721,52 @@
<translation>Actualmente sólo soporta Rosegarden los archivos de RIFF de coma flotante de 32 bits</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>Tamaño erróneo por dato «long» en flujo de datos MIDI</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>Tamaño erróneo por dato «int» en flujo de datos MIDI</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>Se encontró fin de archivo (EOF) mientras leyendo</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation>Se intentó leer más bytes que fue posible en pista </translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation>Se intentó leer más allá del fin del archivo de MIDI</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation>Archivo dañado o en formato no estándar</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation>No es archivo MIDI</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation>Archivo MIDI de formato inesperado</translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>Se encontró un código de evento erróneo</translation>
+ <translation type="obsolete">Se encontró un código de evento erróneo</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation>Estado de ejecución usado por primero evento en pista</translation>
</message>
@@ -10929,7 +10824,7 @@
<translation>Archivo de audio erróneo </translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation>Este evento está ligado a otro evento.</translation>
</message>
@@ -11010,6 +10905,65 @@
<source>Update Figurations</source>
<translation>Actualizar figuraciones</translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation>LilyPond no permite espacios o barras invertidas en los nombres de archivo.
+
+¿Quiere usar «%1» en su lugar? </translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation>Ha fallado la exportación. El archivo no se ha podido abrir para escritura.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation>Éxito al exportar, pero la composición fue vacÃa.</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation>Fallo al exportar pistas no silenciadas. No hay pistas no silenciadas, o no hay segmentos en ellas.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation>Fallo al exportar pista seleccionada. No hay segmentos en las pista seleccionada.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation>Fallo al exportar segmentos seleccionadas. Ningún segmento seleccionado.</translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation>aviso: compás demasiado largo truncado aquÃ</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation>aviso: compás demasiado corto; rellenando con silencios </translation>
+ </message>
+</context>
+<context>
+ <name>QOject</name>
+ <message>
+ <source>Not a MIDI file</source>
+ <translation type="obsolete">No es archivo MIDI</translation>
+ </message>
+ <message>
+ <source>Unexpected MIDI file format</source>
+ <translation type="obsolete">Archivo MIDI de formato inesperado</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11025,16 +10979,8 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation><p>Copyright 2000-2014 el equipo de Rosegarden</p><p>Versión: %1 Versión de Qt: %2<br>Clave: %3</p><p>Rosegarden se realizó por un equipo de voluntarios ubicado por todas partes del mundo. Para aprender quÃen desarolló Rosegarden, consulte el <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">sitio Rosegarden</a><br>Para más información acerca de Rosegarden, consulte <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licencia: GNU General Public License Version 2 or later</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="obsolete"><p>Copyright 2000-2012 el equipo de Rosegarden</p><p>Versión: %1 Versión de Qt: %2<br>Clave: %3</p><p>Rosegarden se realizó por un equipo de voluntarios ubicado por todas partes del mundo. Para aprender quÃen desarolló Rosegarden, consulte el <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">sitio Rosegarden</a><br>Para más información acerda de Rosegarden, consulte <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licencia: GNU General Public License Version 2 or later</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2011 el equipo de Rosegarden</p><p>Versión: %1 Versión de Qt: %2<br>Clave: %3</p><p>Rosegarden se realizó por un equipo de voluntarios ubicado por todas partes del mundo. Para aprender quÃen desarolló Rosegarden, consulte el <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">sitio Rosegarden</a><br>Para más información acerda de Rosegarden, consulte <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licencia: GNU General Public License Version 2</p> {2000-2011 ?} {1 ?} {2<?} {3<?} {2<?}</translation>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <translation><p>Copyright 2000-2012 el equipo de Rosegarden</p><p>Versión: %1 Versión de Qt: %2<br>Clave: %3</p><p>Rosegarden se realizó por un equipo de voluntarios ubicado por todas partes del mundo. Para aprender quÃen desarolló Rosegarden, consulte el <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">sitio Rosegarden</a><br>Para más información acerda de Rosegarden, consulte <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licencia: GNU General Public License Version 2 or later</p> {2000-2015 ?} {1 ?} {2<?} {3<?} {2 ?}</translation>
</message>
</context>
<context>
@@ -11095,12 +11041,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>No es posible añadir indicaciones solapadas idénticas</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>Añadir &ligadura</translation>
</message>
@@ -11608,24 +11554,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Haga clic para renombrar este instrumento</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>Haga clic en el botón arriba para renombrar este instrumento</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><sin sinte></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><sin plugin></translation>
</message>
@@ -11678,10 +11624,6 @@
<translation>Archivo</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><sin archivos de audio></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Guardar archivo como</translation>
@@ -11837,7 +11779,7 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Mezclador de audio</translation>
</message>
@@ -11853,20 +11795,20 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Panorama</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>Nivel de audio</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Mono o estéreo</translation>
</message>
@@ -11877,21 +11819,21 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><nada></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>Haga clic para cargar un plugin de audio</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>Haga clic para renombrar este instrumento</translation>
</message>
@@ -11911,7 +11853,7 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<translation>Haga clic en el botón arriba para renombrar este instrumento</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Sub %1</translation>
</message>
@@ -11927,14 +11869,14 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<translation>Master</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><sin plugin></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-es</translation>
</message>
@@ -12513,7 +12455,7 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<translation>¿Confirma la eliminación de este banco?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>¿Confirma la eliminación de este mapa de teclado?</translation>
</message>
@@ -12697,6 +12639,120 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation>Buscar paralelos</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation>Buscar unÃsonos</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation>Buscar paralelos escondidos </translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation>Iniciar</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation>Borrar</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation>Exportar</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation>Ok</translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation>compás</translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation> </translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation>golpe</translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation>fracción</translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation>Reiniciar</translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation>se encontraron notas múltiples por</translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation>paralelo en compás</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation>paralelos en compás</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation>unÃsonos</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation>quintas</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation>octavos</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation>quintas escondidas</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation>octavos escondidos</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation>por</translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -13020,7 +13076,7 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13245,7 +13301,7 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Velocidad</translation>
</message>
@@ -13261,7 +13317,7 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Tipo de evento no soportado</translation>
</message>
@@ -13276,12 +13332,13 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<translation>Eventos de controlador</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>Insertar lÃnea de controladores</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>Numero de evento de controlador</translation>
</message>
@@ -13289,7 +13346,7 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>&Copiar</translation>
</message>
@@ -13299,7 +13356,7 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<translation>(extracto)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(copiado)</translation>
</message>
@@ -13369,7 +13426,7 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>Cor&tar</translation>
</message>
@@ -13409,10 +13466,6 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Orden Reunir</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>Borrar ámbito</translation>
@@ -13437,12 +13490,12 @@ Por favor, seleccione cuáles de ellos quiere borrar permanentemente del disco d
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation>[ningún]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -14468,22 +14521,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>Descargando %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Fallo al conectar al servidor de FTP</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Fallo de autenticación</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Fallo al cambiar al directorio correcto</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">Descarga FTP abortada</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Descarga abortada</translation>
@@ -15402,7 +15439,7 @@ Ejemplo de texto perteneciente del archivo:</translation>
<translation>Parámetros de instrumento</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Pista</translation>
</message>
@@ -15410,7 +15447,7 @@ Ejemplo de texto perteneciente del archivo:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation>nada</translation>
</message>
@@ -15795,7 +15832,6 @@ Ejemplo de texto perteneciente del archivo:</translation>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15803,7 +15839,7 @@ Would you like to use
%1
instead?</source>
- <translation>LilyPond no permite espacios o barras invertidas en los nombres de archivo.
+ <translation type="obsolete">LilyPond no permite espacios o barras invertidas en los nombres de archivo.
¿Quiere usar
@@ -15812,43 +15848,32 @@ Would you like to use
en su lugar? </translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation>Ha fallado la exportación. El archivo no se ha podido abrir para escritura.</translation>
+ <translation type="obsolete">Ha fallado la exportación. El archivo no se ha podido abrir para escritura.</translation>
</message>
<message>
- <location line="+169"/>
<source>Export succeeded, but the composition was empty.</source>
- <translation>Éxito al exportar, pero la composición fue vácia.</translation>
+ <translation type="obsolete">Éxito al exportar, pero la composición fue vácia.</translation>
</message>
<message>
- <location line="+42"/>
<source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation>Fallo al exportar pistas no silenciadas. No hay pistas no silenciadas, o no hay segmentos en ellas.</translation>
+ <translation type="obsolete">Fallo al exportar pistas no silenciadas. No hay pistas no silenciadas, o no hay segmentos en ellas.</translation>
</message>
<message>
- <location line="+6"/>
<source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation>Fallo al exportar pista seleccionada. No hay segmentos en las pista seleccionada.</translation>
- </message>
- <message>
- <source>Export of unmuted tracks failed. There is no unmuted tracks or no segments on them.</source>
- <translation type="obsolete">Fallo al exportar pistas no silenciadas</translation>
+ <translation type="obsolete">Fallo al exportar pista seleccionada. No hay segmentos en las pista seleccionada.</translation>
</message>
<message>
- <location line="+5"/>
<source>Export of selected segments failed. No segments are selected.</source>
- <translation>Fallo al exportar segmentos seleccionadas. Ningún segmento seleccionado.</translation>
+ <translation type="obsolete">Fallo al exportar segmentos seleccionadas. Ningún segmento seleccionado.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>aviso: compás demasiado largo truncado aquÃ</translation>
+ <translation type="obsolete">aviso: compás demasiado largo truncado aquÃ</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>aviso: compás demasiado corto; rellenando con silencios </translation>
+ <translation type="obsolete">aviso: compás demasiado corto; rellenando con silencios </translation>
</message>
</context>
<context>
@@ -15874,10 +15899,6 @@ en su lugar? </translation>
<translation>Opciones básicas</translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Pistas seleccionadas</translation>
- </message>
- <message>
<location line="+31"/>
<source>Compatibility level</source>
<translation>Nivel de compatibilidad</translation>
@@ -15972,10 +15993,6 @@ en su lugar? </translation>
<translation>Imprimir nombres de pentagrama cortos </translation>
</message>
<message>
- <source><qt>Useful for large, complex scores, this prints the short name every time there is a line break in the score, making it easier to follow which line belongs to which instrument across pages</qt></source>
- <translation type="obsolete"><qt>Útil para partituras largas y complejas, imprime el nombre corto cada vez que se encuentra una nueva lÃnea, resulta más fácil asociar un pentagrama con un instrumento a través de varias páginas</qt></translation>
- </message>
- <message>
<location line="+42"/>
<source>Notation language</source>
<translation>Idioma de partitura</translation>
@@ -16562,7 +16579,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation><qt>Establecer las variación del programa arriba, si disponible en el estudio</qt></translation>
</message>
@@ -16572,14 +16589,6 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation><qt>Establecer el bando de MIDI de donde seleccionar programas</qt></translation>
</message>
<message>
- <source>auto</source>
- <translation type="obsolete">automático</translation>
- </message>
- <message>
- <source>fixed</source>
- <translation type="obsolete">fijo</translation>
- </message>
- <message>
<location line="+26"/>
<source><qt>Set the MIDI program or "patch"</p></qt></source>
<translation><qt>Establecer el programa o "parche" de MIDI</p></qt></translation>
@@ -16655,12 +16664,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>Recibir externo</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Sin conexión</translation>
</message>
@@ -16884,6 +16888,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation>Marcar paralelo</translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17089,12 +17102,12 @@ Doble clic para abrir el editor de marcadores.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Pulse mayúsculas para evitar ajustar el tiempo a la cuadrÃcula de ritmo</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Copiar y mover evento</translation>
</message>
@@ -17253,7 +17266,7 @@ Doble clic para abrir el editor de marcadores.</translation>
<translation>Cambiar velocidades</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>Haga clic y arrastre para copiar agrandar o reducir a escala la velocidad de las notas seleccionadas</translation>
</message>
@@ -17266,12 +17279,12 @@ Doble clic para abrir el editor de marcadores.</translation>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation>Acción de insertar nota desconocida: %1</translation>
</message>
<message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation><sin tÃtulo></translation>
</message>
@@ -17334,7 +17347,7 @@ Doble clic para abrir el editor de marcadores.</translation>
<translation>Ningún</translation>
</message>
<message>
- <location line="+666"/>
+ <location line="+668"/>
<source>Estimated time signature shown</source>
<translation>Se muestra la estimación de la medida del compás</translation>
</message>
@@ -17349,12 +17362,12 @@ Doble clic para abrir el editor de marcadores.</translation>
<translation>Por número de semitonos: </translation>
</message>
<message>
- <location line="+775"/>
+ <location line="+774"/>
<source>Estimated key signature shown</source>
<translation>Se muestra la armadura estimada</translation>
</message>
<message>
- <location line="-1095"/>
+ <location line="-1094"/>
<source>Trigger Segment</source>
<translation>Activar Segmento</translation>
</message>
@@ -17364,12 +17377,12 @@ Doble clic para abrir el editor de marcadores.</translation>
<translation>Eliminar Activadores</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>Matriz</translation>
</message>
<message>
- <location line="+1250"/>
+ <location line="+1252"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:matrix-es</translation>
</message>
@@ -17385,21 +17398,15 @@ Doble clic para abrir el editor de marcadores.</translation>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
- <message>
- <location line="-95"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>No es posible insertar nota: No hay una duración de rejilla seleccionada</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Ampliar</translation>
</message>
@@ -17419,7 +17426,7 @@ Doble clic para abrir el editor de marcadores.</translation>
<translation>Reiniciar ampliación</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Girar la rueda para cambiar el segmento activo</qt></translation>
</message>
@@ -17542,7 +17549,7 @@ Doble clic para abrir el editor de marcadores.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>Mezclador MIDI</translation>
</message>
@@ -17557,7 +17564,7 @@ Doble clic para abrir el editor de marcadores.</translation>
<translation>Instrumento</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-es</translation>
</message>
@@ -17854,13 +17861,13 @@ Doble clic para abrir el editor de marcadores.</translation>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Partitura</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Modo de formato predeterminado</translation>
</message>
@@ -18435,7 +18442,7 @@ Esto es un bug (el programa deberÃa haber fallado ya)</translation>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> TipografÃa: </translation>
</message>
@@ -18455,7 +18462,7 @@ Esto es un bug (el programa deberÃa haber fallado ya)</translation>
<translation> Espaciado: </translation>
</message>
<message numerus="yes">
- <location line="-118"/>
+ <location line="-120"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> un evento seleccionado</numerusform>
@@ -18468,7 +18475,7 @@ Esto es un bug (el programa deberÃa haber fallado ya)</translation>
<translation> Sin selección </translation>
</message>
<message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation> Acorde</translation>
</message>
@@ -18478,7 +18485,7 @@ Esto es un bug (el programa deberÃa haber fallado ya)</translation>
<translation>Apoyatura</translation>
</message>
<message>
- <location line="-2238"/>
+ <location line="-2263"/>
<source>Unknown spacing action %1</source>
<translation>Acción de espaciado desconocida %1</translation>
</message>
@@ -18503,42 +18510,37 @@ Esto es un bug (el programa deberÃa haber fallado ya)</translation>
<translation>Opciones de previsualización con LilyPond </translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Ha fallado la exportación. El archivo no se ha podido abrir para escritura.</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Portapapeles vacÃo</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>No es posible pegar múltiples segmentos en uno</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation><qt>Aplicar</qt></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+381"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>Imprimiendo con LilyPond...</translation>
</message>
@@ -18553,24 +18555,24 @@ Esto es un bug (el programa deberÃa haber fallado ya)</translation>
<translation><qt><p>Fallo al abrir un archivo provisional para la exportación LilyPond.</p><p>Esto probablemente signifca que ya no queda espacio libre en <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation><qt><p>El tipo de pegado Restringido requiere suficiente espacio en la posición de pegado (conteniendo únicamente silencios) para albergar todos los eventos que van a ser pegados</p><p>No se ha encontrado espacio suficiente.</p><p>Si quiere pegar de todas formas, considere el uso de uno de los otros tipos de pegado en la opción <b>Pegar..."</b> del menú Editar. También puede cambiar el tipo de pegado por defecto a otro distinto del Restringido si asà lo desea.</p></qt></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>Insertando el contenido del portapapeles...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>No se puede pegar en este punto.</translation>
</message>
<message>
- <location line="+141"/>
+ <location line="+143"/>
<source>Raising velocities...</source>
<translation>Subiendo velocidades...</translation>
</message>
@@ -18600,10 +18602,6 @@ Esto es un bug (el programa deberÃa haber fallado ya)</translation>
<translation>Ornamento compás %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Crear ornamento</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>Usar ornamento</translation>
@@ -18639,7 +18637,7 @@ Esto es un bug (el programa deberÃa haber fallado ya)</translation>
<translation>Sostenido</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>No hay un controlador de Sustain definido para este dispositivo.
@@ -18651,7 +18649,7 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
<translation>Se muestra la estimación de la medida del compás</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - Segmento Pista %3 - Partitura</translation>
</message>
@@ -18691,7 +18689,7 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
<translation>Por número de semitonos: </translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>Tiempo: %1 (%2.%3s)</translation>
</message>
@@ -18766,16 +18764,11 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
<source>Cycling slashes...</source>
<translation>Conmutando corchetes...</translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>No es posible insertar nota: No hay una duración seleccionada</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Ampliar</translation>
</message>
@@ -18800,7 +18793,7 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
<translation>Cerrar cabeceras de pista</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Girar la rueda para cambiar el segmento activo</qt></translation>
@@ -19022,10 +19015,6 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">Secuencia de inflexión de tono</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>Preprograma</translation>
@@ -19036,10 +19025,6 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
<translation>Preprograma:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">Usuario</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -19262,23 +19247,11 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
<translation>http://rosegardenmusic.com/wiki/doc:pitchbendsequencedialog-controllerbranch-es</translation>
</message>
<message>
- <source>User %1</source>
- <translation type="obsolete">Usuario %1</translation>
- </message>
- <message>
<location line="-901"/>
<source>Pre Bend</source>
<translation>Pre-inflexión</translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Valor (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Duración (%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation>Duración de rampa (%):</translation>
@@ -19299,31 +19272,11 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
<translation>Valor final (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">Amplitud de vibrato al comienzo (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">Amplitud de vibrato al final (%):</translation>
- </message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-es</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation>Sequencia de inflexión</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Longitud de onda de vibrato:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">Resolución:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Tiempo final inválido. ¿Ha seleccionado unos eventos?</translation>
@@ -19937,12 +19890,12 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Nada</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>Dosillo</translation>
</message>
@@ -20007,7 +19960,7 @@ Por favor, asegúrese de que está correctamente configurado en el cuadro de di
<translation>Dividir-y-ligar acordes solapados</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Cuantificador completo</translation>
</message>
@@ -20347,8 +20300,8 @@ Pueden haber incompatibilidades con el formato del archivo.</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20360,7 +20313,7 @@ Pueden haber incompatibilidades con el formato del archivo.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>Rosegarden no logró guardar el documento en %1</translation>
</message>
@@ -20438,7 +20391,12 @@ Por favor, decida si quiere borrarlos permanentemente del disco duro.
<translation>Mezclar</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation>'%1' es sólo lectura. Favor de guardar en archivo distinto.</translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>Fallo al crear un archivo temporario en directorio '%1': %2</translation>
</message>
@@ -20453,7 +20411,7 @@ Por favor, decida si quiere borrarlos permanentemente del disco duro.
<translation>Fallo al renombrar '%1 a '%2'</translation>
</message>
<message>
- <location line="+187"/>
+ <location line="+190"/>
<source>Error while writing on '%1'</source>
<translation>Fallo al escribir en '%1'</translation>
</message>
@@ -20513,7 +20471,7 @@ Rosegarden. Se recomienda guardar este archivo con la versión actual de
Rosegarden para garantizar que podrá ser reconocida por futuras versiones.</translation>
</message>
<message>
- <location line="+1220"/>
+ <location line="+1221"/>
<source>Warning</source>
<translation>Advertencia</translation>
</message>
@@ -20527,11 +20485,7 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
¿Quiere configurarlo ahora?</translation>
</message>
<message>
- <source><qt><h2>Channels were remapped</h2><p>Beginning with version 10.02, Rosegarden no longer provides controls for changing the channel associated with each MIDI instrument. Instead, each instrument uses the same channel as its instrument number. For example, "MIDI Input System Device #12" always uses channel 12.</p><p>The file you just loaded contained instruments whose channels differed from the instrument numbers. These channels have been reassigned so that instrument #1 will always use channel 1, regardless of what channel it might have used previously. In most cases, you will experience no difference, but you may have to make some small changes to this file in order for it to play as intended. We recommend that you save this file in order to avoid seeing this warning in the future.</p><p>We apologize for any inconvenience.</p></qt></source>
- <translation type="obsolete"><qt><h2>Se remapearon unos canales</h2><p>Desde la versión 10.02 de Rosegarden se han eliminado los controles para cambiar el canal asociado con cada instrumento de MIDI. En su lugar, cada instrumento usa siempre el mismo canal como su número de instrumento. Por ejemplo, «Dispositivo de entrada de MIDI #12» usa siempre el canal 12.</p><p>El archivo que se cargó recientemente contiene instrumentos cuyos canales no corresponden con sus instrumentos. Estos canales se han remapeado para corresponder, asà es que el instrumento #1 siempre usa el canal 1, no importa qué fuera el canal anterior. En la mayorÃa de casos, usted no notará ningún cambio, pero es posible que sea necesario hacer unas ligeras modificaciones para que el archivo se reproduzca según la intención original. Se recomienda guardar este archivo para evitar este aviso en el futuro.</p></qt></translation>
- </message>
- <message>
- <location line="-571"/>
+ <location line="-572"/>
<source>Insert Recorded MIDI</source>
<translation>Insertar MIDI grabado</translation>
</message>
@@ -20550,7 +20504,7 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>La selección sólo puede contener o segmentos de audio o segmentos de MIDI, no ambos</translation>
</message>
@@ -20561,7 +20515,7 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20570,7 +20524,7 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20591,7 +20545,7 @@ See Edit -> Preferences -> Audio.</source>
Vea Editar -> Preferencias -> Audio.</translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation>No puede añadir archivo soltado. Servidor de audio JACK no está disponible.</translation>
</message>
@@ -20660,14 +20614,14 @@ Vea Editar -> Preferencias -> Audio.</translation>
<translation>Iniciando...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> Ampliar: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -20696,12 +20650,12 @@ Do you want to open it instead ?</source>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Sin tÃtulo</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20741,12 +20695,12 @@ Error fue: %2</translation>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Todos archivos soportados</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20766,33 +20720,33 @@ Error fue: %2</translation>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Todos los archivos</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Abrir archivo</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -20802,16 +20756,16 @@ Error fue: %2</translation>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>No se puede abrir el archivo %1</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>Guardando archivo...</translation>
</message>
@@ -20913,12 +20867,12 @@ Error fue: %2</translation>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Advertencia</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -20974,12 +20928,12 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Establecer tempo global</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>Conmuta la barra de herramientas...</translation>
</message>
@@ -21047,12 +21001,12 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Archivos de proyecto Rosegarden</translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation><qt><p>Es necesario establecer un nombre de archivo antes de grabar audio.</p><p>Los archivos de audio se guardarán en <b>%1</b> como <b>rg-[<i>nombre</i>]-[<i>instrumento</i>]-<i>fecha</i>_<i>hora</i>-<i>n</i>.wav</b>. Puede que quiera usted renombrar también los instrumentos de audio antes de grabar. Véase el <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-es">Wik de Rosegardeni</a> para aprender más.</p></qt></translation>
</message>
@@ -21062,13 +21016,13 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
<translation>Editar</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-es</translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21092,8 +21046,8 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21103,7 +21057,7 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21121,8 +21075,8 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21131,12 +21085,12 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation>http://rosegardenmusic.com/tutorials/</translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation><h3>Versión más actualizada disponible</h3></translation>
</message>
@@ -21146,7 +21100,7 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
<translation><p>La versión de esta aplicación es %1. Versión %2 está disponible.</p><p>Consulte el <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">web de Rosegarden</a> para ver más información sobre esta versión más actualizada.</p></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>Abrir archivo MIDI</translation>
</message>
@@ -21156,12 +21110,12 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
<translation>Mezclar archivo MIDI</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>Importando archivo MIDI...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>Calculando partitura...</translation>
</message>
@@ -21193,36 +21147,24 @@ Usted debe establecer el directorio de archivos de audio en un directorio válid
<translation>No se puede cargar archivo de X11 Rosegarden. Parece estar corrompido.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Abrir archivo de Hydrogen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Importando archivo.de Hydrogen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">No se puede cargar archivo de Hydrogen. Parece estar corrompido.</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>No pudo abrir un archivo provisional para la exportación LilyPond.</p><p>Esto probablemente signifca que ya no queda espacio libre en <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>El proceso del secuenciador de Rosegarden ha finalizado de forma inesperada. Sonido y grabación ya no van a estar disponibles para esta sesión.
Por favor, finalice y reinicie Rosegarden para restaurar las funcionalidades de sonido.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>Iniciando secuenciador...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>Guardando archivo%1con nombre nuevo...</translation>
@@ -21266,7 +21208,7 @@ No se divide ningún segmento.</translation>
<translation>Borrar tempo y armadura originales</translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation>El secuenciador de Rosegarden no pudo ser iniciado, por lo tanto no estarándisponibles en esta sesión ni sonido ni grabación.
@@ -21280,7 +21222,7 @@ Para asistencia acerca de una correcta configuración de audio y MIDI, vaya ahtt
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21288,7 +21230,7 @@ Para asistencia acerca de una correcta configuración de audio y MIDI, vaya ahtt
<translation>Exportar como...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Fallo al intentar grabar el archivo de Rosegarden en un paquete: %1</translation>
</message>
@@ -21304,7 +21246,7 @@ Para asistencia acerca de una correcta configuración de audio y MIDI, vaya ahtt
<translation>Archivos de MIDI estándar</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21371,14 +21313,14 @@ Para asistencia acerca de una correcta configuración de audio y MIDI, vaya ahtt
<translation>Exportando archivo.MusicXML...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>Archivos de XML</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-936"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation>Abrir archivo de MusicXML</translation>
@@ -21396,7 +21338,7 @@ Para asistencia acerca de una correcta configuración de audio y MIDI, vaya ahtt
</translation>
</message>
<message>
- <location line="+1008"/>
+ <location line="+1003"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -21484,7 +21426,7 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
<translation>Introducir nueva etiqueta</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Lista de Ejecución</translation>
</message>
@@ -21494,7 +21436,7 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>Encolando eventos MIDI de pánico para transmisión...</translation>
</message>
@@ -21574,7 +21516,7 @@ Error fue : %2</translation>
<translation><qt>Haga clic y arrastre arriba y abajo o a izqierda y derecha para modificar.<p></p><p>Haga doble clic para editar el valor directamente</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Seleccionar un nuevo valor</translation>
</message>
@@ -21626,7 +21568,7 @@ Error fue : %2</translation>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Cambiar color de Segmento...</translation>
</message>
@@ -21669,7 +21611,7 @@ Error fue : %2</translation>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Haga clic en un segmento para borrarlo</translation>
</message>
@@ -21702,7 +21644,7 @@ Error fue : %2</translation>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation>&Unir</translation>
</message>
@@ -21710,7 +21652,7 @@ Error fue : %2</translation>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>Ree&tiquetado...</translation>
</message>
@@ -21747,22 +21689,22 @@ Error fue : %2</translation>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>Mover Segmento</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>Mover Segmentos</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Pulse mayúsculas para evitar ajustar el tiempo a la cuadrÃcula de ritmo</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>Haga clic y arrastre para mover un segmento</translation>
</message>
@@ -21958,12 +21900,12 @@ antes de hacer nuevo trasporte.</translation>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>Pulse mayúsculas para evitar el ajuste a los lÃmites de compás</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>Grabar o soltar archivos de audio aquÃ</translation>
</message>
@@ -22039,7 +21981,7 @@ antes de hacer nuevo trasporte.</translation>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Advertencia</translation>
</message>
@@ -22063,17 +22005,17 @@ Por favor, configure el directorio de archivos de audio hacia un directorio vál
<translation>Generando vista preliminar.de audio...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation>Redimensionar segmento</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Pulse mayúsculas para evitar ajustar el tiempo a la cuadrÃcula de ritmo</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>Pulse mayúsculas para evitar ajuste de tiempo a la cuadrÃcula rÃtmica; pulse Ctrl a la vez para escalar contenido</translation>
</message>
@@ -22083,7 +22025,7 @@ Por favor, configure el directorio de archivos de audio hacia un directorio vál
<translation>Ctrl+click para escalar contenido</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>Haga clic y arrastre para cambiar tamaño de un segmento; pulse Ctrl para escalar el contenido</translation>
</message>
@@ -22096,25 +22038,17 @@ Por favor, configure el directorio de archivos de audio hacia un directorio vál
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Haga clic y arrastre para seleccionar segmentos</translation>
</message>
- <message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Mover un segmento</numerusform>
- <numerusform>Mover %n segmentos</numerusform>
- </translation>
- </message>
<message>
- <location line="+154"/>
+ <location line="+348"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Pulse mayúsculas para evitar ajustar el tiempo a la cuadrÃcula de ritmo</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>Haga clic y arrastre para seleccionar segmentos; botón medio del ratón y arrastre para dibujar un segmento vacÃo</translation>
</message>
@@ -22143,8 +22077,16 @@ Por favor, configure el directorio de archivos de audio hacia un directorio vál
<source>Click and drag to copy segments</source>
<translation>Haga clic y arrastre para copiar segmentos</translation>
</message>
+ <message numerus="yes">
+ <location line="-287"/>
+ <source>Move %n Segment(s)</source>
+ <translation>
+ <numerusform>Mover un segmento</numerusform>
+ <numerusform>Mover %n segmentos</numerusform>
+ </translation>
+ </message>
<message>
- <location line="+6"/>
+ <location line="+293"/>
<source>Click and drag to copy segment</source>
<translation>Haga clic y arrastre para copiar segmentos</translation>
</message>
@@ -22214,24 +22156,12 @@ Por favor, configure el directorio de archivos de audio hacia un directorio vál
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Dividir segmento dos veces</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Haga clic en un segmento para dividirlo en dos; pulse mayúsculas para evitar ajuste de tiempo</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>Haga clic en un segmento para dividirlo en dos</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23946,7 +23876,7 @@ Cerrando otras aplicaciones en ejecución puede mejorar el rendimiento de Rosega
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><sin instrumento></translation>
</message>
@@ -23961,19 +23891,7 @@ Cerrando otras aplicaciones en ejecución puede mejorar el rendimiento de Rosega
<translation><sin tÃtulo></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Advertencia</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">El directorio de archivos de audio no existe o no es escribible.
-Por favor, configura el directorio de archivos de audio hacia un directorio válido desde Propiedades del Documento antes de grabar audio.
-¿Quiere configurarlo ahora?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Silenciar pista</translation>
</message>
@@ -23986,7 +23904,7 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
<context>
<name>Rosegarden::TrackEditor</name>
<message numerus="yes">
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+771"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+624"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform>Convertir %n segmento vinculado en copÃa real</numerusform>
@@ -23994,7 +23912,7 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
</translation>
</message>
<message numerus="yes">
- <location line="-25"/>
+ <location line="-26"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform>Convertir repeticiones de %n segmento en copias reales</numerusform>
@@ -24002,17 +23920,17 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
</translation>
</message>
<message>
- <location line="-244"/>
+ <location line="-219"/>
<source>Delete Tracks</source>
<translation>Borrar pistas</translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation>Borrar segmentos</translation>
</message>
<message>
- <location line="+293"/>
+ <location line="+368"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24050,23 +23968,15 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
<translation><qt>El nombre corto es un nombre alternativo que aparece cada vez que se encuentra un a nueva lÃnea, p. ej. «Tr.»</qt></translation>
</message>
<message>
- <source>The track name is also the notation staff name, eg. "Trumpet."</source>
- <translation type="obsolete">El nombre de pista es también el nombre del pentagrama de partitura, p. ej. «Trompeta»</translation>
- </message>
- <message>
<location line="-2"/>
<source>Enter short name</source>
<translation>Introducir nombre corto</translation>
</message>
- <message>
- <source>The short name is an alternate name that appears each time the staff system wraps, eg. "Tr."</source>
- <translation type="obsolete">El nombre corto es un nombre alternativo que aparece cada vez que se encuentra un a nueva lÃnea, p. ej. «Tr.»</translation>
- </message>
</context>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Pista</translation>
</message>
@@ -24077,12 +23987,12 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><sin tÃtulo></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Parámetros de reproducción</translation>
</message>
@@ -24223,117 +24133,197 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
<translation><qt><p>Se crean nuevos segmentos con este clave insertado al comienzo</p></qt></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation><qt><p>Establecer la nota más baja sugerida empleando un pentagrama</p></qt></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation><qt><p>Establecer la nota más alta sugerida empleando un pentagrama</p></qt></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation><qt><p>Establecer el dispositivo que utiliza esta pista para reproducción.</p><p>Haga clic en <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> para conectar este dispositivo a una salida que funcione si no oye nada</p></qt></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation><qt><p>Esta pista graba solamente audio o MIDI de la única canal seleccionada, y no de los demás</p></qt></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation><qt><p>Elegir tamaño de tipografÃa normal, «\small» (pequeño) o «\tiny» (pequeñito) para la partitura de este pentagrama (de tamaño normal) al exportar a LilyPond.</p><p>Se utiliza p. ej. para imprimir una entrada arriba de una partitura para piano </p></qt></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation><qt><p>Cargar parámetros de pista preprogramados del amplio banco de datos que contiene caracterÃsticas de instrumentos modernas e históricas de todo el mundo.</p><p>Al crear nuevos segmentos, estos parámetros pertenecen a ellos al momento de creación. Para utilizar estos parámetros para segmentos que ya existen (p. ej. para convertir una partitura de saxófon en mi bemol en una de trompeta en re bemol) se utiliza <b>Segmentos -> Convertir partitura...</b> desde el editor de Partitura.</p></qt></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
+ <comment>Clef name</comment>
<translation>sol</translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
+ <comment>Clef name</comment>
<translation>fa</translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation>sol +15</translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
+ <comment>Clef name</comment>
<translation>sol +8</translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
+ <comment>Clef name</comment>
<translation>sol -15</translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
+ <comment>Clef name</comment>
<translation>fa -8</translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation>fa +15</translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation>fa +8</translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation>francés</translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
+ <comment>Clef name</comment>
<translation>do para soprano</translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
+ <comment>Clef name</comment>
<translation>mezzosoprano</translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
+ <comment>Clef name</comment>
<translation>do para alto</translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
+ <comment>Clef name</comment>
<translation>do para tenor</translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
+ <comment>Clef name</comment>
<translation>barÃtono</translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
+ <comment>Clef name</comment>
<translation>barÃtono bajo</translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
+ <comment>Clef name</comment>
<translation>bajo profundo</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
+ <translation><qt><p>Establecer la nota más baja sugerida empleando un pentagrama</p></qt></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation><qt><p>Establecer la nota más alta sugerida empleando un pentagrama</p></qt></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation><qt><p>Establecer el dispositivo que utiliza esta pista para reproducción.</p><p>Haga clic en <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> para conectar este dispositivo a una salida que funcione si no oye nada</p></qt></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation><qt><p>Esta pista graba solamente audio o MIDI de la única canal seleccionada, y no de los demás</p></qt></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation><qt><p>Elegir tamaño de tipografÃa normal, «\small» (pequeño) o «\tiny» (pequeñito) para la partitura de este pentagrama (de tamaño normal) al exportar a LilyPond.</p><p>Se utiliza p. ej. para imprimir una entrada arriba de una partitura para piano </p></qt></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation><qt><p>Cargar parámetros de pista preprogramados del amplio banco de datos que contiene caracterÃsticas de instrumentos modernas e históricas de todo el mundo.</p><p>Al crear nuevos segmentos, estos parámetros pertenecen a ellos al momento de creación. Para utilizar estos parámetros para segmentos que ya existen (p. ej. para convertir una partitura de saxófon en mi bemol en una de trompeta en re bemol) se utiliza <b>Segmentos -> Convertir partitura...</b> desde el editor de Partitura.</p></qt></translation>
+ </message>
+ <message>
+ <source>treble</source>
+ <translation type="obsolete">sol</translation>
+ </message>
+ <message>
+ <source>bass</source>
+ <translation type="obsolete">fa</translation>
+ </message>
+ <message>
+ <source>crotales</source>
+ <translation type="obsolete">sol +15</translation>
+ </message>
+ <message>
+ <source>xylophone</source>
+ <translation type="obsolete">sol +8</translation>
+ </message>
+ <message>
+ <source>guitar</source>
+ <translation type="obsolete">sol -15</translation>
+ </message>
+ <message>
+ <source>contrabass</source>
+ <translation type="obsolete">fa -8</translation>
+ </message>
+ <message>
+ <source>celesta</source>
+ <translation type="obsolete">fa +15</translation>
+ </message>
+ <message>
+ <source>old celesta</source>
+ <translation type="obsolete">fa +8</translation>
+ </message>
+ <message>
+ <source>french</source>
+ <translation type="obsolete">francés</translation>
+ </message>
+ <message>
+ <source>soprano</source>
+ <translation type="obsolete">do para soprano</translation>
+ </message>
+ <message>
+ <source>mezzosoprano</source>
+ <translation type="obsolete">mezzosoprano</translation>
+ </message>
+ <message>
+ <source>alto</source>
+ <translation type="obsolete">do para alto</translation>
+ </message>
+ <message>
+ <source>tenor</source>
+ <translation type="obsolete">do para tenor</translation>
+ </message>
+ <message>
+ <source>baritone</source>
+ <translation type="obsolete">barÃtono</translation>
+ </message>
+ <message>
+ <source>varbaritone</source>
+ <translation type="obsolete">barÃtono bajo</translation>
+ </message>
+ <message>
+ <source>subbass</source>
+ <translation type="obsolete">bajo profundo</translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation>Transportar</translation>
</message>
@@ -24374,7 +24364,7 @@ Por favor, configura el directorio de archivos de audio hacia un directorio vál
<translation><qt><p>Se crean nuevos segmentos con este color</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Audio </translation>
diff --git a/data/locale/et.ts b/data/locale/et.ts
index 4b29213..2c4e179 100644
--- a/data/locale/et.ts
+++ b/data/locale/et.ts
@@ -2,13 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
- <name></name>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
<name>:</name>
<message>
<source></source>
@@ -338,23 +331,23 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation type="unfinished">Lisa audiofail</translation>
</message>
@@ -364,54 +357,54 @@
<translation type="unfinished">Ekspordi audiofail</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation type="unfinished">Lisa audiofail</translation>
</message>
@@ -436,346 +429,346 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation type="unfinished">Gruppide tööriistariba</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation type="unfinished">&Lisa sündmus</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation type="unfinished">&Kustuta sündmus</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation type="unfinished">R&edigeeri sündmust</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation type="unfinished">&Lõika</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation type="unfinished">&Filtri valimine</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation type="unfinished"></translation>
</message>
@@ -785,82 +778,82 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation type="unfinished">Reaalajas:</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation type="unfinished">Reaalajas:</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation type="unfinished">Seg&mendid</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation type="unfinished">Sõnade redigeerimine</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation type="unfinished">Ava maatri&ksredaktoris</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation type="unfinished">Ava &noodikirja redaktoris</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation type="unfinished"></translation>
</message>
@@ -890,7 +883,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation type="unfinished"></translation>
</message>
@@ -910,12 +903,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -925,7 +918,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+73"/>
+ <location line="-2670"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -1000,47 +993,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -1110,7 +1103,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1120,39 +1113,39 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation type="unfinished">Tegevuste tööriistariba</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation type="unfinished">Noodivõtmete tööriistariba</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation type="unfinished">Transpordi tööriistariba</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation type="unfinished">Näita &suurenduse tööriistariba</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1202,7 +1195,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation type="unfinished">Lisa paus</translation>
</message>
@@ -1222,117 +1215,117 @@
<translation type="unfinished">Redigeeri märgist</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation type="unfinished">Näita &pauside tööriistariba</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation type="unfinished"> Võre: </translation>
</message>
@@ -1348,13 +1341,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation type="unfinished"></translation>
</message>
@@ -1365,13 +1358,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation type="unfinished"></translation>
</message>
@@ -1382,13 +1375,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation type="unfinished"></translation>
</message>
@@ -1399,13 +1392,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation type="unfinished"></translation>
</message>
@@ -1416,13 +1409,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation type="unfinished"></translation>
</message>
@@ -1433,177 +1426,173 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">%1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A5</translation>
</message>
<message>
- <location line="-2205"/>
- <location line="+1302"/>
+ <location line="-3401"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1282"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2477"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation type="unfinished">Kursori asukoht</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation type="unfinished">Lisa te&mpo muutus...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation type="unfinished">Lisa &taktimõõdu muutus...</translation>
</message>
<message>
- <source>&Segment</source>
- <translation type="obsolete">Seg&mendid</translation>
- </message>
- <message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation type="unfinished">Ava sündmuste nim&ekirja redaktoris</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -1616,701 +1605,701 @@
</message>
<message>
<location line="+6"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1712"/>
- <location line="+1724"/>
+ <location line="-2908"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A4</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">I</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2588"/>
+ <location line="+43"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2342,7 +2331,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+17"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -2459,14 +2453,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2484,8 +2478,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2503,27 +2497,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation type="unfinished">Kvantimine</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation type="unfinished">&Kvandi...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation type="unfinished"></translation>
</message>
@@ -2534,36 +2528,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation type="unfinished">Tõmba üh&ekõrgused noodid kokku</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation type="unfinished">Noodi kiirus:</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation type="unfinished">Noodi kiirus:</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -2579,359 +2573,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation type="unfinished">Kestvus</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation type="unfinished">Kestvus</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation type="unfinished">Transponeerimine</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation type="unfinished">Pooltoon &üles</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation type="unfinished">Pooltoon &alla</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation type="unfinished">Oktav ü&les</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation type="unfinished">Oktav &alla</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation type="unfinished">&Transponeeri...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation type="unfinished">&Transponeeri...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation type="unfinished">L&isa noot</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation type="unfinished">Sa&lvestus</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation type="unfinished">Kustuta segment</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation type="unfinished">Vali l&õpuni</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation type="unfinished">&Joonista</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation type="unfinished">&Kustuta</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation type="unfinished">&Liikumine</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation type="unfinished">Muuda &suurust</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation type="unfinished">Kiirus:</translation>
</message>
<message>
- <source>Cursor &Back</source>
- <translation type="obsolete">Kursor &tagasi</translation>
- </message>
- <message>
- <source>Cursor &Forward</source>
- <translation type="obsolete">Kursor &edasi</translation>
- </message>
- <message>
- <source>Cursor For&ward Bar</source>
- <translation type="obsolete">Kursor takti v&õrra edasi</translation>
- </message>
- <message>
- <source>Cursor to St&art</source>
- <translation type="obsolete">Kursor &algusesse</translation>
- </message>
- <message>
- <source>Cursor to &End</source>
- <translation type="obsolete">Kursor &lõppu</translation>
- </message>
- <message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation type="unfinished">Kursor eda&si ja valimine</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation type="unfinished">Kustuta k&ordus</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation type="unfinished">Transponeerimine</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation type="unfinished">&Mahamängimine</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation type="unfinished">&Stopp</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation type="unfinished">&Keri tagasi</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation type="unfinished">Keri &edasi</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation type="unfinished">Keri tagasi &algusesse</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation type="unfinished">Keri &edasi lõppu</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation type="unfinished">Oktav &üles</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation type="unfinished">A&kordi lisamise režiim</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation type="unfinished">&Sammhaaval salvestamine</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation type="unfinished">Noodivõtmete tööriistariba</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation type="unfinished">Näita &joonlaudu</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation type="unfinished">Tööriistade tööriistariba</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation type="unfinished">Sa&lvestus</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation type="unfinished"></translation>
</message>
@@ -3016,7 +2966,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation type="unfinished"></translation>
</message>
@@ -3026,13 +2976,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation type="unfinished"></translation>
</message>
@@ -3097,10 +3047,6 @@
<translation type="unfinished">Sa&mm</translation>
</message>
<message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Kestvus </translation>
- </message>
- <message>
<location line="+1"/>
<source>&Layout Mode</source>
<translation type="unfinished">Paigutus</translation>
@@ -3126,36 +3072,32 @@
<translation type="unfinished">Ava s&õnade redaktor</translation>
</message>
<message>
- <source>Add Event Ruler</source>
- <translation type="obsolete">Sündmuste filter</translation>
- </message>
- <message>
<location line="+23"/>
<source>Show &Track Headers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation type="unfinished">Ava maatri&ksredaktoris</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation type="unfinished">Lisa noodiv&õtme muutus...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation type="unfinished">Lisa helisti&ku muutus...</translation>
</message>
<message>
- <location line="-1125"/>
- <location line="+1724"/>
+ <location line="-2321"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation type="unfinished"></translation>
</message>
@@ -3170,13 +3112,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2110"/>
+ <location line="+1"/>
<source>Add &Layer</source>
<translation type="unfinished"></translation>
</message>
@@ -3192,7 +3134,7 @@
<translation type="unfinished">&Noodid</translation>
</message>
<message>
- <location line="-1510"/>
+ <location line="-2706"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -3202,7 +3144,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1502"/>
+ <location line="+2698"/>
<source>Mar&ks</source>
<translation type="unfinished">&Rajad</translation>
</message>
@@ -3484,8 +3426,8 @@
<translation type="unfinished">Taasta a&rvutatud noodivarred</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation type="unfinished">&Kustuta</translation>
</message>
@@ -3561,14 +3503,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation type="unfinished"> Ãœksus</translation>
</message>
@@ -3648,14 +3590,14 @@
<translation type="unfinished">&Normaliseeri pausid</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation type="unfinished">&Tõmba pausid kokku</translation>
</message>
@@ -3665,8 +3607,8 @@
<translation type="unfinished">&Noodid</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -3752,13 +3694,13 @@
<translation type="unfinished">Decrescendo lisamine...</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation type="unfinished">Kiirus:</translation>
</message>
@@ -3815,26 +3757,26 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation type="unfinished"></translation>
</message>
@@ -3979,18 +3921,14 @@
<translation type="unfinished">Puhasta valik</translation>
</message>
<message>
- <source>Cursor Ne&xt Segment</source>
- <translation type="obsolete">Loo segment</translation>
- </message>
- <message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation type="unfinished">L&isa noot</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation type="unfinished">Oktav &alla</translation>
</message>
@@ -4010,13 +3948,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation type="unfinished">Näita t&ööriistade tööriistariba</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation type="unfinished">Näita &juhuslike märkide tööristariba</translation>
</message>
@@ -4036,18 +3974,18 @@
<translation type="unfinished">Näita &grupeerimise tööriistariba</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation type="unfinished">Näita trans&pordi tööristariba</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation type="unfinished">Näita &paigutuse tööriistariba</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4060,13 +3998,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4077,7 +4015,7 @@
<translation type="unfinished">Näita ako&rdi nimede joonlauda</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+767"/>
<source>Show &Annotations</source>
<translation type="unfinished">Näita &annotatsioone</translation>
</message>
@@ -4087,7 +4025,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation type="unfinished">Noodivõtmete tööriistariba</translation>
</message>
@@ -4107,7 +4045,7 @@
<translation type="unfinished">Radade tööriistariba</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation type="unfinished"></translation>
</message>
@@ -4128,80 +4066,48 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>0</source>
- <translation type="obsolete">0</translation>
- </message>
- <message>
- <source>3</source>
- <translation type="obsolete">A3</translation>
- </message>
- <message>
- <source>6</source>
- <translation type="obsolete">A6</translation>
- </message>
- <message>
- <source>4</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
- <source>2</source>
- <translation type="obsolete">A2</translation>
- </message>
- <message>
- <source>1</source>
- <translation type="obsolete">%1</translation>
- </message>
- <message>
- <source>5</source>
- <translation type="obsolete">A5</translation>
- </message>
- <message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -4211,12 +4117,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rewind</source>
- <translation type="obsolete">Tagasi kerimine</translation>
- </message>
- <message>
- <location line="-1014"/>
- <location line="+1754"/>
+ <location line="-2209"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation type="unfinished"></translation>
</message>
@@ -4226,13 +4128,13 @@
<translation type="unfinished">Mängi maha</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation type="unfinished"></translation>
</message>
@@ -4252,7 +4154,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+607"/>
+ <location line="-1416"/>
<source>Show A&ctions Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -4263,31 +4165,31 @@
</message>
<message>
<location line="+25"/>
- <location line="+1550"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1379"/>
- <location line="+1723"/>
+ <location line="-2575"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-810"/>
+ <location line="-1645"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -4312,7 +4214,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+116"/>
+ <location line="+950"/>
<source>&Move to Staff Above...</source>
<translation type="unfinished"></translation>
</message>
@@ -4337,14 +4239,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2180"/>
+ <location line="+282"/>
<source>&Figuration</source>
<translation type="unfinished"></translation>
</message>
@@ -4617,21 +4519,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
@@ -4802,7 +4704,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation type="unfinished"></translation>
</message>
@@ -4857,7 +4759,7 @@
<translation type="unfinished">Akordi loomine...</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation type="unfinished"></translation>
</message>
@@ -4897,7 +4799,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation type="unfinished"></translation>
</message>
@@ -4907,14 +4809,6 @@
<translation type="unfinished">&Impordi</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Impordi &Rosegarden 2.1 fail...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Impordi &MIDI fail...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation type="unfinished">Impordi &Rosegarden 2.1 fail...</translation>
@@ -4930,10 +4824,6 @@
<translation type="unfinished">Liida &fail...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Liida &MIDI fail...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation type="unfinished">Impordi &Rosegarden 2.1 fail...</translation>
@@ -4944,26 +4834,6 @@
<translation type="unfinished">&Ekspordi</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Impordi &Rosegarden 2.1 fail...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Ekspordi &MIDI fail...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Expordi &Csound noodikirja fail...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Ekspordi M&up fail...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Ekspordi Music&XML fail...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation type="unfinished"></translation>
@@ -5090,13 +4960,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation type="unfinished">&Stuudio</translation>
</message>
@@ -5151,58 +5021,54 @@
<translation type="unfinished">&Salvesta aktiivne dokument vaikestuudioks</translation>
</message>
<message>
- <source>Se&gments</source>
- <translation type="obsolete">Seg&mendid</translation>
- </message>
- <message>
<location line="+2"/>
<source>Toggle Repeat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation type="unfinished">&Tükelda</translation>
</message>
@@ -5317,26 +5183,26 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation type="unfinished">Muuda suu&rust</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation type="unfinished">Näita &radade tööriistariba</translation>
</message>
@@ -5351,15 +5217,15 @@
<translation type="unfinished">Näita &suurenduse tööriistariba</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation type="unfinished">Mahamängimise kursor &kursori juurde</translation>
</message>
@@ -5420,26 +5286,26 @@
<translation type="unfinished">Redaktori tööriistariba</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+221"/>
+ <location line="-1791"/>
<source>Insert Tempo Change</source>
<translation type="unfinished">Lisa tempo muudatus</translation>
</message>
@@ -5479,7 +5345,7 @@
<translation type="unfinished">Ava sündmuse redaktoris</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation type="unfinished">R&edigeeri sündmust</translation>
</message>
@@ -5499,7 +5365,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation type="unfinished"></translation>
</message>
@@ -5524,7 +5390,7 @@
<translation type="unfinished">Bassivõti</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2626"/>
+ <location filename="../QMenuStrings.cpp" line="+345"/>
<location filename="../InstrumentStrings.cpp" line="-74"/>
<source>Triangle</source>
<translation type="unfinished">Triool</translation>
@@ -7304,26 +7170,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">C#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">F#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">G#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../AutoloadStrings.cpp" line="-24"/>
<source>General MIDI Device</source>
<translation type="unfinished"></translation>
@@ -8509,16 +8355,16 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation type="unfinished">Audio</translation>
@@ -10659,20 +10505,15 @@
<translation type="unfinished">Tundmatu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation type="unfinished">[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation type="unfinished">%1</translation>
</message>
@@ -10687,10 +10528,10 @@
<translation type="unfinished">&%1%2</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation type="unfinished">Vali...</translation>
</message>
@@ -10705,7 +10546,7 @@
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
@@ -10813,45 +10654,53 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation type="unfinished"></translation>
</message>
@@ -10951,7 +10800,7 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
@@ -11048,6 +10897,52 @@
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Eksport ebaõnnestus. Faili ei õnnestunud kirjutamiseks avada.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11063,7 +10958,7 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -11125,12 +11020,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation type="unfinished"></translation>
</message>
@@ -11625,10 +11520,6 @@
<translation type="unfinished">Audio eelvaatluse genereerimine...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">Faili lugemine...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation type="unfinished">Rosegarden 2.1 faili import...</translation>
@@ -11642,24 +11533,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation type="unfinished"><sündmused puuduvad></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation type="unfinished"><plugin puudub></translation>
</message>
@@ -11712,10 +11603,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><audiofailid puuduvad></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation type="unfinished"></translation>
@@ -11832,10 +11719,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Rosegarden 2.1 faili import...</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation type="unfinished"></translation>
@@ -11870,7 +11753,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation type="unfinished">Lisa audiofail</translation>
</message>
@@ -11886,49 +11769,45 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation type="unfinished">Panoraam</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation type="unfinished">Lisa audiofail</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Solo</source>
- <translation type="obsolete">Soolo</translation>
- </message>
- <message>
<location line="+8"/>
<source>Arm recording</source>
<translation type="unfinished">Salvestamine</translation>
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation type="unfinished"><puudub></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
@@ -11948,7 +11827,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation type="unfinished"></translation>
</message>
@@ -11964,14 +11843,14 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">Maatriks</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation type="unfinished"><plugin puudub></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -12413,10 +12292,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <source>Reset</source>
- <translation type="obsolete">Lähtesta</translation>
- </message>
- <message>
<location line="+23"/>
<source>Device and Banks</source>
<translation type="unfinished"></translation>
@@ -12554,7 +12429,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation type="unfinished"></translation>
</message>
@@ -12698,43 +12573,157 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">Noodivarred &üles</translation>
</message>
<message>
- <location line="+0"/>
- <source>Stems &Down</source>
- <translation type="unfinished">Noodivarred &alla</translation>
+ <location line="+0"/>
+ <source>Stems &Down</source>
+ <translation type="unfinished">Noodivarred &alla</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChangeStyleCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/ChangeStyleCommand.h" line="+49"/>
+ <source>Change &Note Style</source>
+ <translation type="unfinished">Muuda &noodi stiili</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChangeTiePositionCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/ChangeTiePositionCommand.h" line="+44"/>
+ <source>Tie &Above</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Tie &Below</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChangeVelocityCommand</name>
+ <message>
+ <location filename="../../src/commands/edit/ChangeVelocityCommand.h" line="+45"/>
+ <source>&Increase Velocity</source>
+ <translation type="unfinished">Noodi kiirus:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Reduce Velocity</source>
+ <translation type="unfinished">Noodi kiirus:</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeStyleCommand</name>
<message>
- <location filename="../../src/commands/notation/ChangeStyleCommand.h" line="+49"/>
- <source>Change &Note Style</source>
- <translation type="unfinished">Muuda &noodi stiili</translation>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeTiePositionCommand</name>
<message>
- <location filename="../../src/commands/notation/ChangeTiePositionCommand.h" line="+44"/>
- <source>Tie &Above</source>
+ <location line="+4"/>
+ <source>octaves</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Tie &Below</source>
+ <location line="+4"/>
+ <source>hidden fifths</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeVelocityCommand</name>
<message>
- <location filename="../../src/commands/edit/ChangeVelocityCommand.h" line="+45"/>
- <source>&Increase Velocity</source>
- <translation type="unfinished">Noodi kiirus:</translation>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>&Reduce Velocity</source>
- <translation type="unfinished">Noodi kiirus:</translation>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -13061,7 +13050,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -13069,10 +13058,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ConfigureDialog</name>
<message>
- <source>Configure Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/ConfigureDialog.cpp" line="+48"/>
<source>Rosegarden - Preferences</source>
<translation type="unfinished"></translation>
@@ -13290,7 +13275,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -13306,7 +13291,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation type="unfinished">Toetuseta sündmuse tüüp:</translation>
</message>
@@ -13321,12 +13306,13 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation type="unfinished"></translation>
</message>
@@ -13334,7 +13320,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
@@ -13344,7 +13330,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation type="unfinished">(kopeeritud)</translation>
</message>
@@ -13414,7 +13400,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation type="unfinished">&Lõika</translation>
</message>
@@ -13490,7 +13476,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation type="unfinished"></translation>
</message>
@@ -13498,14 +13484,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::DiatonicPitchChooser</name>
<message>
- <source>D</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/DiatonicPitchChooser.cpp" line="+59"/>
<source>C</source>
<comment>note name</comment>
@@ -13781,101 +13759,6 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
</context>
<context>
- <name>Rosegarden::EditView</name>
- <message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">Vali...</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Toetuseta sündmuse tüüp:</translation>
- </message>
- <message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <source>VIII</source>
- <translation type="obsolete">VIII</translation>
- </message>
- <message>
- <source>%1 flat</source>
- <translation type="obsolete">%1 bemoll</translation>
- </message>
- <message>
- <source>%1 sharp</source>
- <translation type="obsolete">%1 diees</translation>
- </message>
- <message>
- <source>&Insert Note</source>
- <translation type="obsolete">L&isa noot</translation>
- </message>
- <message>
- <source>&Upper Octave</source>
- <translation type="obsolete">Oktav &üles</translation>
- </message>
- <message>
- <source>&Lower Octave</source>
- <translation type="obsolete">Oktav &alla</translation>
- </message>
- <message>
- <source>Halving durations...</source>
- <translation type="obsolete">Noodivar&te suund</translation>
- </message>
- <message>
- <source>Doubling durations...</source>
- <translation type="obsolete">Noodivar&te suund</translation>
- </message>
- <message>
- <source>Rescaling...</source>
- <translation type="obsolete">Faili lugemine...</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Transponeerimine</translation>
- </message>
- <message>
- <source>Inverting...</source>
- <translation type="obsolete">Käivitamine...</translation>
- </message>
- <message>
- <source>Retrograding...</source>
- <translation type="obsolete">Faili lugemine...</translation>
- </message>
- <message>
- <source>Retrograde inverting...</source>
- <translation type="obsolete">Faili lugemine...</translation>
- </message>
- <message>
- <source>Jogging left...</source>
- <translation type="obsolete">Faili sulgemine...</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::EditViewBase</name>
<message>
<location filename="../../src/gui/general/EditViewBase.cpp" line="+222"/>
@@ -14214,22 +14097,6 @@ This could cause problems if it overrides a different computed value later on.</
<source>Value</source>
<translation type="unfinished">Väärtus</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Esimene väärtus</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Teine väärtus</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Väärtus</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Esimene väärtus</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14489,10 +14356,6 @@ This could cause problems if it overrides a different computed value later on.</
<source>http://rosegardenmusic.com/wiki/doc:eventView-en</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>%1 - Triggered Segment: %2</source>
- <translation type="obsolete">Loo segment</translation>
- </message>
</context>
<context>
<name>Rosegarden::ExpandFigurationCommand</name>
@@ -14889,10 +14752,6 @@ Would you like to try and locate this file or skip it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Normal</source>
- <translation type="obsolete">Normaalne</translation>
- </message>
- <message>
<location line="+6"/>
<source>Safe</source>
<translation type="unfinished"></translation>
@@ -14923,10 +14782,6 @@ Would you like to try and locate this file or skip it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Matrix</source>
- <translation type="obsolete">Maatriks</translation>
- </message>
- <message>
<location line="+4"/>
<source>Notation</source>
<translation type="unfinished">Noodikiri</translation>
@@ -15552,7 +15407,7 @@ Example text from file:</source>
<translation type="unfinished">Instrumendi parameetrid</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation type="unfinished">&Rajad</translation>
</message>
@@ -15560,7 +15415,7 @@ Example text from file:</source>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -15943,79 +15798,10 @@ Example text from file:</source>
</message>
</context>
<context>
- <name>Rosegarden::LatencyConfigurationPage</name>
- <message>
- <source>Latency</source>
- <translation type="obsolete">Latents</translation>
- </message>
- <message>
- <source>Sequencer Latency</source>
- <translation type="obsolete">Sekventseri latents</translation>
- </message>
- <message>
- <source>JACK latency</source>
- <translation type="obsolete">JACK latents</translation>
- </message>
- <message>
- <source>JACK playback latency (in ms)</source>
- <translation type="obsolete">JACK'i mahamängimise latents (millisekundites)</translation>
- </message>
- <message>
- <source>JACK record latency (in ms)</source>
- <translation type="obsolete">JACK'i salvestamise latents (millisekundites)</translation>
- </message>
- <message>
- <source>JACK Latency</source>
- <translation type="obsolete">JACK'i latents</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
- <source>LilyPond does not allow spaces or backslashes in filenames.
-
-Would you like to use
-
- %1
-
- instead?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">Eksport ebaõnnestus. Faili ei õnnestunud kirjutamiseks avada.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1823"/>
- <source>warning: overlong bar truncated here</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>warning: bar too short, padding with rests</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Eksport ebaõnnestus. Faili ei õnnestunud kirjutamiseks avada.</translation>
</message>
</context>
<context>
@@ -16721,7 +16507,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -16761,10 +16547,6 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation type="unfinished">Programm</translation>
</message>
<message>
- <source>Channel out</source>
- <translation type="obsolete">Kanal</translation>
- </message>
- <message>
<location line="-46"/>
<source>Percussion</source>
<translation type="unfinished">Löökriistad</translation>
@@ -16810,12 +16592,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation type="unfinished">[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation type="unfinished">Ãœhendus puudub</translation>
</message>
@@ -17033,16 +16810,21 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation type="unfinished">Faili lugemine...</translation>
</message>
<message>
- <source>Synth plugin </source>
- <translation type="obsolete">Näita &annotatsioone</translation>
- </message>
- <message>
<location line="+124"/>
<source>%1 (%2)</source>
<translation type="unfinished">&%1%2</translation>
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17246,12 +17028,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation type="unfinished">Liiguta sündmust</translation>
</message>
@@ -17400,84 +17182,28 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Kiirus:</translation>
</message>
<message>
- <location line="+79"/>
- <source>Change Velocity</source>
- <translation type="unfinished">Noodi kiirus:</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Change Velocities</source>
- <translation type="unfinished">Kiirus:</translation>
- </message>
- <message>
- <location line="+31"/>
- <source>Click and drag to scale velocity of selected notes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Click and drag to scale velocity of note</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::MatrixView</name>
- <message>
- <source>Instrument Parameters</source>
- <translation type="obsolete">Instrumendi parameetrid</translation>
- </message>
- <message>
- <source> No selection </source>
- <translation type="obsolete"> Valik puudub </translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">Kvantimine...</translation>
- </message>
- <message>
- <source>Collapsing notes...</source>
- <translation type="obsolete">Nootide kokkutõmbamine...</translation>
- </message>
- <message>
- <source>Making legato...</source>
- <translation type="obsolete">Akordi loomine...</translation>
- </message>
- <message>
- <source>Note: %1 (%2.%3s)</source>
- <translation type="obsolete">Aeg: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>%1 (%2)</source>
- <translation type="obsolete">&%1%2</translation>
- </message>
- <message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Aeg: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">Valiku lõikamine lõikepuhvrisse...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">Valiku kopeerimine lõikepuhvrisse...</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">Lõikelaua sisu lisamine...</translation>
+ <location line="+79"/>
+ <source>Change Velocity</source>
+ <translation type="unfinished">Noodi kiirus:</translation>
</message>
<message>
- <source>Deleting selection...</source>
- <translation type="obsolete">Valiku kustutamine...</translation>
+ <location line="+3"/>
+ <source>Change Velocities</source>
+ <translation type="unfinished">Kiirus:</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">Noodi lisamine</translation>
+ <location line="+34"/>
+ <source>Click and drag to scale velocity of selected notes</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Unquantizing...</source>
- <translation type="obsolete">Kvantimise eemaldamine...</translation>
+ <location line="+2"/>
+ <source>Click and drag to scale velocity of note</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::MatrixView</name>
<message>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="-142"/>
<source><untitled></source>
@@ -17502,14 +17228,6 @@ Double-click to open the marker editor.</source>
</translation>
</message>
<message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">Vali...</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Toetuseta sündmuse tüüp:</translation>
- </message>
- <message>
<location line="+254"/>
<source> Grid: </source>
<translation type="unfinished"> Võre: </translation>
@@ -17550,7 +17268,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation type="unfinished"></translation>
</message>
@@ -17566,8 +17284,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -17582,15 +17299,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> Zoom: </source>
- <translation type="obsolete"> Suurendus: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation type="unfinished"></translation>
</message>
@@ -17615,32 +17324,15 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">&Eemalda märgis</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation type="unfinished">Maatriks</translation>
</message>
- <message>
- <source>Percussion</source>
- <translation type="obsolete">Löökriistad</translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">Kestvus</translation>
- </message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="unfinished">Nooti pole võimalik lisada: noodi pikkust pole valitud</translation>
- </message>
- <message>
- <source> Chord </source>
- <translation type="obsolete">Tekita a&kord</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation type="unfinished"></translation>
</message>
@@ -17660,7 +17352,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -17783,7 +17475,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation type="unfinished">MIDI seade</translation>
</message>
@@ -17798,7 +17490,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Instrument</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -18079,190 +17771,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::NameSetEditor</name>
<message>
- <source>Name</source>
- <translation type="obsolete">Nimi</translation>
- </message>
- <message>
- <source>Email</source>
- <translation type="obsolete">E-posti aadress</translation>
- </message>
- <message>
<location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
<source>Provided by</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Rosegarden::NewMatrixView</name>
- <message>
- <source>Matrix</source>
- <translation type="obsolete">Maatriks</translation>
- </message>
- <message>
- <source><untitled></source>
- <translation type="obsolete"><nimetu></translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">Kestvus</translation>
- </message>
- <message>
- <source> Grid: </source>
- <translation type="obsolete"> Võre: </translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Puudub</translation>
- </message>
- <message>
- <source>Unit</source>
- <translation type="obsolete"> Ãœksus</translation>
- </message>
- <message>
- <source>Beat</source>
- <translation type="obsolete">Löök</translation>
- </message>
- <message>
- <source>Bar</source>
- <translation type="obsolete">Takt</translation>
- </message>
- <message>
- <source> Velocity: </source>
- <translation type="obsolete">Kiirus:</translation>
- </message>
- <message>
- <source> Quantize: </source>
- <translation type="obsolete"> Kvantimine: </translation>
- </message>
- <message>
- <source> Zoom: </source>
- <translation type="obsolete"> Suurendus: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <source>Trigger Segment</source>
- <translation type="obsolete">Kustuta segment</translation>
- </message>
- <message>
- <source>Remove Triggers</source>
- <translation type="obsolete">&Eemalda märgis</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Transponeerimine</translation>
- </message>
- <message>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="obsolete">Nooti pole võimalik lisada: noodi pikkust pole valitud</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewNotationView</name>
- <message>
- <source>Note &Font</source>
- <translation type="obsolete">Noodikirja &font</translation>
- </message>
- <message>
- <source>Si&ze</source>
- <translation type="obsolete">Suu&rus</translation>
- </message>
- <message>
- <source> Font: </source>
- <translation type="obsolete"> Font: </translation>
- </message>
- <message>
- <source> Size: </source>
- <translation type="obsolete"> Suurus: </translation>
- </message>
- <message>
- <source> Spacing: </source>
- <translation type="obsolete"> Samm: </translation>
- </message>
- <message>
- <source>LilyPond Preview Options</source>
- <translation type="obsolete">Lilypond'i ekpordi seadistused</translation>
- </message>
- <message>
- <source>LilyPond preview options</source>
- <translation type="obsolete">Lilypond'i ekpordi seadistused</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Eksport ebaõnnestus. Faili ei õnnestunud kirjutamiseks avada.</translation>
- </message>
- <message>
- <source>Can't paste multiple Segments into one</source>
- <translation type="obsolete">Mitut segmenti ei saa ühte asetada</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
- <message>
- <source>S&pacing</source>
- <translation type="obsolete">Sa&mm</translation>
- </message>
- <message>
- <source>Unknown font "%1", using default</source>
- <translation type="obsolete">Tundmatu font "%1", kasutatakse vaikeväärtust</translation>
- </message>
- <message>
- <source>Couldn't paste at this point.</source>
- <translation type="obsolete">Sellesse kohta ei saa asetada.</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">Lõikelaua sisu lisamine...</translation>
- </message>
- <message>
- <source>Inserting note</source>
- <translation type="obsolete">Noodi lisamine</translation>
- </message>
- <message>
- <source>Ornament bar %1</source>
- <translation type="obsolete">Seg&mendid</translation>
- </message>
- <message>
- <source>Make Ornament</source>
- <translation type="obsolete">Märgise nimi </translation>
- </message>
- <message>
- <source>Remove Ornaments</source>
- <translation type="obsolete">Eemalda kõik märgised</translation>
- </message>
- <message>
- <source>Can't insert note: No note duration selected</source>
- <translation type="obsolete">Nooti pole võimalik lisada: noodi pikkust pole valitud</translation>
- </message>
- <message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Aeg: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">Kestvus</translation>
- </message>
- <message>
- <source>Triplet</source>
- <translation type="obsolete">Triool</translation>
- </message>
- <message>
- <source>Chord</source>
- <translation type="obsolete">Tekita a&kord</translation>
- </message>
- <message>
- <source>Grace</source>
- <translation type="obsolete">&Rajad</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Transponeerimine</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::NormalizeRestsCommand</name>
<message>
<location filename="../../src/commands/notation/NormalizeRestsCommand.h" line="+49"/>
@@ -18273,13 +17787,13 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation type="unfinished">Noodikiri</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation type="unfinished">Vaikimisi paigutuse režiim</translation>
</message>
@@ -18309,18 +17823,6 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Normaalne</translation>
</message>
<message>
- <source>Default duration factor</source>
- <translation type="obsolete">Kestvus </translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Puudub</translation>
- </message>
- <message>
- <source>Full</source>
- <translation type="obsolete">Täis</translation>
- </message>
- <message>
<location line="+12"/>
<source>Show track headers (linear layout only)</source>
<translation type="unfinished"></translation>
@@ -18532,10 +18034,6 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Font size for printing (pt)</source>
- <translation type="obsolete">Fondi suurus trükkimisel (punktides)</translation>
- </message>
- <message>
<location line="+18"/>
<source>Text font</source>
<translation type="unfinished">Tekst: </translation>
@@ -18845,14 +18343,6 @@ This is a bug (the program would previously have crashed by now)</source>
<context>
<name>Rosegarden::NotationView</name>
<message>
- <source>Starting...</source>
- <translation type="obsolete">Käivitamine...</translation>
- </message>
- <message>
- <source>Preparing to print...</source>
- <translation type="obsolete">Ettevalmistus trükkimiseks...</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NotationView.cpp" line="+121"/>
<source>Note &Font</source>
<translation type="unfinished">Noodikirja &font</translation>
@@ -18867,14 +18357,6 @@ This is a bug (the program would previously have crashed by now)</source>
<source>S&pacing</source>
<translation type="unfinished">Sa&mm</translation>
</message>
- <message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Kestvus </translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Puudub</translation>
- </message>
<message numerus="yes">
<location line="-8"/>
<source>%n pixel(s)</source>
@@ -18884,7 +18366,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation type="unfinished"> Font: </translation>
</message>
@@ -18904,32 +18386,12 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"> Samm: </translation>
</message>
<message>
- <source> Ready.</source>
- <translation type="obsolete"> Valmis.</translation>
- </message>
- <message>
- <location line="-115"/>
+ <location line="-117"/>
<source> No selection </source>
<translation type="unfinished"> Valik puudub </translation>
</message>
<message>
- <source>note</source>
- <translation type="obsolete">noot</translation>
- </message>
- <message>
- <source>rest</source>
- <translation type="obsolete">paus</translation>
- </message>
- <message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">Kestvus</translation>
- </message>
- <message>
- <source>Triplet</source>
- <translation type="obsolete">Triool</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation type="unfinished">Tekita a&kord</translation>
</message>
@@ -18946,11 +18408,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished">&%1%2</translation>
</message>
<message>
- <source>Hidden annotations</source>
- <translation type="obsolete">Peidetud annotatsioonid</translation>
- </message>
- <message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation type="unfinished"></translation>
</message>
@@ -18965,26 +18423,6 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">Trükkimine...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Eelvaatlus...</translation>
- </message>
- <message>
- <source>Printing LilyPond file...</source>
- <translation type="obsolete">Lilypond faili eksport...</translation>
- </message>
- <message>
- <source>Failed to open a temporary file for LilyPond export.</source>
- <translation type="obsolete">Audiofaili valimine</translation>
- </message>
- <message>
- <source>Previewing LilyPond file...</source>
- <translation type="obsolete">Lilypond faili eksport...</translation>
- </message>
- <message>
<location line="-147"/>
<source>LilyPond Preview Options</source>
<translation type="unfinished">Lilypond'i ekpordi seadistused</translation>
@@ -18995,37 +18433,17 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished">Lilypond'i ekpordi seadistused</translation>
</message>
<message>
- <source>Exporting LilyPond file...</source>
- <translation type="obsolete">Lilypond faili eksport...</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Eksport ebaõnnestus. Faili ei õnnestunud kirjutamiseks avada.</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">Valiku lõikamine lõikepuhvrisse...</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">Valiku kustutamine...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">Valiku kopeerimine lõikepuhvrisse...</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation type="unfinished">Mitut segmenti ei saa ühte asetada</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -19038,23 +18456,22 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+88"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation type="unfinished"></translation>
</message>
@@ -19069,24 +18486,24 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation type="unfinished">Lõikelaua sisu lisamine...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation type="unfinished">Sellesse kohta ei saa asetada.</translation>
</message>
<message>
- <location line="+141"/>
+ <location line="+143"/>
<source>Raising velocities...</source>
<translation type="unfinished"></translation>
</message>
@@ -19096,7 +18513,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation type="unfinished"></translation>
</message>
@@ -19111,11 +18528,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished">Nootide kokkutõmbamine...</translation>
</message>
<message>
- <source>No note duration selected</source>
- <translation type="obsolete">Noodi pikkust pole valitud</translation>
- </message>
- <message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished"></translation>
</message>
@@ -19125,40 +18538,20 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished">Noodi lisamine</translation>
</message>
<message>
- <source>No rest duration selected</source>
- <translation type="obsolete">Pausi pikkust pole valitud</translation>
- </message>
- <message>
- <source>No note or rest duration selected</source>
- <translation type="obsolete">Pausi pikkust pole valitud</translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">Kvantimine...</translation>
- </message>
- <message>
- <source>Interpreting selection...</source>
- <translation type="obsolete">Valiku interpreteerimine...</translation>
- </message>
- <message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation type="unfinished">Crescendo lisamine...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Ornament bar %1</source>
- <translation type="unfinished">Seg&mendid</translation>
- </message>
- <message>
- <source>Make Ornament</source>
- <translation type="obsolete">Märgise nimi </translation>
+ <translation type="unfinished">Seg&mendid</translation>
</message>
<message>
<location line="+38"/>
@@ -19196,7 +18589,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation type="unfinished"></translation>
@@ -19207,7 +18600,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation type="unfinished"></translation>
</message>
@@ -19240,7 +18633,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation type="unfinished">Aeg: %1 (%2.%3s)</translation>
</message>
@@ -19294,16 +18687,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Cycling slashes...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation type="unfinished">Nooti pole võimalik lisada: noodi pikkust pole valitud</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation type="unfinished"></translation>
</message>
@@ -19328,7 +18716,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
@@ -20142,10 +19530,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<context>
<name>Rosegarden::ProgressDialog</name>
<message>
- <source>Processing...</source>
- <translation type="obsolete">Töötlemine...</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/ProgressDialog.cpp" line="+65"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
@@ -20429,12 +19813,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation type="unfinished">Puudub</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation type="unfinished"></translation>
</message>
@@ -20499,7 +19883,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation type="unfinished"> Kvantimine: </translation>
</message>
@@ -20814,12 +20198,6 @@ There may be some incompatibilities with the file format.</source>
<context>
<name>Rosegarden::RosegardenDocument</name>
<message>
- <source>The current file has been modified.
-Do you want to save it?</source>
- <translation type="obsolete">Käesolevat faili on muudetud.
-Kas salvestada see?</translation>
- </message>
- <message>
<location filename="../../src/document/RosegardenDocument.cpp" line="+345"/>
<source>Rosegarden - Warning</source>
<translation type="unfinished"></translation>
@@ -20842,8 +20220,8 @@ Kas salvestada see?</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20855,7 +20233,7 @@ Kas salvestada see?</translation>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation type="unfinished"></translation>
</message>
@@ -20927,7 +20305,12 @@ Please select any you wish to delete permanently from the hard disk.
<translation type="unfinished">Liida</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation type="unfinished"></translation>
</message>
@@ -20942,7 +20325,7 @@ Please select any you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
@@ -20954,11 +20337,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Faili salvestamine...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation type="unfinished"></translation>
</message>
@@ -21034,11 +20413,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <source>No non-audio segments in composition</source>
- <translation type="obsolete">Kompostsioonis pole mitte-audio segmente</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation type="unfinished">Valik peab sisldama kas ainult audiosegmente või ainult mitte audiosegmente.</translation>
</message>
@@ -21049,7 +20424,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -21058,7 +20433,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -21078,7 +20453,7 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -21088,10 +20463,6 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Rosegarden 2.1 faili import...</translation>
- </message>
- <message>
<location line="+28"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation type="unfinished"></translation>
@@ -21151,14 +20522,14 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished">Käivitamine...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation type="unfinished"> Suurendus: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation type="unfinished">&%1%2</translation>
@@ -21186,12 +20557,12 @@ Do you want to open it instead ?</source>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -21230,12 +20601,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -21255,33 +20626,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation type="unfinished">Kõik failid</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation type="unfinished">Faili avamine</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation type="unfinished"></translation>
</message>
@@ -21291,16 +20662,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation type="unfinished">Faili %1 pole võimalik avada</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation type="unfinished">Faili salvestamine...</translation>
</message>
@@ -21340,14 +20711,6 @@ Error was : %2</source>
<translation type="unfinished">Faili sulgemine...</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">Trükkimine...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Eelvaatlus...</translation>
- </message>
- <message>
<location line="+13"/>
<source>Exiting...</source>
<translation type="unfinished">Väljumine...</translation>
@@ -21405,12 +20768,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2767"/>
+ <location line="-2756"/>
<source>Jog Selection</source>
<translation type="unfinished">Puhasta valik</translation>
</message>
@@ -21457,12 +20820,12 @@ Error was : %2</source>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation type="unfinished">Globaalse tempo seadmine</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation type="unfinished"></translation>
</message>
@@ -21527,12 +20890,12 @@ Error was : %2</source>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -21542,13 +20905,13 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21572,8 +20935,8 @@ Error was : %2</source>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21583,7 +20946,7 @@ Error was : %2</source>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21601,8 +20964,8 @@ Error was : %2</source>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21611,12 +20974,12 @@ Error was : %2</source>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation type="unfinished"></translation>
</message>
@@ -21626,7 +20989,7 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation type="unfinished">MIDI faili avamine</translation>
</message>
@@ -21636,12 +20999,12 @@ Error was : %2</source>
<translation type="unfinished">MIDI faili liitmine</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation type="unfinished">MIDI faili import...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation type="unfinished"></translation>
</message>
@@ -21673,59 +21036,23 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Rosegarden 2.1 faili avamine</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Rosegarden 2.1 faili import...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Rosegarden 2.1 faili ei õnnestu avada. See paistab olevat vigane.</translation>
- </message>
- <message>
- <source>Export and import of Rosegarden Project files</source>
- <translation type="obsolete">Rosegarden 2.1 faili import...</translation>
- </message>
- <message>
- <source>The Rosegarden Project Packager helper script</source>
- <translation type="obsolete">Rosegarden-4 failid</translation>
- </message>
- <message>
- <source>Notation previews through LilyPond</source>
- <translation type="obsolete">Lilypond faili eksport...</translation>
- </message>
- <message>
- <source>%1 - for LilyPond preview support</source>
- <translation type="obsolete">Lilypond'i ekpordi seadistused</translation>
- </message>
- <message>
- <source>%1 - for audio file import</source>
- <translation type="obsolete">Audiofailide asukoht:</translation>
- </message>
- <message>
- <source><ul></source>
- <translation type="obsolete"><vaikeväärtus></translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation type="unfinished"></translation>
@@ -21772,7 +21099,7 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation type="unfinished"></translation>
@@ -21785,7 +21112,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21793,7 +21120,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation type="unfinished">Eksport kui...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -21809,7 +21136,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21876,14 +21203,14 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation type="unfinished">MusicXML faili eksport...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation type="unfinished">XML failid</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-936"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation type="unfinished"></translation>
@@ -21900,7 +21227,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1008"/>
+ <location line="+1003"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -21984,7 +21311,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation type="unfinished">Mängitakse </translation>
</message>
@@ -21994,7 +21321,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation type="unfinished"></translation>
</message>
@@ -22065,7 +21392,7 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5907"/>
+ <location line="-5853"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -22080,7 +21407,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation type="unfinished">Kustuta see omadus</translation>
</message>
@@ -22132,7 +21459,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation type="unfinished">Muuda segmendi värvi...</translation>
</message>
@@ -22175,7 +21502,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation type="unfinished"></translation>
</message>
@@ -22208,7 +21535,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">Ãœh&enda</translation>
</message>
@@ -22216,7 +21543,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation type="unfinished">&Nimeta ümber...</translation>
</message>
@@ -22253,22 +21580,22 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation type="unfinished">Liiguta segmenti</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation type="unfinished">Liiguta segmente</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation type="unfinished"></translation>
</message>
@@ -22463,12 +21790,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation type="unfinished">MIDI või audio salvestamine</translation>
</message>
@@ -22544,7 +21871,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
@@ -22566,17 +21893,17 @@ Would you like to set it now?</source>
<translation type="unfinished">Audio eelvaatluse genereerimine...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Muuda sündmuse suurust</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation type="unfinished"></translation>
</message>
@@ -22586,7 +21913,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation type="unfinished"></translation>
</message>
@@ -22599,25 +21926,17 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation type="unfinished">
- <numerusform>
- </numerusform>
- </translation>
- </message>
<message>
- <location line="+154"/>
+ <location line="+348"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation type="unfinished"></translation>
</message>
@@ -22646,8 +21965,15 @@ Would you like to set it now?</source>
<source>Click and drag to copy segments</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <location line="-287"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <location line="+6"/>
+ <location line="+293"/>
<source>Click and drag to copy segment</source>
<translation type="unfinished"></translation>
</message>
@@ -22717,24 +22043,12 @@ Would you like to set it now?</source>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Segmendi tükeldamine</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23561,26 +22875,6 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">C#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">F#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">G#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location line="-276"/>
<source>%1: %2</source>
<translation type="unfinished">&%1%2</translation>
@@ -23592,13 +22886,6 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
</context>
<context>
- <name>Rosegarden::Studio</name>
- <message>
- <source>Audio</source>
- <translation type="obsolete">Audio</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SustainInsertionCommand</name>
<message>
<location filename="../../src/commands/notation/SustainInsertionCommand.h" line="+51"/>
@@ -24472,7 +23759,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation type="unfinished"><instrument puudub></translation>
</message>
@@ -24487,7 +23774,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation type="unfinished"><nimetu></translation>
</message>
<message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation type="unfinished">&Kustuta rada</translation>
</message>
@@ -24500,31 +23787,31 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -24570,7 +23857,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation type="unfinished">&Rajad</translation>
</message>
@@ -24581,12 +23868,12 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation type="unfinished"><nimetu></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation type="unfinished">Mahamängivad seadmed</translation>
</message>
@@ -24727,117 +24014,173 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Viiulivõti</translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Bassivõti</translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Oktav &alla</translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished">&Kustuta</translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished">S&forzando</translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Aldivõti</translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Tenorivõti</translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Variatsioon</translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Variatsioon</translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Bassivõti</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>treble</source>
+ <translation type="obsolete">Viiulivõti</translation>
+ </message>
+ <message>
+ <source>bass</source>
+ <translation type="obsolete">Bassivõti</translation>
+ </message>
+ <message>
+ <source>crotales</source>
+ <translation type="obsolete">Oktav &alla</translation>
+ </message>
+ <message>
+ <source>celesta</source>
+ <translation type="obsolete">&Kustuta</translation>
+ </message>
+ <message>
+ <source>mezzosoprano</source>
+ <translation type="obsolete">S&forzando</translation>
+ </message>
+ <message>
+ <source>alto</source>
+ <translation type="obsolete">Aldivõti</translation>
+ </message>
+ <message>
+ <source>tenor</source>
+ <translation type="obsolete">Tenorivõti</translation>
+ </message>
+ <message>
+ <source>baritone</source>
+ <translation type="obsolete">Variatsioon</translation>
+ </message>
+ <message>
+ <source>varbaritone</source>
+ <translation type="obsolete">Variatsioon</translation>
+ </message>
+ <message>
+ <source>subbass</source>
+ <translation type="obsolete">Bassivõti</translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation type="unfinished">Transponeerimine</translation>
</message>
@@ -24878,7 +24221,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation type="unfinished">Audio</translation>
@@ -25510,20 +24853,6 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
</context>
<context>
- <name>RosegardenApplication</name>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">(kopeeritud)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/eu.ts b/data/locale/eu.ts
index d371ad7..d38f765 100644
--- a/data/locale/eu.ts
+++ b/data/locale/eu.ts
@@ -2,13 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
- <name></name>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
<name>:</name>
<message>
<source></source>
@@ -338,23 +331,23 @@
<translation type="unfinished">Ezin da ireki %1 letra-tipoen mapaketa artxiboa</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation type="unfinished">Audio Artxiboa &Gehitu </translation>
</message>
@@ -364,54 +357,54 @@
<translation type="unfinished">Audio Artxiboa E&sportatu... </translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation type="unfinished">Audio Artxiboa &Deskargatu</translation>
</message>
@@ -436,346 +429,346 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation type="unfinished">Akatsak Jakinarazteko Direktibak</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation type="unfinished">Trena-Barra Orokorra</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation type="unfinished">Hautatzeko Lanabesera Aldatu</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation type="unfinished">Notak Txertatzera Aldatu</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation type="unfinished">Ezabaketa Lanabesera Aldatu</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation type="unfinished">Gertaera &Txertatu</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation type="unfinished">&Gertaera Ezabatu</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation type="unfinished">Gertaera &Editatu</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation type="unfinished">Gertaeren Iragazki &Aurreratua</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation type="unfinished">Ebak&i</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation type="unfinished">Hautatutakoa &Iragazi</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation type="unfinished"></translation>
</message>
@@ -785,82 +778,82 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation type="unfinished">&Musika Denborak</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation type="unfinished">Denbora E&rrealak</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation type="unfinished">Denbora &Gordinak</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation type="unfinished">Seg&mentua</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation type="unfinished">(Ondokoarekin) &Editatu</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation type="unfinished">Matri&z Editorean Ireki</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation type="unfinished">&Notazio Editorean Ireki</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation type="unfinished"></translation>
</message>
@@ -890,7 +883,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation type="unfinished"></translation>
</message>
@@ -910,12 +903,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -925,7 +918,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+73"/>
+ <location line="-2670"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -1000,47 +993,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -1110,7 +1103,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1120,39 +1113,39 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation type="unfinished">Eragiketen Tresna-Barra</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation type="unfinished">Denboraren Tresna-Barra</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation type="unfinished">Transporterako Tresna-Barra</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation type="unfinished">Zoomerako Tresna-Barra</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1202,7 +1195,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation type="unfinished">Tartea Txertatu</translation>
</message>
@@ -1222,117 +1215,117 @@
<translation type="unfinished">Mar&katzaileak Editatu...</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation type="unfinished">Mugimendu Lanabesera Aldatu</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation type="unfinished">Marrazketa Lanabesera Aldatu</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation type="unfinished">Tamaina Aldatzeko Lanabesera Aldatu</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation type="unfinished">Sa&reta</translation>
</message>
@@ -1348,13 +1341,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation type="unfinished"></translation>
</message>
@@ -1365,13 +1358,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation type="unfinished"></translation>
</message>
@@ -1382,13 +1375,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation type="unfinished"></translation>
</message>
@@ -1399,13 +1392,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation type="unfinished"></translation>
</message>
@@ -1416,13 +1409,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation type="unfinished"></translation>
</message>
@@ -1433,177 +1426,173 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation type="unfinished">&Pultsora Doitu</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">%1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation type="unfinished">&Konpasera Doitu</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A5</translation>
</message>
<message>
- <location line="-2205"/>
- <location line="+1302"/>
+ <location line="-3401"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1282"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2477"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation type="unfinished">&Konposizioa</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation type="unfinished">&Klabearen Aldaketa Gehitu...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation type="unfinished">Gehitu &Konpasaren Neurriaren Aldaketa</translation>
</message>
<message>
- <source>&Segment</source>
- <translation type="obsolete">&Segmentua</translation>
- </message>
- <message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation type="unfinished">&Gertaeren Zerrenda Editorean Irekin</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -1616,701 +1605,701 @@
</message>
<message>
<location line="+6"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1712"/>
- <location line="+1724"/>
+ <location line="-2908"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">A4</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">ID</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished">V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2588"/>
+ <location line="+43"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2342,7 +2331,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+17"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -2459,14 +2453,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2484,8 +2478,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2503,27 +2497,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation type="unfinished">&Doitu</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation type="unfinished">&Kuantizatu</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation type="unfinished">&Kuantifikatu...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation type="unfinished"></translation>
</message>
@@ -2534,36 +2528,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation type="unfinished">Altuera &Bereko Notak Batu</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation type="unfinished">Ez&kerrerantz Mugitu</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation type="unfinished">Abiadura &Gehitu</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation type="unfinished">Abiadura G&utxitu</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -2579,363 +2573,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation type="unfinished">Iraupena</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation type="unfinished">Bemol bikoitza</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation type="unfinished">Tenkatu edo T&xikitu...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation type="unfinished">Trans&posatu</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation type="unfinished">Tonuerdi bat &Igo</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation type="unfinished">Tonuerdi bat &Jaitsi</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation type="unfinished">&Oktaba bat Igo</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation type="unfinished">Ok&taba bat Jaitsi</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation type="unfinished">Transposatzen tonuerdi bat gora...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation type="unfinished">&Transposatu...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation type="unfinished">Inb&ertitu</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation type="unfinished">A&tzerakaria</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation type="unfinished">Atze&rako Inbertsioa</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation type="unfinished">&Segmentua Aktibatu...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation type="unfinished">A&ukeratu eta Editatu</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation type="unfinished">&Marraztu</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation type="unfinished">E&zabatu</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation type="unfinished">&Mugitu</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation type="unfinished">&Tamaina Aldatu</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation type="unfinished">&Abiadura</translation>
</message>
<message>
- <source>Local &Cursor</source>
- <translation type="obsolete">&Kurtsore Lokala</translation>
- </message>
- <message>
- <source>Cursor &Back</source>
- <translation type="obsolete">Kurtsorea &Atzera</translation>
- </message>
- <message>
- <source>Cursor &Forward</source>
- <translation type="obsolete">Kurtsorea A&urrera</translation>
- </message>
- <message>
- <source>Cursor For&ward Bar</source>
- <translation type="obsolete">Kurtsorea &Hurrengo Konpasera</translation>
- </message>
- <message>
- <source>Cursor to St&art</source>
- <translation type="obsolete">&Kurtsoera Hasierara</translation>
- </message>
- <message>
- <source>Cursor to &End</source>
- <translation type="obsolete">Kurtsorea &Bukaerara</translation>
- </message>
- <message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation type="unfinished">Kurtsorea Aurrera eta &Hautatu</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation type="unfinished">Errepikapena &Kendu</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation type="unfinished">T&ransportea</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation type="unfinished">&Jo</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation type="unfinished">&Gelditu</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation type="unfinished">Bi&rbobinatu</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation type="unfinished">&Bizkor Aurreratu</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation type="unfinished">Birbobinatu &Hasierara</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation type="unfinished">Bizkor Aurreratu &Bukaerara</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation type="unfinished">Erreprodukzioarekin Batera &Mugitu</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation type="unfinished">&Goiko Oktaba</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation type="unfinished">&Akordeak Txertatzeko Modua</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation type="unfinished">&Pausuz pausuko Grabaketa</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation type="unfinished">&Tresna-Barrak</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation type="unfinished">&Erregelak</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation type="unfinished">A&korde Izenen Erregela Erakutsi</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation type="unfinished">&Tenpoaren Erregela Erakutsi</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation type="unfinished">Lanabesen Tresna-Barra</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation type="unfinished">G&rabatu</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation type="unfinished"></translation>
</message>
@@ -3020,7 +2966,7 @@
<translation type="unfinished">&Esleitu ez diren Faderrak Erakutsi</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation type="unfinished"></translation>
</message>
@@ -3030,13 +2976,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation type="unfinished"></translation>
</message>
@@ -3101,10 +3047,6 @@
<translation type="unfinished">&Hutsuneen Tartekatzea</translation>
</message>
<message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">&Iraupen Faktorea</translation>
- </message>
- <message>
<location line="+1"/>
<source>&Layout Mode</source>
<translation type="unfinished">&Formatoaren Modua</translation>
@@ -3130,36 +3072,32 @@
<translation type="unfinished">L&etraren Editorea Ireki</translation>
</message>
<message>
- <source>Add Event Ruler</source>
- <translation type="obsolete">Gertaeren Erregela Gehitu</translation>
- </message>
- <message>
<location line="+23"/>
<source>Show &Track Headers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation type="unfinished">&Perkusiorako Matriz Editorean Ireki</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation type="unfinished">&Klabearen Aldaketa Gehitu...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation type="unfinished">T&ono Aldaketa Gehitu...</translation>
</message>
<message>
- <location line="-1125"/>
- <location line="+1724"/>
+ <location line="-2321"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation type="unfinished"></translation>
</message>
@@ -3174,13 +3112,13 @@
<translation type="unfinished">Gehitu Pedalaren &Askapena</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2110"/>
+ <location line="+1"/>
<source>Add &Layer</source>
<translation type="unfinished"></translation>
</message>
@@ -3196,7 +3134,7 @@
<translation type="unfinished">N&otak</translation>
</message>
<message>
- <location line="-1510"/>
+ <location line="-2706"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -3206,7 +3144,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1502"/>
+ <location line="+2698"/>
<source>Mar&ks</source>
<translation type="unfinished">&Markatzaileak</translation>
</message>
@@ -3488,8 +3426,8 @@
<translation type="unfinished">P&liken Kalkulatutako Norabidea Berjarri</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation type="unfinished">E&zabatu</translation>
</message>
@@ -3565,14 +3503,14 @@
<translation type="unfinished">Ligatura Be&hean</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation type="unfinished">Notak &Desligatu</translation>
</message>
@@ -3652,14 +3590,14 @@
<translation type="unfinished">Isiluneak &Normalizatu</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation type="unfinished">&Isiluneak Batu</translation>
</message>
@@ -3669,8 +3607,8 @@
<translation type="unfinished">&Notak</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -3756,13 +3694,13 @@
<translation type="unfinished">&Temporizazio fina</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation type="unfinished">Esk&uinerantz Mugitu</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation type="unfinished">&Ikusgarritasuna</translation>
</message>
@@ -3819,26 +3757,26 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation type="unfinished"></translation>
</message>
@@ -3983,26 +3921,14 @@
<translation type="unfinished"> Akordea</translation>
</message>
<message>
- <source>Cursor &Up Staff</source>
- <translation type="obsolete">Kurtsorea Pentagrama bat I&go</translation>
- </message>
- <message>
- <source>Cursor &Down Staff</source>
- <translation type="obsolete">Kurtsorea Pentagrama bat Jai&tsi</translation>
- </message>
- <message>
- <source>Cursor Ne&xt Segment</source>
- <translation type="obsolete">Sortu segmentua</translation>
- </message>
- <message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation type="unfinished">Nota &Txertatu</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation type="unfinished">&Beheko Oktaba</translation>
</message>
@@ -4022,13 +3948,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation type="unfinished">&Lanabesen Barra Erakutsi</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation type="unfinished">Erakutsi &Alterazioen Tresna-Barra</translation>
</message>
@@ -4048,18 +3974,18 @@
<translation type="unfinished">Erakutsi M&ultzoen Tresna-Barra</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation type="unfinished">&Transportearen Tresna-Barra Erakutsi</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation type="unfinished">Erakutsi &Formatoaren Tresna-Barra</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4072,13 +3998,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4089,7 +4015,7 @@
<translation type="unfinished">A&korde Izenen Erregela Erakutsi</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation type="unfinished">Nota G&ordinaren Erregela Erakutsi</translation>
</message>
@@ -4104,7 +4030,7 @@
<translation type="unfinished">&LilyPonderako Direktibak Erakutsi</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation type="unfinished">Klabeen Tresna-Barra</translation>
</message>
@@ -4124,7 +4050,7 @@
<translation type="unfinished">Markatzaileen Tresna-Barra</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation type="unfinished"></translation>
</message>
@@ -4145,90 +4071,54 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>0</source>
- <translation type="obsolete">0</translation>
- </message>
- <message>
- <source>3</source>
- <translation type="obsolete">A3</translation>
- </message>
- <message>
- <source>6</source>
- <translation type="obsolete">A6</translation>
- </message>
- <message>
- <source>4</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
- <source>2</source>
- <translation type="obsolete">A2</translation>
- </message>
- <message>
- <source>1</source>
- <translation type="obsolete">%1</translation>
- </message>
- <message>
- <source>5</source>
- <translation type="obsolete">A5</translation>
- </message>
- <message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rewind</source>
- <translation type="obsolete">Birbobinatu</translation>
- </message>
- <message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation type="unfinished"></translation>
</message>
@@ -4238,13 +4128,13 @@
<translation type="unfinished">Jo</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation type="unfinished"></translation>
</message>
@@ -4264,7 +4154,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+607"/>
+ <location line="-1416"/>
<source>Show A&ctions Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -4275,31 +4165,31 @@
</message>
<message>
<location line="+25"/>
- <location line="+1550"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1379"/>
- <location line="+1723"/>
+ <location line="-2575"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-810"/>
+ <location line="-1645"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -4324,7 +4214,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+116"/>
+ <location line="+950"/>
<source>&Move to Staff Above...</source>
<translation type="unfinished"></translation>
</message>
@@ -4349,14 +4239,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2180"/>
+ <location line="+282"/>
<source>&Figuration</source>
<translation type="unfinished"></translation>
</message>
@@ -4629,21 +4519,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
@@ -4814,7 +4704,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation type="unfinished">Txertatzeko Lanabesera Aldatu</translation>
</message>
@@ -4869,7 +4759,7 @@
<translation type="unfinished">Ikusgarri bihurtu</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation type="unfinished">Ligatura automatikoa dagokion lekuan</translation>
</message>
@@ -4909,7 +4799,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation type="unfinished"></translation>
</message>
@@ -4919,14 +4809,6 @@
<translation type="unfinished">&Inportatu</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Rosegarden &proiektu artxiboa Inportatu...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">&MIDI artxiboa inportatu...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation type="unfinished">&Hydrogen artxiboa inportatu...</translation>
@@ -4942,10 +4824,6 @@
<translation type="unfinished">Artxiboa Na&hasi...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">&MIDI artxiboa nahasi...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation type="unfinished">&Hydrogen artxiboa nahasi...</translation>
@@ -4956,26 +4834,6 @@
<translation type="unfinished">E&sportatu</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">&Rosegarden 2.1 proiektu artxiboa esportatu...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">&MIDI artxiboa esportatu...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">&Csound artxiboae esportatu...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">M&up artxiboa esportatu...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Music&XML artxiboa esportatu...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation type="unfinished"></translation>
@@ -5102,13 +4960,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation type="unfinished">&Estudioa</translation>
</message>
@@ -5163,58 +5021,54 @@
<translation type="unfinished">Oraingo Dokumentua Lehenetsitako Estudio gisa &Gorde</translation>
</message>
<message>
- <source>Se&gments</source>
- <translation type="obsolete">&Segmentuak</translation>
- </message>
- <message>
<location line="+2"/>
<source>Toggle Repeat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation type="unfinished">&Zatitu</translation>
</message>
@@ -5329,26 +5183,26 @@
<translation type="unfinished">&Instrumentuak Birmapeatu...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation type="unfinished">&Tamaina Aldatu</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation type="unfinished">P&unch in Grabaketa</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation type="unfinished">&Pisten Tresna-Barra Erakutsi</translation>
</message>
@@ -5363,15 +5217,15 @@
<translation type="unfinished">&Zoomaren Tresna-Barra Erakutsi</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation type="unfinished">Erreprodukziorako Kokapen-Erregela Erakutsi</translation>
</message>
@@ -5432,26 +5286,26 @@
<translation type="unfinished">Ediziorako Tresna-Barra</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+221"/>
+ <location line="-1791"/>
<source>Insert Tempo Change</source>
<translation type="unfinished">Tenpo Aldaketa Txertatu</translation>
</message>
@@ -5491,7 +5345,7 @@
<translation type="unfinished">Tenpo eta Konpas-Neurriaren Editorea Ireki</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation type="unfinished">&Elementua Editatu</translation>
</message>
@@ -5511,24 +5365,11 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation type="unfinished">&Segmentu Aktibatu Berri gisa Itsatsi</translation>
</message>
<message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">Mugatutako itsasteko motak leku nahikoa (bakarrik
-isiluneak dauzkala) behar du itsatsi behar den lekuan
-itsatsi behar diren gertaera guztiak edukitzeko.
-Ez da aurkitu leku nahikorik.
-Hala ere, itsatsi nahi baduzu, pentsatu beste itsasketa
-motetako bat erabiltzeaz ("Itsasi..." aukera Editatu
-menuan. Era berean, lehenetsitako itsasketa mota Mugatutakoa
-ez den beste batera alda dezakezu, nahi baduzu</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NoteFont.cpp" line="+58"/>
<source>No sizes listed for font "%1"</source>
<translation type="unfinished"></translation>
@@ -5549,7 +5390,7 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation type="unfinished">Baxua</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2626"/>
+ <location filename="../QMenuStrings.cpp" line="+345"/>
<location filename="../InstrumentStrings.cpp" line="-74"/>
<source>Triangle</source>
<translation type="unfinished">Triangle</translation>
@@ -7329,26 +7170,6 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">Do#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">ID</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">Fa#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">Sol#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../AutoloadStrings.cpp" line="-24"/>
<source>General MIDI Device</source>
<translation type="unfinished"></translation>
@@ -8534,16 +8355,16 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation type="unfinished">Audioa </translation>
@@ -10684,20 +10505,15 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation type="unfinished">Ezezaguna</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation type="unfinished">[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation type="unfinished">%1</translation>
</message>
@@ -10712,10 +10528,10 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation type="unfinished">%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation type="unfinished">%1 kontroladore%2 %3</translation>
</message>
@@ -10730,7 +10546,7 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
@@ -10838,45 +10654,53 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation type="unfinished"></translation>
</message>
@@ -10976,7 +10800,7 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
@@ -11073,6 +10897,58 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">LilyPondek ez ditu onoartzen hutsuneak edo backslashak artxiboen.
+izenetan
+%1
+erabili nahi duzu
+
+
+bere ordezr? </translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Esportatzeak huts egin du. Artxiboa ezin izan da ireki idazteko.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">oharra: konpas luzeegia, hemen moztua</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">oharra: konpas laburregia, isiluneekin betea</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11088,7 +10964,7 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -11150,12 +11026,12 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation type="unfinished">&Ligatura Gehitu</translation>
</message>
@@ -11650,14 +11526,6 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation type="unfinished">Audio artxiboa bihurtzen...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">Audio artxiboa birsanpleatzen...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">Audio artxiboa bihurten eta birsanpleatzen...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation type="unfinished">Audio artxiboa inportatzen...</translation>
@@ -11671,24 +11539,24 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation type="unfinished"><sinterik gabe></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation type="unfinished"><pluginik gabe></translation>
</message>
@@ -11741,10 +11609,6 @@ ez den beste batera alda dezakezu, nahi baduzu</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><audio artxiborik gabe></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation type="unfinished"></translation>
@@ -11869,10 +11733,6 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<translation type="unfinished">Etiketa berria sartu</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Audio artxiboa inportatzen...</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation type="unfinished"></translation>
@@ -11907,7 +11767,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation type="unfinished">Audioaren Nahastailea</translation>
</message>
@@ -11923,53 +11783,45 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation type="unfinished">Panorama</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation type="unfinished">Audioaren maila</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation type="unfinished">Mono edo Estereo</translation>
</message>
<message>
- <source>Mute</source>
- <translation type="obsolete">Mututu</translation>
- </message>
- <message>
- <source>Solo</source>
- <translation type="obsolete">Solo</translation>
- </message>
- <message>
<location line="+8"/>
<source>Arm recording</source>
<translation type="unfinished">Grabaketa armatu</translation>
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation type="unfinished"><ezer ez></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
@@ -11989,7 +11841,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation type="unfinished">Sub %1</translation>
</message>
@@ -12005,14 +11857,14 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<translation type="unfinished">Master</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation type="unfinished"><pluginik gabe></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -12454,10 +12306,6 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<translation type="unfinished">MIDI Bankuak eta Programak kudeatu</translation>
</message>
<message>
- <source>Reset</source>
- <translation type="obsolete">Hasieratu</translation>
- </message>
- <message>
<location line="+23"/>
<source>Device and Banks</source>
<translation type="unfinished"></translation>
@@ -12595,7 +12443,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<translation type="unfinished">Benetan nahi duzu banku hau ezabatu?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation type="unfinished">Benetan ezabatu nahi duzu teklatuaren mapaketa hau?</translation>
</message>
@@ -12670,10 +12518,6 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<source>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>Unsaved Changes</source>
- <translation type="obsolete">Gorde ez diren Aldaketak</translation>
- </message>
</context>
<context>
<name>Rosegarden::BeamCommand</name>
@@ -12783,6 +12627,120 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -13106,7 +13064,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -13114,10 +13072,6 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<context>
<name>Rosegarden::ConfigureDialog</name>
<message>
- <source>Configure Rosegarden</source>
- <translation type="obsolete">Rosegarden Konfiguratu</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/ConfigureDialog.cpp" line="+48"/>
<source>Rosegarden - Preferences</source>
<translation type="unfinished"></translation>
@@ -13335,7 +13289,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -13351,7 +13305,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation type="unfinished">Kontroladorearen Gertaera ez jasota</translation>
</message>
@@ -13366,12 +13320,13 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<translation type="unfinished">Kontroladorearen Gertaerak</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation type="unfinished">Kontroladorearen Gertaera Zenbakia</translation>
</message>
@@ -13379,7 +13334,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
@@ -13389,7 +13344,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<translation type="unfinished">(laburpena)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation type="unfinished">(kopiatuta)</translation>
</message>
@@ -13459,7 +13414,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation type="unfinished">Ebak&i</translation>
</message>
@@ -13499,10 +13454,6 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Birbatu Komandoa</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation type="unfinished">Ezabatu tartea</translation>
@@ -13539,7 +13490,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation type="unfinished"></translation>
</message>
@@ -13547,14 +13498,6 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
<context>
<name>Rosegarden::DiatonicPitchChooser</name>
<message>
- <source>D</source>
- <translation type="obsolete">ID</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/DiatonicPitchChooser.cpp" line="+59"/>
<source>C</source>
<comment>note name</comment>
@@ -13830,126 +13773,7 @@ Mesedez, aukera itzazu disko gogorretik betiko ezabatu nahi dituzunak.
</message>
</context>
<context>
- <name>Rosegarden::EditView</name>
- <message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 kontroladore%2 %3</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Kontroladorearen Gertaera ez jasota</translation>
- </message>
- <message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <source>VIII</source>
- <translation type="obsolete">VIII</translation>
- </message>
- <message>
- <source>%1 flat</source>
- <translation type="obsolete">%1 bemol</translation>
- </message>
- <message>
- <source>%1 sharp</source>
- <translation type="obsolete">%1 diese</translation>
- </message>
- <message>
- <source>&Insert Note</source>
- <translation type="obsolete">Nota &Txertatu</translation>
- </message>
- <message>
- <source>&Upper Octave</source>
- <translation type="obsolete">&Goiko Oktaba</translation>
- </message>
- <message>
- <source>&Lower Octave</source>
- <translation type="obsolete">&Beheko Oktaba</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Konpasaren iraupen estimatua erakusten da</translation>
- </message>
- <message>
- <source>Halving durations...</source>
- <translation type="obsolete">Noten iraupena ezartzen...</translation>
- </message>
- <message>
- <source>Doubling durations...</source>
- <translation type="obsolete">Noten iraupena ezartzen...</translation>
- </message>
- <message>
- <source>Rescaling...</source>
- <translation type="obsolete">Birreskalatzen...</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Transposatu</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Sartu transposatu beharreko tonuerdien kopurua:</translation>
- </message>
- <message>
- <source>Transposing...</source>
- <translation type="obsolete">Transposatzen...</translation>
- </message>
- <message>
- <source>Transposing up one semitone...</source>
- <translation type="obsolete">Transposatzen tonuerdi bat gora...</translation>
- </message>
- <message>
- <source>Transposing up one octave...</source>
- <translation type="obsolete">Transposatzen oktaba bat gora...</translation>
- </message>
- <message>
- <source>Transposing down one semitone...</source>
- <translation type="obsolete">Transposatzen tonuerdi bat behera...</translation>
- </message>
- <message>
- <source>Transposing down one octave...</source>
- <translation type="obsolete">Transposatzen oktaba bat behera...</translation>
- </message>
- <message>
- <source>Inverting...</source>
- <translation type="obsolete">Inbertitzen</translation>
- </message>
- <message>
- <source>Jogging left...</source>
- <translation type="obsolete">Ezkerrera mugitzen...</translation>
- </message>
- <message>
- <source>Jogging right...</source>
- <translation type="obsolete">Eskuinera mugitzen...</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::EditViewBase</name>
+ <name>Rosegarden::EditViewBase</name>
<message>
<location filename="../../src/gui/general/EditViewBase.cpp" line="+222"/>
<source>Toggle the statusbar...</source>
@@ -14287,46 +14111,10 @@ Honek arazoak sortu ditzake aurrerago modu ezberdin batean kalkulatutako balore
<translation type="unfinished">Patroia</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Bemol - ezarri %1 baliora</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Txandakatu - jarri %1 maximoan eta minimoan txandakako gertaeretan</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo - Jarri %1 hazten minimotik maximorantz</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo - Jarri %1 jaisten maximotik minimorantz</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Errepika - jarri %1 txandakatzen maximotik minimorantz, biakzerorantz doazela</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation type="unfinished">Baloreak</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Lehenengo Balorea</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Bigarren Balorea</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Balore Baxua</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Balore Altua</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14586,18 +14374,6 @@ Honek arazoak sortu ditzake aurrerago modu ezberdin batean kalkulatutako balore
<source>http://rosegardenmusic.com/wiki/doc:eventView-en</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>%1 - Triggered Segment: %2</source>
- <translation type="obsolete">%1 - Segmentu Aktibatua: %2</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - Event List</source>
- <translation type="obsolete">%1 - Segmentu Pista #%2 - Gertaeren Zerrenda</translation>
- </message>
- <message>
- <source>%1 - %2 Segments - Event List</source>
- <translation type="obsolete">%1 - %2 Segmentu - Gertaeren Zerrenda</translation>
- </message>
</context>
<context>
<name>Rosegarden::ExpandFigurationCommand</name>
@@ -14995,10 +14771,6 @@ Nahi duzu artxibo hau bilatzen saiatu edo aurrera jarraitu?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Normal</source>
- <translation type="obsolete">Normala</translation>
- </message>
- <message>
<location line="+6"/>
<source>Safe</source>
<translation type="unfinished"></translation>
@@ -15029,10 +14801,6 @@ Nahi duzu artxibo hau bilatzen saiatu edo aurrera jarraitu?</translation>
<translation type="unfinished">Leiho nagusia</translation>
</message>
<message>
- <source>Matrix</source>
- <translation type="obsolete">Matriza</translation>
- </message>
- <message>
<location line="+4"/>
<source>Notation</source>
<translation type="unfinished">Partitura</translation>
@@ -15358,23 +15126,6 @@ Nahi duzu artxibo hau bilatzen saiatu edo aurrera jarraitu?</translation>
<context>
<name>Rosegarden::IdentifyTextCodecDialog</name>
<message>
- <source>Choose Text Encoding</source>
- <translation type="obsolete">Hautatu Testu Kodifikatzaile bat</translation>
- </message>
- <message>
- <source>
-This file contains text in an unknown language encoding.
-
-Please select one of the following estimated text encodings
-for use with the text in this file:
-</source>
- <translation type="obsolete">
-Artxibo honek kodifikazio hizkuntza ezezagun bateko testua dauka.
-
-Mesedez, hautatu ondoko testu kodifikazio estimatuetako bat artxibo honetan dagoen testuarekin erabiltzeko
-</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/IdentifyTextCodecDialog.cpp" line="+69"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
@@ -15676,7 +15427,7 @@ Artxiboan dagoen testuaren adibidea:</translation>
<translation type="unfinished">Instrumentuaren Parametroak</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation type="unfinished">Pista</translation>
</message>
@@ -15684,7 +15435,7 @@ Artxiboan dagoen testuaren adibidea:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -16067,52 +15818,8 @@ Artxiboan dagoen testuaren adibidea:</translation>
</message>
</context>
<context>
- <name>Rosegarden::LatencyConfigurationPage</name>
- <message>
- <source>Latency</source>
- <translation type="obsolete">Latentzia </translation>
- </message>
- <message>
- <source>Sequencer Latency</source>
- <translation type="obsolete">Sekuentziadorearen Latentzia</translation>
- </message>
- <message>
- <source>JACK latency</source>
- <translation type="obsolete">JACK-aren latentzia</translation>
- </message>
- <message>
- <source>Use the "Fetch JACK latencies" button to discover the latency values set at
-the sequencer. It's recommended that you use the returned values but it's also
-possible to override them manually using the sliders. Note that if you change
-your JACK server parameters you should always fetch the latency values again.
-The latency values will be stored by Rosegarden for use next time.</source>
- <translation type="obsolete">Erabili "JACK latentziak lortu" botoia sekuentziadorean ezarritako baloreakikusi ahal izateko
-Gomendatzen da ikusten diren baloreak erabiltzea, baina izan daiteke bestebatzuk
-jartzea kontroleak erabiliz. Kontuan izan JACK zerbitzariaren parametroakaldatuz gero
-latentzia baloreak beti berreskuratu beharko zenukeelaberriro
-Latentzia baloreak Rosegardenen gordeko dira etorkizunean erabiltzeko</translation>
- </message>
- <message>
- <source>JACK playback latency (in ms)</source>
- <translation type="obsolete">JACK-en erreprodukzio latentzia (ms-tan)</translation>
- </message>
- <message>
- <source>JACK record latency (in ms)</source>
- <translation type="obsolete">JACK-en grabaketa latentzia (ms-tan)</translation>
- </message>
- <message>
- <source>Fetch JACK latencies</source>
- <translation type="obsolete">JACK-en latentziak lortu</translation>
- </message>
- <message>
- <source>JACK Latency</source>
- <translation type="obsolete">JACK-en Latentzia</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -16120,7 +15827,7 @@ Would you like to use
%1
instead?</source>
- <translation type="unfinished">LilyPondek ez ditu onoartzen hutsuneak edo backslashak artxiboen.
+ <translation type="obsolete">LilyPondek ez ditu onoartzen hutsuneak edo backslashak artxiboen.
izenetan
%1
erabili nahi duzu
@@ -16129,39 +15836,16 @@ erabili nahi duzu
bere ordezr? </translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">Esportatzeak huts egin du. Artxiboa ezin izan da ireki idazteko.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Esportatzeak huts egin du. Artxiboa ezin izan da ireki idazteko.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation type="unfinished">oharra: konpas luzeegia, hemen moztua</translation>
+ <translation type="obsolete">oharra: konpas luzeegia, hemen moztua</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation type="unfinished">oharra: konpas laburregia, isiluneekin betea</translation>
+ <translation type="obsolete">oharra: konpas laburregia, isiluneekin betea</translation>
</message>
</context>
<context>
@@ -16870,7 +16554,7 @@ sortuko duela erreprodukzioaren hasieran, igortzen den datuen kopurua dela eta</
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -16910,10 +16594,6 @@ sortuko duela erreprodukzioaren hasieran, igortzen den datuen kopurua dela eta</
<translation type="unfinished">Programa</translation>
</message>
<message>
- <source>Channel out</source>
- <translation type="obsolete">Irteera Kanala</translation>
- </message>
- <message>
<location line="-46"/>
<source>Percussion</source>
<translation type="unfinished">Perkusioa</translation>
@@ -16959,12 +16639,7 @@ sortuko duela erreprodukzioaren hasieran, igortzen den datuen kopurua dela eta</
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation type="unfinished">[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation type="unfinished">Konexiorik gabe</translation>
</message>
@@ -17102,10 +16777,6 @@ sortuko duela erreprodukzioaren hasieran, igortzen den datuen kopurua dela eta</
<translation type="unfinished"></translation>
</message>
<message>
- <source>Bars, beats, and divisions</source>
- <translation type="obsolete">Konpasak, pultsuak eta zatiketak</translation>
- </message>
- <message>
<location line="+4"/>
<source>Bar velocity</source>
<translation type="unfinished">Konpasaren abiadura</translation>
@@ -17186,16 +16857,21 @@ sortuko duela erreprodukzioaren hasieran, igortzen den datuen kopurua dela eta</
<translation type="unfinished">Grabatzen</translation>
</message>
<message>
- <source>Synth plugin </source>
- <translation type="obsolete">Sintetizagailu pluginak</translation>
- </message>
- <message>
<location line="+124"/>
<source>%1 (%2)</source>
<translation type="unfinished">%1 (%2)</translation>
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17399,12 +17075,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished">Shift sakatuta mantendu pultsoaren saretarekin lotzea ekiditeko</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation type="unfinished">Gertaera Kopiatu eta Mugitu</translation>
</message>
@@ -17563,7 +17239,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Abiadura:</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation type="unfinished">Klik egin eta arrastatu hautatutako noten tamaina aldatzeko</translation>
</message>
@@ -17576,80 +17252,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <source>Instrument Parameters</source>
- <translation type="obsolete">Instrumentuaren Parametroak</translation>
- </message>
- <message>
- <source>Couldn't apply piano roll layout</source>
- <translation type="obsolete">Ezin izan da piano-roll formatoa aplikatu</translation>
- </message>
- <message>
- <source> No selection </source>
- <translation type="obsolete"> Hautaketarik ez </translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">Kuantifikatzen </translation>
- </message>
- <message>
- <source>Collapsing notes...</source>
- <translation type="obsolete">Notak batzen...</translation>
- </message>
- <message>
- <source>Making legato...</source>
- <translation type="obsolete">Legatoa egiten...</translation>
- </message>
- <message>
- <source>Note: %1 (%2.%3s)</source>
- <translation type="obsolete">Nota: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>%1 (%2)</source>
- <translation type="obsolete">%1 (%2)</translation>
- </message>
- <message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Denbora: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">Hautatutakoa arbelera mozten...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">Hautatutakoa arbelera kopiatzen...</translation>
- </message>
- <message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">Arbela hutsik</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">Arbelaren edukia txertatzen...</translation>
- </message>
- <message>
- <source>Couldn't paste at this point</source>
- <translation type="obsolete">Ezin da itsatsi puntu honetan</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">Hautatutakoa ezabatzen...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished">Nota ezezaguna txertatzeko eragiketa: %1</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">Nota txertatzen</translation>
- </message>
- <message>
- <source>Unquantizing...</source>
- <translation type="obsolete">Deskuantifikatzen...</translation>
- </message>
- <message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation type="unfinished"><izenbururik gabe></translation>
</message>
@@ -17672,14 +17280,6 @@ Double-click to open the marker editor.</source>
</translation>
</message>
<message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 kontroladore%2 %3</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Kontroladorearen Gertaera ez jasota</translation>
- </message>
- <message>
<location line="+254"/>
<source> Grid: </source>
<translation type="unfinished"> Sareta: </translation>
@@ -17720,7 +17320,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation type="unfinished"></translation>
</message>
@@ -17736,8 +17336,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -17747,15 +17346,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Estimatutako armadura erakusten da</translation>
</message>
<message>
- <source> Zoom: </source>
- <translation type="obsolete"> Handitu: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation type="unfinished">Konpasaren iraupen estimatua erakusten da</translation>
</message>
@@ -17770,62 +17361,25 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Sartu transposatu beharreko tonuerdien kopurua:</translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">Abiadurak igotzen...</translation>
+ <location line="-320"/>
+ <source>Trigger Segment</source>
+ <translation type="unfinished">Segmentua Aktibatu</translation>
</message>
<message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">Abiadurak jaisten...</translation>
+ <location line="+10"/>
+ <source>Remove Triggers</source>
+ <translation type="unfinished">Aktibatzaileak Ezabatu</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Gertaeren Abiadurak Ezarri</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Abiadurak Ezartzen...</translation>
- </message>
- <message>
- <location line="-320"/>
- <source>Trigger Segment</source>
- <translation type="unfinished">Segmentua Aktibatu</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Remove Triggers</source>
- <translation type="unfinished">Aktibatzaileak Ezabatu</translation>
- </message>
- <message>
- <location line="-824"/>
- <source>Matrix</source>
- <translation type="unfinished">Matriza</translation>
- </message>
- <message>
- <source>Percussion</source>
- <translation type="obsolete">Perkusioa</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - %3</source>
- <translation type="obsolete">%1 - Segmentu Pista #%2 - %3</translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">%1 - Segmentu Guztiak - %2</translation>
- </message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="unfinished">Ezin da nota txertatu: ez da hautatu saretaren iraupena</translation>
- </message>
- <message>
- <source> Chord </source>
- <translation type="obsolete"> Akordea</translation>
+ <location line="-826"/>
+ <source>Matrix</source>
+ <translation type="unfinished">Matriza</translation>
</message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation type="unfinished"></translation>
</message>
@@ -17845,7 +17399,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -17952,13 +17506,6 @@ Double-click to open the marker editor.</source>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">Teklatuaren Mapaketa</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="+53"/>
@@ -17975,7 +17522,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation type="unfinished">MIDI Nahastailea</translation>
</message>
@@ -17990,7 +17537,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">Instrumentoa</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -18137,430 +17684,143 @@ Double-click to open the marker editor.</source>
<message>
<location line="+2"/>
<source>Add &Key Change...</source>
- <translation type="unfinished">T&ono Aldaketa Gehitu...</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::MusicXMLOptionsDialog</name>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="+60"/>
- <source>MusicXML Export</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Layout</source>
- <translation type="unfinished">Formatoa</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Headers</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Basic options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Export content</source>
- <translation type="unfinished">Edukia esportatu</translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Choose which tracks or segments to export</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>All tracks</source>
- <translation type="unfinished">Pista guztiak</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Non-muted tracks</source>
- <translation type="unfinished">Pista ez-mututuak</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Selected track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Selected segments</source>
- <translation type="unfinished">Hautatutako segmentuak</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Export track staff brackets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Track staff brackets are found in the <b>Track Parameters</b> box, and may be used to group staffs in various ways</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Advanced/Experimental options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Compatibility level</source>
- <translation type="unfinished">Bateragarritasun maila</translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Set the MusicXML version you want export</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source><qt><p>Choose the format of the MusicXML file.</p><p>The "partwise" format contains "part" elements that contain "measure" elements. The "timewise" format reverses this ordering.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export grand staff instrument</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source><qt>Choose which bracket will create a grand staff system</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-29"/>
- <source>MusicXML type</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>None</source>
- <translation type="unfinished">Ezer Ez</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Don't export percussion tracks</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Use "<octave-shift>" for transposing instruments</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+45"/>
- <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NameSetEditor</name>
- <message>
- <source>Librarian</source>
- <translation type="obsolete">Liburuzaina</translation>
- </message>
- <message>
- <source>Name</source>
- <translation type="obsolete">Izena</translation>
- </message>
- <message>
- <source>Email</source>
- <translation type="obsolete">Posta Elektronikoa</translation>
- </message>
- <message>
- <source>The librarian maintains the Rosegarden device data for this device.
-If you've made modifications to suit your own device, it might be worth
-liaising with the librarian in order to publish your information for the benefit
-of others.</source>
- <translation type="obsolete">Liburuzainak dispositibo honetarako informazioa gordetzen du.
-Aldaketarik egin baduzu zure dispositiboarekin bat etorri dadin, probetxuzkoa
-izan daiteke liburuzainari esatea, zure informazioa argitara dadin besteen
-onerako.</translation>
- </message>
- <message>
- <location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
- <source>Provided by</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewMatrixView</name>
- <message>
- <source>Matrix</source>
- <translation type="obsolete">Matriza</translation>
- </message>
- <message>
- <source><untitled></source>
- <translation type="obsolete"><izenbururik gabe></translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">%1 - Segmentu Guztiak - %2</translation>
- </message>
- <message>
- <source> Grid: </source>
- <translation type="obsolete"> Sareta: </translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Ezer Ez</translation>
- </message>
- <message>
- <source>Unit</source>
- <translation type="obsolete">Unitatea</translation>
- </message>
- <message>
- <source>Beat</source>
- <translation type="obsolete">Pultsua</translation>
- </message>
- <message>
- <source>Bar</source>
- <translation type="obsolete">Konpasa</translation>
- </message>
- <message>
- <source> Velocity: </source>
- <translation type="obsolete">Abiadura:</translation>
- </message>
- <message>
- <source> Quantize: </source>
- <translation type="obsolete"> Kuantifikazioa: </translation>
- </message>
- <message>
- <source> Zoom: </source>
- <translation type="obsolete"> Handitu: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Gertaeren Abiadurak Ezarri</translation>
- </message>
- <message>
- <source>Trigger Segment</source>
- <translation type="obsolete">Segmentua Aktibatu</translation>
- </message>
- <message>
- <source>Remove Triggers</source>
- <translation type="obsolete">Aktibatzaileak Ezabatu</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Konpasaren iraupen estimatua erakusten da</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Transposatu</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Sartu transposatu beharreko tonuerdien kopurua:</translation>
- </message>
- <message>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="obsolete">Ezin da nota txertatu: ez da hautatu saretaren iraupena</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewNotationView</name>
- <message>
- <source>Note &Font</source>
- <translation type="obsolete">Notaren &Letra-Tipoa</translation>
- </message>
- <message>
- <source>Si&ze</source>
- <translation type="obsolete">&Tamaina</translation>
- </message>
- <message>
- <source>S&pacing</source>
- <translation type="obsolete">&Hutsuneen Tartekatzea</translation>
- </message>
- <message>
- <source> Font: </source>
- <translation type="obsolete"> Letra-Tipoa: </translation>
- </message>
- <message>
- <source>Unknown font "%1", using default</source>
- <translation type="obsolete">"%1" Letra-Tipo ezezaguna, lehenetsia erabiliko da</translation>
- </message>
- <message>
- <source> Size: </source>
- <translation type="obsolete"> Tamaina: </translation>
- </message>
- <message>
- <source> Spacing: </source>
- <translation type="obsolete"> Hutsuneen Tartekatzea: </translation>
- </message>
- <message>
- <source>LilyPond Preview Options</source>
- <translation type="obsolete">Lilypond Aurrebista Opzioak</translation>
- </message>
- <message>
- <source>LilyPond preview options</source>
- <translation type="obsolete">Lilypond aurrebista opzioak</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Esportatzeak huts egin du. Artxiboa ezin izan da ireki idazteko.</translation>
- </message>
- <message>
- <source>Unknown font action %1</source>
- <translation type="obsolete">Letra tiporako akzio ezezaguna %1</translation>
- </message>
- <message>
- <source>Unknown font size action %1</source>
- <translation type="obsolete">Letra-Tiporako tamaina eragiketa ezezaguna %1</translation>
- </message>
- <message>
- <source>Unknown spacing action %1</source>
- <translation type="obsolete">Hutsuneak tartekatzeko eragiketa ezezaguna %1</translation>
- </message>
- <message>
- <source>Can't paste multiple Segments into one</source>
- <translation type="obsolete">Ezin dira segmentu asko batean itsatsi</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
- <message>
- <source>Couldn't paste at this point.</source>
- <translation type="obsolete">Ezin da puntu honetan itsatsi.</translation>
- </message>
- <message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">Mugatutako itsasteko motak leku nahikoa (bakarrik
-isiluneak dauzkala) behar du itsatsi behar den lekuan
-itsatsi behar diren gertaera guztiak edukitzeko.
-Ez da aurkitu leku nahikorik.
-Hala ere, itsatsi nahi baduzu, pentsatu beste itsasketa
-motetako bat erabiltzeaz ("Itsasi..." aukera Editatu
-menuan. Era berean, lehenetsitako itsasketa mota Mugatutakoa
-ez den beste batera alda dezakezu, nahi baduzu</translation>
+ <translation type="unfinished">T&ono Aldaketa Gehitu...</translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::MusicXMLOptionsDialog</name>
<message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">Arbela hutsik</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="+60"/>
+ <source>MusicXML Export</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">Arbelaren edukia txertatzen...</translation>
+ <location line="+16"/>
+ <source>Layout</source>
+ <translation type="unfinished">Formatoa</translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">Abiadurak igotzen...</translation>
+ <location line="+7"/>
+ <source>Headers</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">Abiadurak jaisten...</translation>
+ <location line="+6"/>
+ <source>Basic options</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Gertaeren Abiadurak Ezarri</translation>
+ <location line="+12"/>
+ <source>Export content</source>
+ <translation type="unfinished">Edukia esportatu</translation>
</message>
<message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Abiadurak Ezartzen...</translation>
+ <location line="+2"/>
+ <source><qt>Choose which tracks or segments to export</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Unknown note insert action %1</source>
- <translation type="obsolete">Nota ezezaguna txertatzeko eragiketa: %1</translation>
+ <location line="+1"/>
+ <source>All tracks</source>
+ <translation type="unfinished">Pista guztiak</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">Nota txertatzen</translation>
+ <location line="+1"/>
+ <source>Non-muted tracks</source>
+ <translation type="unfinished">Pista ez-mututuak</translation>
</message>
<message>
- <source>Ornament track %1 bar %2</source>
- <translation type="obsolete">%1 Apaindura Pista konpas %2</translation>
+ <location line="+1"/>
+ <source>Selected track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Ornament bar %1</source>
- <translation type="obsolete">Apaindura konpasa %1</translation>
+ <location line="+1"/>
+ <source>Selected segments</source>
+ <translation type="unfinished">Hautatutako segmentuak</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Apaindura Sortu</translation>
+ <location line="+3"/>
+ <source>Export track staff brackets</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Use Ornament</source>
- <translation type="obsolete">Apaindura Erabili</translation>
+ <location line="+2"/>
+ <source><qt>Track staff brackets are found in the <b>Track Parameters</b> box, and may be used to group staffs in various ways</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Remove Ornaments</source>
- <translation type="obsolete">Apaindurak Ezabatu</translation>
+ <location line="+6"/>
+ <source>Advanced/Experimental options</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Estimated key signature shown</source>
- <translation type="obsolete">Estimatutako armadura erakusten da</translation>
+ <location line="+11"/>
+ <source>Compatibility level</source>
+ <translation type="unfinished">Bateragarritasun maila</translation>
</message>
<message>
- <source>Sustain</source>
- <translation type="obsolete">Diesea</translation>
+ <location line="+2"/>
+ <source><qt>Set the MusicXML version you want export</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>There is no sustain controller defined for this device.
-Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
- <translation type="obsolete">Ez dago sustain kontroladore definitu bat dispositibo honetarako.
-Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dispositiboak Kudeatu" dialogoan, leiho nagusian. </translation>
+ <location line="+9"/>
+ <source><qt><p>Choose the format of the MusicXML file.</p><p>The "partwise" format contains "part" elements that contain "measure" elements. The "timewise" format reverses this ordering.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Konpasaren iraupen estimatua erakusten da</translation>
+ <location line="+6"/>
+ <source>Export grand staff instrument</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Can't insert note: No note duration selected</source>
- <translation type="obsolete">Ezin da nota txertatu: notaren iraupena ez dago hautatuta</translation>
+ <location line="+6"/>
+ <source><qt>Choose which bracket will create a grand staff system</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Denbora: %1 (%2.%3s)</translation>
+ <location line="+9"/>
+ <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 - Segment Track #%2 - Notation</source>
- <translation type="obsolete">%1 - Segmentu Pista #%2 - Partitura</translation>
+ <location line="+6"/>
+ <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">%1 - Segmentu Guztiak - Partitura</translation>
+ <location line="-29"/>
+ <source>MusicXML type</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Hirukotxoa</translation>
+ <location line="+10"/>
+ <source>None</source>
+ <translation type="unfinished">Ezer Ez</translation>
</message>
<message>
- <source>Chord</source>
- <translation type="obsolete">Akordea</translation>
+ <location line="+7"/>
+ <source>Don't export percussion tracks</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Grace</source>
- <translation type="obsolete">Grave</translation>
+ <location line="+8"/>
+ <source>Use "<octave-shift>" for transposing instruments</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Transpose</source>
- <translation type="obsolete">Transposatu</translation>
+ <location line="+45"/>
+ <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::NameSetEditor</name>
<message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Sartu transposatu beharreko tonuerdien kopurua:</translation>
+ <location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
+ <source>Provided by</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -18574,13 +17834,13 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation type="unfinished">Partitura</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation type="unfinished">Formato lehenetsiaren modua</translation>
</message>
@@ -18610,18 +17870,6 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<translation type="unfinished">Normala</translation>
</message>
<message>
- <source>Default duration factor</source>
- <translation type="obsolete">Iraupen faktore lehenetsia</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Ezer Ez</translation>
- </message>
- <message>
- <source>Full</source>
- <translation type="obsolete">Beteta</translation>
- </message>
- <message>
<location line="+12"/>
<source>Show track headers (linear layout only)</source>
<translation type="unfinished"></translation>
@@ -18833,10 +18081,6 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<translation type="unfinished">Tipografiaren tamaina pentagrama asko ikusteko</translation>
</message>
<message>
- <source>Font size for printing (pt)</source>
- <translation type="obsolete">Tipografiaren tamaina inprimatzeko(pt)</translation>
- </message>
- <message>
<location line="+18"/>
<source>Text font</source>
<translation type="unfinished">Testuaren tipografia</translation>
@@ -19147,18 +18391,6 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<context>
<name>Rosegarden::NotationView</name>
<message>
- <source>Close track headers</source>
- <translation type="obsolete">Pistaren izena aldatu</translation>
- </message>
- <message>
- <source>Starting...</source>
- <translation type="obsolete">Hasieratzen...</translation>
- </message>
- <message>
- <source>Preparing to print...</source>
- <translation type="obsolete">Inprimatzeko prestatzen...</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NotationView.cpp" line="+121"/>
<source>Note &Font</source>
<translation type="unfinished">Notaren &Letra-Tipoa</translation>
@@ -19173,14 +18405,6 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<source>S&pacing</source>
<translation type="unfinished">&Hutsuneen Tartekatzea</translation>
</message>
- <message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">&Iraupen Faktorea</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Ezer Ez</translation>
- </message>
<message numerus="yes">
<location line="-8"/>
<source>%n pixel(s)</source>
@@ -19190,7 +18414,7 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation type="unfinished"> Letra-Tipoa: </translation>
</message>
@@ -19210,52 +18434,12 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<translation type="unfinished"> Hutsuneen Tartekatzea: </translation>
</message>
<message>
- <source> Ready.</source>
- <translation type="obsolete"> Prest.</translation>
- </message>
- <message>
- <source>Laying out score...</source>
- <translation type="obsolete">Formato ematen partiturari...</translation>
- </message>
- <message>
- <source>Laying out staff %1...</source>
- <translation type="obsolete">%1 pentagramari formatoa ematen...</translation>
- </message>
- <message>
- <source>Reconciling staffs...</source>
- <translation type="obsolete">Pentagramak adosten...</translation>
- </message>
- <message>
- <location line="-115"/>
+ <location line="-117"/>
<source> No selection </source>
<translation type="unfinished"> Hautaketarik ez </translation>
</message>
<message>
- <source>Sizing and allocating canvas...</source>
- <translation type="obsolete">Mihiseari tamaina aldatzen eta kokatzen...</translation>
- </message>
- <message>
- <source>note</source>
- <translation type="obsolete">nota</translation>
- </message>
- <message>
- <source>rest</source>
- <translation type="obsolete">isilunea</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - Notation</source>
- <translation type="obsolete">%1 - Segmentu Pista #%2 - Partitura</translation>
- </message>
- <message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">%1 - Segmentu Guztiak - Partitura</translation>
- </message>
- <message>
- <source>Triplet</source>
- <translation type="obsolete">Hirukotxoa</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation type="unfinished">Akordea</translation>
</message>
@@ -19272,57 +18456,21 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<translation type="unfinished">%1 (%2)</translation>
</message>
<message>
- <source>Hidden annotations</source>
- <translation type="obsolete">Ezkutuko oharrak</translation>
- </message>
- <message>
- <source>Hidden LilyPond directives</source>
- <translation type="obsolete">Ezkutuko LilyPond Direktibak</translation>
- </message>
- <message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation type="unfinished">Hutsuneak tartekatzeko eragiketa ezezaguna %1</translation>
</message>
<message>
- <source>Unknown proportion action %1</source>
- <translation type="obsolete">Proporzio eragiketa ezezaguna %1</translation>
- </message>
- <message>
<location line="-51"/>
<source>Unknown font action %1</source>
<translation type="unfinished">Letra tiporako akzio ezezaguna %1</translation>
</message>
<message>
- <source>Unknown font size %1</source>
- <translation type="obsolete">Letra tipoaren tamaina ezezaguna %1</translation>
- </message>
- <message>
<location line="+26"/>
<source>Unknown font size action %1</source>
<translation type="unfinished">Letra-Tiporako tamaina eragiketa ezezaguna %1</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">Inprimatzen...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Aurrebista egiten...</translation>
- </message>
- <message>
- <source>Printing LilyPond file...</source>
- <translation type="obsolete">Lilypond artxiboaren aurrebista...</translation>
- </message>
- <message>
- <source>Failed to open a temporary file for LilyPond export.</source>
- <translation type="obsolete">Lilypondera esportatzeko behin-behineko artxibo bat irekitzerakoan errorea.</translation>
- </message>
- <message>
- <source>Previewing LilyPond file...</source>
- <translation type="obsolete">Lilypond artxiboaren aurrebista...</translation>
- </message>
- <message>
<location line="-147"/>
<source>LilyPond Preview Options</source>
<translation type="unfinished">Lilypond Aurrebista Opzioak</translation>
@@ -19333,37 +18481,17 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<translation type="unfinished">Lilypond aurrebista opzioak</translation>
</message>
<message>
- <source>Exporting LilyPond file...</source>
- <translation type="obsolete">Lilypond artxiboa esportatzen...</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Esportatzeak huts egin du. Artxiboa ezin izan da ireki idazteko.</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">Hautatutakoa arbelera mozten...</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">Hautatutakoa ezabatzen...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">Hautatutakoa arbelera kopiatzen...</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation type="unfinished">Arbela hutsik</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation type="unfinished">Ezin dira segmentu asko batean itsatsi</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -19376,23 +18504,22 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+88"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation type="unfinished"></translation>
</message>
@@ -19407,29 +18534,29 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation type="unfinished">Arbelaren edukia txertatzen...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation type="unfinished">Ezin da puntu honetan itsatsi.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation type="unfinished">Gertaerak &Mugitu Beste Segmentu Batera</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation type="unfinished">Abiadurak igotzen...</translation>
</message>
@@ -19439,15 +18566,7 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<translation type="unfinished">Abiadurak jaisten...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Gertaeren Abiadurak Ezarri</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Abiadurak Ezartzen...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation type="unfinished"></translation>
</message>
@@ -19462,11 +18581,7 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<translation type="unfinished">Notak batzen...</translation>
</message>
<message>
- <source>No note duration selected</source>
- <translation type="obsolete">Ez da hautatu notaren iraupena</translation>
- </message>
- <message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished">Nota ezezaguna txertatzeko eragiketa: %1</translation>
</message>
@@ -19476,29 +18591,13 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<translation type="unfinished">Nota txertatzen</translation>
</message>
<message>
- <source>No rest duration selected</source>
- <translation type="obsolete">Ez da hautatu isilunearen iraupena</translation>
- </message>
- <message>
- <source>No note or rest duration selected</source>
- <translation type="obsolete">Ez da hautatu notaren edo isilunearen iraupena</translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">Kuantifikatzen </translation>
- </message>
- <message>
- <source>Interpreting selection...</source>
- <translation type="obsolete">Hautatutakoa interpretatzen...</translation>
- </message>
- <message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation type="unfinished">Puntutxoa gehitzen...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation type="unfinished">%1 Apaindura Pista konpas %2</translation>
</message>
@@ -19508,10 +18607,6 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<translation type="unfinished">Apaindura konpasa %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Apaindura Sortu</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation type="unfinished">Apaindura Erabili</translation>
@@ -19547,7 +18642,7 @@ Hau bug bat da (programak krask egin beharko zukeen dagoeneko)</translation>
<translation type="unfinished">Diesea</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation type="unfinished">Ez dago sustain kontroladore definitu bat dispositibo honetarako.
@@ -19559,7 +18654,7 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<translation type="unfinished">Konpasaren iraupen estimatua erakusten da</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation type="unfinished">%1 - Segmentu Pista #%2 - Partitura {1%2 ?} {3 ?}</translation>
</message>
@@ -19592,7 +18687,7 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<translation type="unfinished">Sartu transposatu beharreko tonuerdien kopurua:</translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation type="unfinished">Denbora: %1 (%2.%3s)</translation>
</message>
@@ -19641,16 +18736,11 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<source>Cycling slashes...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation type="unfinished">Ezin da nota txertatu: notaren iraupena ez dago hautatuta</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation type="unfinished"></translation>
</message>
@@ -19675,7 +18765,7 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<translation type="unfinished">Pistaren izena aldatu</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
@@ -20489,10 +19579,6 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<context>
<name>Rosegarden::ProgressDialog</name>
<message>
- <source>Processing...</source>
- <translation type="obsolete">Prozesatzen...</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/ProgressDialog.cpp" line="+65"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
@@ -20689,23 +19775,12 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1 kontroladorea</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
<source>Quantize</source>
<translation type="unfinished">Kuantifikazioa</translation>
</message>
- <message>
- <source>Advanced</source>
- <translation type="obsolete">Aurreratua</translation>
- </message>
</context>
<context>
<name>Rosegarden::QuantizeParameters</name>
@@ -20787,12 +19862,12 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation type="unfinished">Ezer Ez</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation type="unfinished">2-3ren-denboran</translation>
</message>
@@ -20837,10 +19912,6 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<translation type="unfinished">Kuantifikatu ondoren</translation>
</message>
<message>
- <source>Show advanced options</source>
- <translation type="obsolete">Opzio aurreratuak erakutsi</translation>
- </message>
- <message>
<location line="+6"/>
<source>Re-beam</source>
<translation type="unfinished">Plikak batu berriro</translation>
@@ -20861,18 +19932,10 @@ Mesdez, egiaztatu dispositiboa modu egokian konfiguratuta dagoela "MIDI Dis
<translation type="unfinished">Zatitu-eta-lotu gainjarrita dauden akordeak</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation type="unfinished">Kuantifikatzaile osoa</translation>
</message>
- <message>
- <source>Show Advanced Options</source>
- <translation type="obsolete">Opzio Aurreratuak Erakutsi</translation>
- </message>
- <message>
- <source>Hide Advanced Options</source>
- <translation type="obsolete">Opzio Aurreratuak Ezkutatu</translation>
- </message>
</context>
<context>
<name>Rosegarden::RawNoteRuler</name>
@@ -21186,12 +20249,6 @@ Bateragarritasun arazoak izan daitezke artxibo formatoarekin.</translation>
<context>
<name>Rosegarden::RosegardenDocument</name>
<message>
- <source>The current file has been modified.
-Do you want to save it?</source>
- <translation type="obsolete">Oraingo artxiboa aldatua izan da.
-Gorde nahi duzu?</translation>
- </message>
- <message>
<location filename="../../src/document/RosegardenDocument.cpp" line="+345"/>
<source>Rosegarden - Warning</source>
<translation type="unfinished"></translation>
@@ -21214,8 +20271,8 @@ Gorde nahi duzu?</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -21227,7 +20284,7 @@ Gorde nahi duzu?</translation>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation type="unfinished"></translation>
</message>
@@ -21305,7 +20362,12 @@ Mesedez, erabaki ea betiko ezabatu nahi dituzun disko gogorretik.
<translation type="unfinished">Nahasi</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation type="unfinished"></translation>
</message>
@@ -21320,7 +20382,7 @@ Mesedez, erabaki ea betiko ezabatu nahi dituzun disko gogorretik.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
@@ -21334,11 +20396,7 @@ Mesedez, jarri audio artxiboen bide baliozko bat Dokumentuaren Propietateetanaud
Konfiguratu nahi duzu orain?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Artxiboa gordetzen...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation type="unfinished"></translation>
</message>
@@ -21416,11 +20474,7 @@ Gomendatzen dugu Rosegarden bertsio honen artxibo hau birgrabatzea, etorkizunek
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <source>No non-audio segments in composition</source>
- <translation type="obsolete">Ez dago ez-audio segmenturik konposizioan</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation type="unfinished">Hautatutakoak bakarrik audio edo ez-audio segmentuak eduki ditzake</translation>
</message>
@@ -21431,7 +20485,7 @@ Gomendatzen dugu Rosegarden bertsio honen artxibo hau birgrabatzea, etorkizunek
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -21440,7 +20494,7 @@ Gomendatzen dugu Rosegarden bertsio honen artxibo hau birgrabatzea, etorkizunek
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -21449,28 +20503,18 @@ Gomendatzen dugu Rosegarden bertsio honen artxibo hau birgrabatzea, etorkizunek
<translation type="unfinished">Ez dago ez-audio segmenturik hautatuta</translation>
</message>
<message>
- <source>You've not yet defined an audio editor for Rosegarden to use.
-See Settings -> Configure Rosegarden -> Audio.</source>
- <translation type="obsolete">Oraindik ez duzu definitu audio editore bat Rosegardenekin erabiltzeko.
-Ikusi Hobespenak-> Rosegarden Konfiguratu -> Orokorra -> Kanpoko Editoreak.</translation>
- </message>
- <message>
<location line="+78"/>
<source>You've not yet defined an audio editor for Rosegarden to use.
See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Audio artxiboa inportatzen...</translation>
- </message>
- <message>
<location line="-439"/>
<source>Pitch Tracker can only contain 1 segment.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1203"/>
+ <location line="+1196"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -21539,14 +20583,14 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished">Hasieratzen...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation type="unfinished"> Handitu: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation type="unfinished">%1 (%2)</translation>
@@ -21575,12 +20619,12 @@ Ireki nahi duzu artxibo hori?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -21619,12 +20663,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -21644,33 +20688,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation type="unfinished">Artxibo Guztiak</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation type="unfinished">Artxiboa Ireki</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation type="unfinished"></translation>
</message>
@@ -21680,16 +20724,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation type="unfinished">Ezin da %1 artxiboa ireki</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation type="unfinished">Artxiboa gordetzen...</translation>
</message>
@@ -21729,14 +20773,6 @@ Error was : %2</source>
<translation type="unfinished">Artxiboa ixten...</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">Inprimatzen...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Aurrebista egiten...</translation>
- </message>
- <message>
<location line="+13"/>
<source>Exiting...</source>
<translation type="unfinished">Irteten...</translation>
@@ -21794,12 +20830,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21855,12 +20891,12 @@ Konfiguratu nahi duzu orain?</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation type="unfinished">Tenpo Globala Ezarri</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation type="unfinished">Tresna-Barra Jarri-Kendu...</translation>
</message>
@@ -21928,12 +20964,12 @@ Konfiguratu nahi duzu orain?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -21943,13 +20979,13 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21973,8 +21009,8 @@ Konfiguratu nahi duzu orain?</translation>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21984,7 +21020,7 @@ Konfiguratu nahi duzu orain?</translation>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -22002,8 +21038,8 @@ Konfiguratu nahi duzu orain?</translation>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -22012,12 +21048,12 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation type="unfinished"></translation>
</message>
@@ -22027,7 +21063,7 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation type="unfinished">MIDI Artxiboa Ireki</translation>
</message>
@@ -22037,12 +21073,12 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished">MIDI Artxiboa Nahasi</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation type="unfinished">MIDI Artxiboa Inportatzen...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation type="unfinished">Partitura kalkulatzen...</translation>
</message>
@@ -22074,64 +21110,24 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Hydrogen Artxiboa Ireki</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Hydrogen Artxiboa Inportatzen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Ezin da Hydrogen artxiboa kargatu. Hondatuta dirudi.</translation>
- </message>
- <message>
- <source>Export and import of Rosegarden Project files</source>
- <translation type="obsolete">Rosegarden Proiektu Artxiboa esportatzen...</translation>
- </message>
- <message>
- <source>The Rosegarden Project Packager helper script</source>
- <translation type="obsolete">Rosegarden Proiektuaren Enpaketatzailea ez dago eskuragarri </translation>
- </message>
- <message>
- <source>Notation previews through LilyPond</source>
- <translation type="obsolete">Aurrebista Lil&ypondekin...</translation>
- </message>
- <message>
- <source>%1 - for LilyPond preview support</source>
- <translation type="obsolete">Lilypond aurrebista opzioak</translation>
- </message>
- <message>
- <source>%1 - for audio file import</source>
- <translation type="obsolete">Audio artxiboen direktorioa ezarri</translation>
- </message>
- <message>
- <source><ul></source>
- <translation type="obsolete"><lehenetsia></translation>
- </message>
- <message>
- <source><li>%1</li></source>
- <translation type="obsolete"><li> %1 %2 -tik)</li></translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation type="unfinished">Rosegardenen sekuentziazio prozesua bukatu da ustekabean. Soinua eta. grabaketa ez dira eskuragarri egongo saio honetarako
Mesedez, irten eta berrasi Rosegarden soinurako gaitasuna berreskuratzeko.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation type="unfinished"></translation>
@@ -22178,7 +21174,7 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation type="unfinished">Rosegardenen sekuentziadorea ezin izan da hasieratu, beraz ez da egongosoinurik edo grabatzeko aukerarik saio honetan.
@@ -22192,7 +21188,7 @@ Audio eta MIDI konfigurazio zuzen bati buruzko laguntza eskuratzeko, joahttp://r
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -22200,7 +21196,7 @@ Audio eta MIDI konfigurazio zuzen bati buruzko laguntza eskuratzeko, joahttp://r
<translation type="unfinished">Honela esportatu...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation type="unfinished">Rosegarden artxiboa pakete batera grabatzeak huts egin du: %1</translation>
</message>
@@ -22216,7 +21212,7 @@ Audio eta MIDI konfigurazio zuzen bati buruzko laguntza eskuratzeko, joahttp://r
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -22283,14 +21279,14 @@ Audio eta MIDI konfigurazio zuzen bati buruzko laguntza eskuratzeko, joahttp://r
<translation type="unfinished">MusicXML artxiboa esportatzen...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation type="unfinished">XML artxiboak</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-936"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation type="unfinished"></translation>
@@ -22307,7 +21303,7 @@ Audio eta MIDI konfigurazio zuzen bati buruzko laguntza eskuratzeko, joahttp://r
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1008"/>
+ <location line="+1003"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -22395,7 +21391,7 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished">Etiketa berria sartu</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation type="unfinished">Erreprodukzio Zerrenda</translation>
</message>
@@ -22405,7 +21401,7 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished">http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation type="unfinished">MIDI izu-gertaerak itxaron-zerrendan sartzen, igortzeko...</translation>
</message>
@@ -22484,7 +21480,7 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation type="unfinished">Balore berri bat hautatu</translation>
</message>
@@ -22536,7 +21532,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation type="unfinished">Aldatu segmentuaren kolorea...</translation>
</message>
@@ -22579,7 +21575,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation type="unfinished">Klik egin segmentu batean ezabatzeko</translation>
</message>
@@ -22612,7 +21608,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">&Batu</translation>
</message>
@@ -22620,7 +21616,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation type="unfinished">Berr&etiketatu</translation>
</message>
@@ -22657,22 +21653,22 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation type="unfinished">Segmentua Mugitu</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation type="unfinished">Segmentuak Mugitu</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished">Shift sakatuta mantendu pultsoaren saretarekin lotzea ekiditeko</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation type="unfinished">Klik egin eta arrastatu segmentu bat mugitzeko</translation>
</message>
@@ -22867,12 +21863,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation type="unfinished">Shift sakatuta mantendu konpasaren marrekin doitzea ekiditzeko</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation type="unfinished">Grabatu edo arrastatu audioa hona</translation>
</message>
@@ -22948,7 +21944,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
@@ -22972,17 +21968,17 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished">Sortzen audioaren aurrebista...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Segmentuaren tamaina aldatu</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished">Shift sakatuta mantendu pultsoaren saretarekin lotzea ekiditeko</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation type="unfinished"></translation>
</message>
@@ -22992,7 +21988,7 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation type="unfinished">Klik egin eta arrastatu segmentu baten tamaina aldatzeko; Ctrl sakatuta mantendu bere edukiak birreskalatzeko</translation>
</message>
@@ -23005,25 +22001,24 @@ Konfiguratu nahi duzu orain?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation type="unfinished">Klik egin eta arrastatu segmentuak hautatzeko</translation>
</message>
<message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
<translation type="unfinished">
- <numerusform>
- </numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+154"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished">Shift sakatuta mantendu pultsoaren saretarekin lotzea ekiditeko</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation type="unfinished">Klik eta arrastatu segmentuak hautatzeko; erdiko klika eta arrasatatuhutsik dagoen segmentu bat marrazteko</translation>
</message>
@@ -23048,19 +22043,11 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">Klik eta arrastatu segmentuak mugitzeko; Ctrl sakatuta mantendu kopiatzeko</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation type="unfinished">Klik eta arrastatu segmentuak kopiatzeko</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">Klik eta arrastatu segmentuak mugitzeko; Ctrl sakatuta mantendu kopiatzeko;klik-bikoitza editatzeko</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation type="unfinished">Klik egin eta arrastatu segmentua kopiatzeko</translation>
@@ -23131,24 +22118,12 @@ Konfiguratu nahi duzu orain?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Zatitu Segmentua</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished">Klik egin segmentu batean bitan zatitzeko; Shift sakatuta mantendu saretarekin doitzea ekiditzeko.</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation type="unfinished">Klik egin segmentu batean bitan zatitzeko.</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23979,26 +22954,6 @@ Beste programa batzuk ixteak hobetu dezake Rosegardenen errendimendua.</translat
<translation type="unfinished">Rosegarden</translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">Do#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">ID</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">Fa#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">Sol#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location line="-276"/>
<source>%1: %2</source>
<translation type="unfinished">%1 (%2)</translation>
@@ -24010,13 +22965,6 @@ Beste programa batzuk ixteak hobetu dezake Rosegardenen errendimendua.</translat
</message>
</context>
<context>
- <name>Rosegarden::Studio</name>
- <message>
- <source>Audio</source>
- <translation type="obsolete">Audioa </translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SustainInsertionCommand</name>
<message>
<location filename="../../src/commands/notation/SustainInsertionCommand.h" line="+51"/>
@@ -24890,7 +23838,7 @@ Beste programa batzuk ixteak hobetu dezake Rosegardenen errendimendua.</translat
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation type="unfinished"><instrumenturik gabe></translation>
</message>
@@ -24905,15 +23853,7 @@ Beste programa batzuk ixteak hobetu dezake Rosegardenen errendimendua.</translat
<translation type="unfinished"><izenbururik gabe></translation>
</message>
<message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Audio artxiboen direktorioa ez da existitzen edo ez da idazgarria.
-Mesedez, jarri audio artxiboen bide baliozko bat Dokumentuaren Propietateetanaudio grabatu baino lehenago.
-Konfiguratu nahi duzu orain?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation type="unfinished">Pista Mututu</translation>
</message>
@@ -24926,39 +23866,31 @@ Konfiguratu nahi duzu orain?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Segmentuaren Errepikaneak Benetako Kopiak Bihurtu</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Segmentuen Errepikapenak Benetako Kopiak Bihurtu</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
@@ -24967,10 +23899,6 @@ Konfiguratu nahi duzu orain?</translation>
<source>Rosegarden cannot accept dropped files of this type.</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>You can't drop files into Rosegarden from this client. Try using Konqueror instead.</source>
- <translation type="obsolete">Ezin dira Rosegardenen artxiboak askatu bezero honetatik. Saiatu Konqueror erabiltzen.</translation>
- </message>
</context>
<context>
<name>Rosegarden::TrackLabel</name>
@@ -25008,7 +23936,7 @@ Konfiguratu nahi duzu orain?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation type="unfinished">Pista</translation>
</message>
@@ -25019,12 +23947,12 @@ Konfiguratu nahi duzu orain?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation type="unfinished"><izenbururik gabe></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation type="unfinished">Erreprodukzioaren parametroak</translation>
</message>
@@ -25165,117 +24093,181 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
+ <comment>Clef name</comment>
<translation type="unfinished">sol</translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
+ <comment>Clef name</comment>
<translation type="unfinished">fa</translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation type="unfinished">sol +15</translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
+ <comment>Clef name</comment>
<translation type="unfinished">sol +8</translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
+ <comment>Clef name</comment>
<translation type="unfinished">sol -15</translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
+ <comment>Clef name</comment>
<translation type="unfinished">fa -8</translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished">fa +15</translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished">fa +8</translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Sopranoa</translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Aldaketa</translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished">Aldaketa</translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
+ <comment>Clef name</comment>
<translation type="unfinished">fa</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>treble</source>
+ <translation type="obsolete">sol</translation>
+ </message>
+ <message>
+ <source>bass</source>
+ <translation type="obsolete">fa</translation>
+ </message>
+ <message>
+ <source>crotales</source>
+ <translation type="obsolete">sol +15</translation>
+ </message>
+ <message>
+ <source>xylophone</source>
+ <translation type="obsolete">sol +8</translation>
+ </message>
+ <message>
+ <source>guitar</source>
+ <translation type="obsolete">sol -15</translation>
+ </message>
+ <message>
+ <source>contrabass</source>
+ <translation type="obsolete">fa -8</translation>
+ </message>
+ <message>
+ <source>celesta</source>
+ <translation type="obsolete">fa +15</translation>
+ </message>
+ <message>
+ <source>old celesta</source>
+ <translation type="obsolete">fa +8</translation>
+ </message>
+ <message>
+ <source>mezzosoprano</source>
+ <translation type="obsolete">Sopranoa</translation>
+ </message>
+ <message>
+ <source>baritone</source>
+ <translation type="obsolete">Aldaketa</translation>
+ </message>
+ <message>
+ <source>varbaritone</source>
+ <translation type="obsolete">Aldaketa</translation>
+ </message>
+ <message>
+ <source>subbass</source>
+ <translation type="obsolete">fa</translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation type="unfinished">Transposatu</translation>
</message>
@@ -25316,7 +24308,7 @@ Konfiguratu nahi duzu orain?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation type="unfinished">Audioa </translation>
@@ -25948,24 +24940,6 @@ Konfiguratu nahi duzu orain?</translation>
</message>
</context>
<context>
- <name>RosegardenApplication</name>
- <message>
- <source>Rosegarden - A sequencer and musical notation editor</source>
- <translation type="obsolete">Rosegarden - Sekuentziadorea eta partitura editorea</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">%1 (grabatua)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/fi.ts b/data/locale/fi.ts
index 76fc7bd..5252ebd 100644
--- a/data/locale/fi.ts
+++ b/data/locale/fi.ts
@@ -2,13 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0" language="fi_FI">
<context>
- <name></name>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
<name>:</name>
<message>
<source></source>
@@ -55,10 +48,6 @@
<translation>Oletustoistolaite</translation>
</message>
<message>
- <source><qt><p>Create new playback devices here. Click the device name to change it. Select a device here and connect it to a MIDI output port by clicking on a port to the right.</p></qt></source>
- <translation type="obsolete"><qt><p>Luo uusi toistolaite tässä. Napsauta laitteen nimeä muuttaaksesi sitä. Valitse laite tästä ja kytke se MIDI-ulostuloon napsauttamalla oikealla olevaa porttia.</p></qt></translation>
- </message>
- <message>
<location line="+44"/>
<location filename="../../src/gui/studio/DeviceManagerDialogUi.h" line="+7"/>
<source><qt><p>Bank definitions allow you to tell Rosegarden about the programs or patches available for use on the equipment (hardware or software synth) connected to this device.</p><p>You must have something defined for any program or bank changes you wish to transmit, as Rosegarden hides all bank and program numbers that are undefined.</p></qt></source>
@@ -342,23 +331,23 @@
<translation>Ei voitu avata kirjasintiedostoa %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&Tiedosto</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>&Lisää äänitiedosto...</translation>
</message>
@@ -368,37 +357,37 @@
<translation>&Vie äänitiedosto...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>&Sulje</translation>
</message>
<message>
- <location line="-4676"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Muokkaa</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>&Vapauta äänitiedosto</translation>
</message>
@@ -423,159 +412,151 @@
<translation>Äänen esikuuntelu</translation>
</message>
<message>
- <source>Insert Into Selected Audio track</source>
- <translation type="obsolete">Syötä valittuun ääniraitaan</translation>
- </message>
- <message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>&Ohje</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">&Rosegardenin esiopastus</translation>
- </message>
- <message>
- <location line="-3206"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3121"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>&Ohjelmointivirheiden raportoimisohjeet</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>&Lisätietoja Rosegardenista</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Yleiset -työkalupalkki</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>&Ei peruttavaa</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2636"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>Ei &palautettavaa</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2530"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>&Kopioi</translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>&Liitä</translation>
</message>
<message>
- <location line="-4369"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2802"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Vaihda valintatyökaluun</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Vaihda nuottien syöttöön</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Vaihda poistotyökaluun</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>&Tallenna</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="-1382"/>
<source>&Insert Event</source>
<translation>&Syötä tapahtuma</translation>
</message>
@@ -595,33 +576,33 @@
<translation>&Edistynyt tapahtumamuokkain</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>&Leikkaa</translation>
</message>
<message>
- <location line="-4206"/>
+ <location line="-1366"/>
<source>&Select All</source>
<translation>&Valitse kaikki</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+281"/>
+ <location line="-1114"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>T&yhjennä valinta</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1363"/>
+ <location line="-1114"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>S&uodata valinta</translation>
</message>
<message>
- <location line="-1644"/>
+ <location line="-1435"/>
<source>Set Se&gment Start Time...</source>
<translation>Aseta &osan alkuaika...</translation>
</message>
@@ -631,100 +612,100 @@
<translation>Aseta osan &kestoaika...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Näkymä</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>&Musiikkiajat</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>&Kellonajat</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>Kä&sittelemättömät ajat</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>&Osa</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Muokkaa &työkalulla</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Avaa &matriisimuokkaimella</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Avaa &nuotintajassa</translation>
</message>
<message>
- <location line="-3570"/>
- <location line="+1723"/>
+ <location line="-1652"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1027"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2223"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>Tietoja &Qt:sta</translation>
</message>
<message>
- <location line="-2435"/>
+ <location line="-1556"/>
<source>&Guess Beats</source>
<translation type="unfinished"></translation>
</message>
@@ -734,7 +715,7 @@
<translation>Näytä &Tasot -työkalupalkki</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+28"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -809,7 +790,7 @@
<translation>Pisteellinen puo&linuotti</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>Vaihda &Nuotteihin</translation>
</message>
@@ -829,12 +810,12 @@
<translation>Kytke piste p&ois</translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>Näytä &Symbolit -työkalupalkki</translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>Kestot -työkalupalkki</translation>
</message>
@@ -844,7 +825,7 @@
<translation>Symbolit -työkalupalkki</translation>
</message>
<message>
- <location line="+623"/>
+ <location line="-2120"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -886,7 +867,7 @@
<translation></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>Näytä työ&kalupalkki</translation>
</message>
@@ -896,39 +877,39 @@
<translation>&Piilota tilarivi</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Toiminnot -työkalupalkki</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Aika -työkalupalkki</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Kuljetin -työkalupalkki</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Suurennos -työkalupalkki</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -978,7 +959,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Syötä merkintä</translation>
</message>
@@ -993,54 +974,42 @@
<translation>Muokkaa kirjanmerkkiä</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2747"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Vaihda Siirto -työkaluun</translation>
</message>
<message>
- <location line="-1279"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4706"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Vaihda Piirto -työkaluun</translation>
</message>
<message>
- <location line="-1252"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4697"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Vaihda Koonmuutos -työkaluun</translation>
</message>
<message>
- <source>E&dit</source>
- <translation type="obsolete">&Muokkaa</translation>
- </message>
- <message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">&Ei peruttavaa</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Ei &palautettavaa</translation>
- </message>
- <message>
- <location line="-1133"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4641"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>&Poista</translation>
</message>
<message>
- <location line="-4082"/>
+ <location line="-1755"/>
<source>&Grid</source>
<translation>&Ruudukko</translation>
</message>
@@ -1116,69 +1085,57 @@
</message>
<message>
<location line="+41"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&Sävellys</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Lisää te&mpon vaihto...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>Lisää ta&htilajin muutos...</translation>
</message>
<message>
- <source>&Segment</source>
- <translation type="obsolete">&Osa</translation>
- </message>
- <message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Avaa tapahtuma&listamuokkaimessa</translation>
</message>
<message>
- <source>Set Segment Start &Time...</source>
- <translation type="obsolete">Aseta osan &alkuaika...</translation>
- </message>
- <message>
- <source>Set Segment &Duration...</source>
- <translation type="obsolete">Aseta osan &kesto...</translation>
- </message>
- <message>
- <location line="-3737"/>
- <location line="+1570"/>
+ <location line="-2477"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>M&ukauta</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Yksiköi</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>&Yksiköi...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>&Toista edellinen yksiköinti</translation>
</message>
@@ -1189,36 +1146,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>Kasaa &nuotit, joilla on sama sävelkorkeus</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>Hyppää &vasemmalle</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>Hyppää &oikealle</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>&Lisää voimakkuutta</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>&Vähennä voimakkuutta</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation>&Aseta nykyinen voimakkuus</translation>
</message>
@@ -1234,377 +1191,301 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>&Puolita kestot</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>&Tuplaa kestot</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>Ven&ytä tai litistä...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>Trans&ponoi</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>Puolisävelaskel &ylös</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>Puolisävelaskel &alas</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>&Oktaavi ylös</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>Oktaa&vi alas</translation>
</message>
<message>
- <location line="-1683"/>
- <location line="+1158"/>
+ <location line="-2879"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Transponoi &intervallilla...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>&Muunna</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>&Ylösalaisin</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>&Edestakaisin</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>Edestakaisin &ja ylösalaisin</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>Sysää o&sa...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>Työ&kalut</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>&Valitse ja muokkaa</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>&Piirrä</translation>
</message>
<message>
- <location line="-3692"/>
+ <location line="-1831"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Siirrä</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>Uudelleen&mitoita</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>&Jaa</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>&Voimakkuus</translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation>Kohdistin loppuun ja val&itse</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>Kohdistin alkuun ja &valitse</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>Aseta &kertaus valinnalle</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>Ty&hjennä kertaus</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>&Kuljetin</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>&Toista </translation>
</message>
<message>
- <source>Distribute Audio on Midi Segment</source>
- <translation type="obsolete">Jaa äänidata Midi-osalle</translation>
- </message>
- <message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&Pysäytä</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>Kelaa t&aaksepäin</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Kelaa &eteenpäin</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Kelaa &alkuun</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Kelaa &loppuun</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>S&oolo</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>Vierit&ys seuraa toistoa</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>&Paniikki</translation>
</message>
<message>
- <source>I&nsert Note</source>
- <translation type="obsolete">&Syötä nuotti</translation>
- </message>
- <message>
- <source>&I</source>
- <translation type="obsolete">&I</translation>
- </message>
- <message>
- <source>I &sharp</source>
- <translation type="obsolete">I &ylennetty</translation>
- </message>
- <message>
- <source>II &flat</source>
- <translation type="obsolete">II &alennettu</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>II sh&arp</source>
- <translation type="obsolete">II y&lennetty</translation>
- </message>
- <message>
- <source>III flat</source>
- <translation type="obsolete">III alennettu</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>IV sha&rp</source>
- <translation type="obsolete">IV yl&ennetty</translation>
- </message>
- <message>
- <source>&V flat</source>
- <translation type="obsolete">&V alennettu</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>V s&harp</source>
- <translation type="obsolete">V yle&nnetty</translation>
- </message>
- <message>
- <source>VI fla&t</source>
- <translation type="obsolete">VI alennett&u</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VI shar&p</source>
- <translation type="obsolete">VI ylennett&y</translation>
- </message>
- <message>
- <source>VII flat</source>
- <translation type="obsolete">VII alennettu</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>&Ylempi oktaavi</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>&Sointujen syöttötila</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>&Askelnauhoitus</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>Työ&kalut</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>&Viivaimet</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>Näytä Sointu&nimi -viivain</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>Näytä &Tempo -viivain</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Työkalut -työkalupalkki</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>&Nauhoita</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>&Asetukset</translation>
</message>
@@ -1689,7 +1570,7 @@
<translation>Näytä &määrittelemättömät säätimet</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Vaihda syöttö -työkaluun</translation>
</message>
@@ -1699,252 +1580,252 @@
<translation>Luhista tauot poiston jälkeen</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>&Tulosta...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>Tulostuksen &esikatselu...</translation>
</message>
<message>
- <location line="-1771"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4666"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-2620"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4686"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-4368"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2595"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4365"/>
+ <location line="-2765"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4392"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-2671"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4420"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="-2823"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4270"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-2728"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4428"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-3873"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4206"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-2674"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4401"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-2725"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4120"/>
- <location line="+1363"/>
+ <location line="-2540"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1563"/>
- <location line="+36"/>
+ <location line="-2871"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3923"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4706"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4697"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4078"/>
+ <location line="-4463"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -1954,76 +1835,76 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+43"/>
- <location line="+4120"/>
+ <location line="-151"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3804"/>
- <location line="+1724"/>
+ <location line="+316"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>Lisää &taivutusjakso...</translation>
</message>
<message>
- <location line="-2000"/>
- <location line="+2350"/>
+ <location line="-3196"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2340"/>
- <location line="+2331"/>
+ <location line="-3536"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2321"/>
- <location line="+2312"/>
+ <location line="-3517"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2302"/>
- <location line="+2293"/>
+ <location line="-3498"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2283"/>
- <location line="+2274"/>
+ <location line="-3479"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2264"/>
- <location line="+2255"/>
+ <location line="-3460"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2246"/>
- <location line="+2237"/>
+ <location line="-3442"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2228"/>
- <location line="+2219"/>
+ <location line="-3424"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -2034,118 +1915,118 @@
</message>
<message>
<location line="+7"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>Lisää &ohjainviivain</translation>
</message>
<message>
- <location line="-1284"/>
- <location line="+1550"/>
+ <location line="-2479"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2723"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2158,685 +2039,685 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>Kohdistin taakse &tahti ja valitse</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>Kohdistin &eteen ja valitse</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>II ylennetty</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II alennettu</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II ylennetty</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III alennettu</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV ylennetty</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V alennettu</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V ylennetty</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI alennettu</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI ylennetty</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VI alennettu</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1713"/>
+ <location line="-2548"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -2861,23 +2742,23 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+43"/>
- <location line="+2001"/>
+ <location line="-228"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2595"/>
+ <location line="+36"/>
<source>C&ut and Close</source>
<translation>&Leikkaa ja sulje</translation>
</message>
@@ -2984,21 +2865,21 @@
<translation>Avaa &Sanoituksen muokkain</translation>
</message>
<message>
- <location line="-1252"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2447"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Avaa &rumpumatriisi -muokkaimessa</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>Lisää a&vaimen vaihto...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Lisää &sävellajin vaihto...</translation>
</message>
@@ -3013,14 +2894,6 @@
<translation>Lisää pe&daalin nosto</translation>
</message>
<message>
- <source>&Set Segment Start Time...</source>
- <translation type="obsolete">Aseta osan &alkuaika...</translation>
- </message>
- <message>
- <source>Transpose by &Inverval...</source>
- <translation type="obsolete">Transponoi &intervallilla...</translation>
- </message>
- <message>
<location line="+15"/>
<source>N&ote</source>
<translation>N&uotti</translation>
@@ -3383,8 +3256,8 @@
<translation>Pa&lauta varret</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>Sä&e</translation>
</message>
@@ -3432,14 +3305,14 @@
<translation>Tu&pletti...</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1968"/>
+ <location line="-768"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -3487,21 +3360,21 @@
<translation>Kaari &alla</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>Si&do</translation>
</message>
<message>
- <location line="-1543"/>
- <location line="+1550"/>
+ <location line="-2739"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1550"/>
+ <location line="-2744"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>&Pura sidonta</translation>
</message>
@@ -3603,14 +3476,14 @@
<translation>&Tasaa tauot</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1831"/>
+ <location line="-360"/>
<source>Search and Selec&t</source>
<translation type="unfinished"></translation>
</message>
@@ -3620,7 +3493,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+319"/>
+ <location line="+320"/>
<source>&Collapse Rests</source>
<translation>&Luhista tauot</translation>
</message>
@@ -3630,14 +3503,19 @@
<translation>&Nuotit</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-312"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+314"/>
<source>Tie Notes at &Barlines</source>
<translation>Sidotut nuotit &tahtiviivoilla</translation>
</message>
@@ -3909,13 +3787,13 @@
<translation>Hienoa&joitus</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>Hyppää &oikealle</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>Näk&yvyys</translation>
</message>
@@ -3962,26 +3840,26 @@
<translation>Seuraava viivasto &alas</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>&Edellinen osa</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>&Seuraava osa</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>Askel &taakse</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>Askel &eteen</translation>
</message>
@@ -4121,14 +3999,14 @@
<translation>&Kitarasointu</translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>&Syötä nuotti</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>&Alempi oktaavi</translation>
</message>
@@ -4148,13 +4026,13 @@
<translation>Koru&jen syöttötila</translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>Näytä T&yökalut -työkalupalkki</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>Näytä &Etumerkit -työkalupalkki</translation>
</message>
@@ -4174,18 +4052,18 @@
<translation>Näytä &Ryhmä -työkalupalkki</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>Näytä &Kuljetin -työkalupalkki</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>Näytä As&ettelu -työkalupalkki</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4198,13 +4076,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4215,7 +4093,7 @@
<translation>Näytä S&ointunimi -viivain</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+767"/>
<source>Show &Annotations</source>
<translation>Näytä &Huomautukset</translation>
</message>
@@ -4225,7 +4103,7 @@
<translation>Näytä &LilyPond-käskyt</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>Avaimet -työkalupalkki</translation>
</message>
@@ -4245,7 +4123,7 @@
<translation>Merkinnät -työkalupalkki</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation>Valitse k&aikki tapahtumat</translation>
</message>
@@ -4255,81 +4133,65 @@
<translation>Näytä &työkalut</translation>
</message>
<message>
- <source>&Events</source>
- <translation type="obsolete">&Tapahtumat</translation>
- </message>
- <message>
<location line="+198"/>
<source>Remove &Triggers</source>
<translation>Poista &liipaisimet</translation>
</message>
<message>
- <source>Pitch &Bend Sequence...</source>
- <translation type="obsolete">&Taivutusjakso...</translation>
- </message>
- <message>
<location line="-197"/>
<source>Show T&ransport Toolbar</source>
<translation>Näytä &Kuljetin -työkalupalkki</translation>
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>Rosegardenin &ohje</translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>Asetukset...</translation>
</message>
<message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>&Näytä voimakkuudetviivain</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Näytä T&aivutusviivain</translation>
</message>
<message>
- <source>Add &Control Ruler...</source>
- <translation type="obsolete">Lisää &ohjainviivain...</translation>
- </message>
- <message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation>Kohdistin taakse ja &valitse</translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Viivaimet -työkalupalkki</translation>
</message>
<message>
- <source>Ctrl+Shift+V</source>
- <translation type="obsolete">Ctrl+Shift+V</translation>
- </message>
- <message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>&Asetukset...</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation>Näytä &viivaimet -työkalupalkki</translation>
</message>
<message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>Askel taakse (vasen)</translation>
</message>
@@ -4339,13 +4201,13 @@
<translation>Toista</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>Askel eteen (oikea)</translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation type="unfinished"></translation>
</message>
@@ -4365,7 +4227,7 @@
<translation>Apua</translation>
</message>
<message>
- <location line="+1908"/>
+ <location line="+1080"/>
<source>Show &Duration Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -4380,14 +4242,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2452"/>
+ <location line="+10"/>
<source>Add &Layer</source>
<translation>Lisää &Taso</translation>
</message>
@@ -4470,21 +4332,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
@@ -4645,10 +4507,6 @@
<translation>Pisteellinen 32.osatauko</translation>
</message>
<message>
- <source>Shift+Left</source>
- <translation type="obsolete">Shift+Left</translation>
- </message>
- <message>
<location line="+7"/>
<source>Layout Toolbar</source>
<translation>Taitto -työkalupalkki</translation>
@@ -4659,7 +4517,7 @@
<translation>Tasot -työkalupalkki</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Vaihda syöttö-työkaluun</translation>
</message>
@@ -4709,7 +4567,7 @@
<translation>Tee näkyväksi</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Palkita nuotit soveltuvin osin</translation>
</message>
@@ -4749,7 +4607,7 @@
<translation>Kaksoisalennus</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>&Uusi</translation>
</message>
@@ -4759,14 +4617,6 @@
<translation>&Tuo</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Tuo Rosegarden-&projekti -tiedosto...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Tuo &MIDI-tiedosto...</translation>
- </message>
- <message>
<location line="+6"/>
<source>&Merge</source>
<translation>&Sulauta</translation>
@@ -4777,10 +4627,6 @@
<translation>Sulauta &tiedosto...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Sulauta &MIDI-tiedosto...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Sulauta &Hydrogen-tiedosto...</translation>
@@ -4791,26 +4637,6 @@
<translation>&Vie</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Vie Rosegarden-&projekti -tiedosto...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Vie &MIDI-tiedosto...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Vie &Csound-nuotti -tiedosto...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Vie M&up-tiedosto...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Vie Music&XML-tiedosto...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>&Avaa...</translation>
@@ -4821,10 +4647,6 @@
<translation>Avaa &edellinen</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Tallenna &nimellä...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>Tallenna &mallineena...</translation>
@@ -4886,10 +4708,6 @@
<translation>&Syötä alue...</translation>
</message>
<message>
- <source>Ctrl+Shift+Ins</source>
- <translation type="obsolete">Ctrl+Shift+Ins</translation>
- </message>
- <message>
<location line="+11"/>
<source>Select &All Segments</source>
<translation>Valitse &kaikki osat</translation>
@@ -4975,55 +4793,43 @@
<translation>Tallenna &nykyinen asiakirja oletusstudioksi</translation>
</message>
<message>
- <source>Se&gments</source>
- <translation type="obsolete">&Osat</translation>
- </message>
- <message>
<location line="+2"/>
<source>Toggle Repeat</source>
<translation>Kytke toisto tai poista se</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Avaa &oletusmuokkaimessa</translation>
- </message>
- <message>
- <source>Return</source>
- <translation type="obsolete">Return</translation>
- </message>
- <message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>Ni&meä uudelleen...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>&Toista edellinen yksiköinti</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>Ven&ytä tai litistä...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>Aseta &alkuaika...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>Aseta &kesto...</translation>
</message>
<message>
- <location line="-184"/>
+ <location line="-810"/>
<source>Paste Tempos and Time Signatures</source>
<translation type="unfinished">Liitä Tempo- ja tahtilajimerkinnät</translation>
</message>
@@ -5038,13 +4844,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Yhdistä</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>&Jaa</translation>
</message>
@@ -5154,26 +4960,26 @@
<translation>&Kartoita instrumentit...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>Uudelleen&mitoita</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation>L&yö nauhoitus sisään</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>Näytä &Päätyökalupalkki</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>Näytä &Raidat -työkalupalkki</translation>
</message>
@@ -5188,27 +4994,19 @@
<translation>Näytä &Suurennos -työkalupalkki</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>Näytä &Tilarivi</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>Näytä Toisto-osoittimen &viivain</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Tuo &X11 Rosegarden tiedosto...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Sulauta &X11 Rosegarden-tiedosto...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>MIDI &sekoitin</translation>
@@ -5219,10 +5017,6 @@
<translation>Näytä T&empo -viivain</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Vie &LilyPond-tiedosto...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>Näytä &Kuljetin</translation>
@@ -5264,26 +5058,26 @@
<translation>Muokkaimet -työkalupalkki</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Kelaa alkuun</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Kelaa loppuun</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>&Tue Rosegardenia</translation>
</message>
<message>
- <location line="-620"/>
+ <location line="-2483"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -5358,13 +5152,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
- <location line="+371"/>
+ <location line="-570"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-257"/>
+ <location line="+114"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -5380,7 +5174,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+225"/>
+ <location line="+76"/>
<source>Insert Tempo Change</source>
<translation>Lisää tempon muutos</translation>
</message>
@@ -5420,7 +5214,7 @@
<translation>Avaa tempo- ja tahtilajimerkintöjen muokkain</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>&Muokkaa oliota</translation>
</message>
@@ -5440,36 +5234,36 @@
<translation>&Asetukset</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>Li&itä uutena sysättävänä osana</translation>
</message>
<message>
- <location line="-4383"/>
+ <location line="+1943"/>
<source>Delete Marker</source>
<translation>Poista merkintä</translation>
</message>
<message>
- <location line="+469"/>
- <location line="+1693"/>
+ <location line="-4082"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>Transponoi &puolisävelaskelilla...</translation>
</message>
<message>
- <location line="-1499"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-2695"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>&Poista</translation>
</message>
<message>
- <location line="-2594"/>
+ <location line="-851"/>
<source>Show &Track Headers</source>
<translation>Näytä &raitojen otsikot</translation>
</message>
<message>
- <location line="+217"/>
+ <location line="+218"/>
<source>&Triplet</source>
<translation>&Tripletti</translation>
</message>
@@ -5484,36 +5278,36 @@
<translation>&Diskanttiavain</translation>
</message>
<message>
- <location line="-873"/>
+ <location line="-874"/>
<source>Show Ra&w Note Ruler</source>
<translation>Näytä &Käsittelemättömät nuotit -viivain</translation>
</message>
<message>
- <location line="+1754"/>
+ <location line="-2696"/>
<source>Respell as Flat</source>
<translation>Tulkitse alennusmerkkinä</translation>
</message>
<message>
- <location line="+37"/>
+ <location line="+1745"/>
<source>Import &Hydrogen file...</source>
<translation>Tuo &Hydrogen-tiedosto...</translation>
</message>
<message>
- <location line="-1830"/>
- <location line="+2059"/>
+ <location line="+229"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="-1489"/>
<source>Im&port Studio from File...</source>
<translation>Tuo &studio tiedostosta...</translation>
</message>
@@ -5524,21 +5318,21 @@
<translation></translation>
</message>
<message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-353"/>
+ <location line="+29"/>
<source>Ctrl+Shift+T</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -5565,19 +5359,19 @@
<translation>Muokkaa &kirjanmerkkejä...</translation>
</message>
<message>
- <location line="-1986"/>
- <location line="+2111"/>
+ <location line="+125"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>Muunna &nuotinnus...</translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-747"/>
<source>&Set Quick Marker at Playback Position</source>
<translation>&Aseta pikakirjanmerkki toisto-osoittimen kohdalle</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>&Hyppää pikakirjanmerkin kohdalle</translation>
</message>
@@ -7376,34 +7170,6 @@
<translation>Pistoolin laukaus</translation>
</message>
<message>
- <source>C</source>
- <translation type="obsolete">C</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">D</translation>
- </message>
- <message>
- <source>E</source>
- <translation type="obsolete">E</translation>
- </message>
- <message>
- <source>F</source>
- <translation type="obsolete">F</translation>
- </message>
- <message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A</translation>
- </message>
- <message>
- <source>B</source>
- <translation type="obsolete">B</translation>
- </message>
- <message>
<location filename="../AutoloadStrings.cpp" line="-24"/>
<source>General MIDI Device</source>
<translation>General MIDI -laite</translation>
@@ -8589,16 +8355,16 @@
<translation><ei mitään></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>Synth-lisäosa</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>Ääni</translation>
@@ -10694,10 +10460,6 @@
<translation>yleiskartta</translation>
</message>
<message>
- <source>Blue pastel</source>
- <translation type="obsolete">Pastellinsininen</translation>
- </message>
- <message>
<location line="+2"/>
<source>Red pastel</source>
<translation>Pastellinpunainen</translation>
@@ -10743,20 +10505,15 @@
<translation>Tuntematon</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10771,10 +10528,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 Ohjain %2 %3</translation>
</message>
@@ -10789,7 +10546,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Tervetuloa!</translation>
</message>
@@ -10897,7 +10654,7 @@
<translation><qt><p>Ainuttakaan raitaa ei ole kytketty nauhoitustilaan.</p><p>Ole hyvä ja aseta ainakin yksi tallennus LED <img src=":pixmaps/tooltip/record-leds.png"> ja yritä uudelleen</p></qt></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>Äänen nauhoitusta ei voitu käynnistää.</p><p>Ole hyvä ja aseta kelvollinen nauhoituspolku valikosta <b>Sävellys -> Muokkaa dokumentin ominaisuuksia... -> Ääni</b></p></qt></translation>
</message>
@@ -10909,40 +10666,52 @@
<translation type="unfinished">Epäkelpo äänitiedosto</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>Long-datatyypin väärä pituus MIDI-virrassa</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>Int-datatyypin väärä pituus MIDI-virrassa</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>MIDI-tiedoston loppu saavutettiin luettaessa</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation>Yritettiin lukea MIDI-tiedoston lopun yli</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>Epäkelpo tapahtumatyyppi löydetty</translation>
+ <translation type="obsolete">Epäkelpo tapahtumatyyppi löydetty</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation>Statusjuoksutusta käytetään raidan ensimmäisessä tapahtumassa</translation>
</message>
@@ -11053,7 +10822,7 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
@@ -11132,6 +10901,58 @@
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">LilyPond ei salli välilyöntejä tai kenoviivoja tiedostonnimissä.
+
+Haluatko käyttää nimenä
+
+%1
+
+sen sijaan?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Vienti epäonnistui. Tiedostoa ei voitu avata kirjoittamista varten.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">varoitus: ylipitkä tahti katkaistiin tässä</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">varoitus: liian lyhyt tahti, täytetään tauoilla</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11147,21 +10968,9 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2009 Rosegarden-kehitystiimi</p><p>Versio: %1 Qt versio:%2<br>Build-avain: %3</p><p>Rosegardenin sinulle tarjoavat ryhmä vapaaehtoisia ympäri maailman. Nähdäksesi listan osallistuneista, katso <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Jos tarvitset lisätietoja Rosegardenista, katso <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Lisenssi: GNU General Public License Version 2</p> {2000-2011 ?} {1 ?} {2<?} {3<?} {2<?}</translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2010 Rosegarden-kehitystiimi</p><p>Versio: %1 Qt versio:%2<br>Build-avain: %3</p><p>Rosegardenin tarjoavat sinulle ryhmä vapaaehtoisia ympäri maailman. Nähdäksesi listan osallistuneista, katso <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Jos tarvitset lisätietoja Rosegardenista, katso <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Lisenssi: GNU General Public License Version 2</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2009 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2009 Rosegarden-kehitystiimi</p><p>Versio: %1 Qt versio:%2<br>Build-avain: %3</p><p>Rosegardenin sinulle tarjoavat ryhmä vapaaehtoisia ympäri maailman. Nähdäksesi listan osallistuneista, katso <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Jos tarvitset lisätietoja Rosegardenista, katso <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Lisenssi: GNU General Public License Version 2</p></translation>
- </message>
</context>
<context>
<name>Rosegarden::ActionCommandArgumentQuerier</name>
@@ -11221,12 +11030,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>Ei voida lisätä identtisiä limittyviä merkintöjä</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>Lisää &kaari</translation>
</message>
@@ -11721,14 +11530,6 @@
<translation type="unfinished">Muunnetaan äänitiedostoa...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">Muutetaan äänitiedoston näytteenottotaajuutta...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">Muunnetaan ja mitoitetaan uudelleen äänitiedostoa...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation>Tuodaan äänitiedostoa...</translation>
@@ -11742,24 +11543,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Klikkaa nimetäksesi tämä instrumentti uudelleen</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>Klikkaa yllä olevaa nappia nimetäksesi tämä instrumentti uudelleen</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><ei syntetisaattoria></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><ei lisäosaa></translation>
</message>
@@ -11812,10 +11613,6 @@
<translation>Tiedosto</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><ei äänitiedostoja></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Tallenna tiedosto nimellä</translation>
@@ -11941,10 +11738,6 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<translation>Syötä uusi nimi</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">tuodaan ulkoista äänitiedostoa</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>tuodaan äänitiedostoa, joka täytyisi joko muuntaa tai muuttaa sen näytteenottotaajuutta</translation>
@@ -11979,7 +11772,7 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Äänisekoitin</translation>
</message>
@@ -11995,20 +11788,20 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Jako</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>Äänen taso</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Yksi- tai kaksikanavainen</translation>
</message>
@@ -12019,21 +11812,21 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><tyhjä></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>Klikkaa ladataksesi äänilisäosan</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>Klikkaa nimetäksesi tämä instrumentti uudelleen</translation>
</message>
@@ -12053,7 +11846,7 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<translation>Klikkaa yllä olevaa nappia nimetäksesi tämä instrumentti uudelleen</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Ala %1</translation>
</message>
@@ -12069,14 +11862,14 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<translation>Keskus</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><ei lisäosaa></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -12655,7 +12448,7 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<translation>Poistetaanko todella tämä pankki?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>Poistetaanko todella tämä näppäinyhdistelmä?</translation>
</message>
@@ -12757,85 +12550,199 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<translation>isku(t)</translation>
</message>
<message>
- <location line="+1"/>
- <source>bar(s)</source>
- <translation>tahti/tahdit</translation>
+ <location line="+1"/>
+ <source>bar(s)</source>
+ <translation>tahti/tahdit</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::BreakCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/BreakCommand.h" line="+45"/>
+ <source>&Unbeam</source>
+ <translation>&Poista palkki</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChangeCompositionLengthCommand</name>
+ <message>
+ <location filename="../../src/commands/segment/ChangeCompositionLengthCommand.h" line="+49"/>
+ <source>Change &Composition Start and End...</source>
+ <translation>Muuta sä&vellyksen alku- ja lopputahti...</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChangeSlurPositionCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/ChangeSlurPositionCommand.h" line="+47"/>
+ <source>Slur &Above</source>
+ <translation>Kaari &yllä</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Slur &Below</source>
+ <translation>Kaari &alla</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChangeStemsCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/ChangeStemsCommand.h" line="+47"/>
+ <source>Stems &Up</source>
+ <translation>Varret &ylös</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Stems &Down</source>
+ <translation>Varret &alas</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChangeStyleCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/ChangeStyleCommand.h" line="+49"/>
+ <source>Change &Note Style</source>
+ <translation>Vaihda &nuotin tyyliä</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChangeTiePositionCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/ChangeTiePositionCommand.h" line="+44"/>
+ <source>Tie &Above</source>
+ <translation>Sidonta &yllä</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Tie &Below</source>
+ <translation>Sidonta &alla</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChangeVelocityCommand</name>
+ <message>
+ <location filename="../../src/commands/edit/ChangeVelocityCommand.h" line="+45"/>
+ <source>&Increase Velocity</source>
+ <translation>&Lisää voimakkuutta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&Reduce Velocity</source>
+ <translation>&Vähennä voimakkuutta</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"> </translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::BreakCommand</name>
<message>
- <location filename="../../src/commands/notation/BreakCommand.h" line="+45"/>
- <source>&Unbeam</source>
- <translation>&Poista palkki</translation>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeCompositionLengthCommand</name>
<message>
- <location filename="../../src/commands/segment/ChangeCompositionLengthCommand.h" line="+49"/>
- <source>Change &Composition Start and End...</source>
- <translation>Muuta sä&vellyksen alku- ja lopputahti...</translation>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeSlurPositionCommand</name>
<message>
- <location filename="../../src/commands/notation/ChangeSlurPositionCommand.h" line="+47"/>
- <source>Slur &Above</source>
- <translation>Kaari &yllä</translation>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Slur &Below</source>
- <translation>Kaari &alla</translation>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeStemsCommand</name>
<message>
- <location filename="../../src/commands/notation/ChangeStemsCommand.h" line="+47"/>
- <source>Stems &Up</source>
- <translation>Varret &ylös</translation>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Stems &Down</source>
- <translation>Varret &alas</translation>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeStyleCommand</name>
<message>
- <location filename="../../src/commands/notation/ChangeStyleCommand.h" line="+49"/>
- <source>Change &Note Style</source>
- <translation>Vaihda &nuotin tyyliä</translation>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeTiePositionCommand</name>
<message>
- <location filename="../../src/commands/notation/ChangeTiePositionCommand.h" line="+44"/>
- <source>Tie &Above</source>
- <translation>Sidonta &yllä</translation>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Tie &Below</source>
- <translation>Sidonta &alla</translation>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ChangeVelocityCommand</name>
<message>
- <location filename="../../src/commands/edit/ChangeVelocityCommand.h" line="+45"/>
- <source>&Increase Velocity</source>
- <translation>&Lisää voimakkuutta</translation>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>&Reduce Velocity</source>
- <translation>&Vähennä voimakkuutta</translation>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -13162,7 +13069,7 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13387,7 +13294,7 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Voimakkuus</translation>
</message>
@@ -13403,7 +13310,7 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Tukematon tapahtumatyyppi</translation>
</message>
@@ -13418,12 +13325,13 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<translation>Ohjaintapahtumia</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>Syötä ohjainjono</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>Ohjaintapahtumien määrä</translation>
</message>
@@ -13431,7 +13339,7 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>&Kopioi</translation>
</message>
@@ -13441,7 +13349,7 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<translation>(ote)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(kopioitu)</translation>
</message>
@@ -13511,7 +13419,7 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>&Leikkaa</translation>
</message>
@@ -13551,10 +13459,6 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Uudelleenliittämiskomento</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>Poista alue</translation>
@@ -13579,12 +13483,12 @@ Ole hyvä ja valitse halutessasi niistä joitakin poistaaksesi ne pysyvästi kov
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation>[ Ei porttia ]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -14212,46 +14116,10 @@ Tämä voi aiheuttaa ongelmia, mikäli asetus ylikirjoitetaan myöhemmin toisess
<translation>Kaava</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Alennus - aseta arvoksi %1</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Vaihteleva - aseta %1 vaihtelevien tapahtumien maksimiksi ja minimiksi</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Voimistuen - aseta %1 nousemaan minimistä maksimiin</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Hiljentyen - aseta %1 laskemaan maksimasta minimiin</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Huojuva - aseta %1 vaihtelemaan maksimin ja minimin välillä molempien häviten nollaan</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>Arvo</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Ensimmäinen arvo</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Toinen arvo</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Matala arvo</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Korkea arvo</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14646,22 +14514,6 @@ Haluatko yrittää paikallistaa tiedostoa vai sivuuttaa sen?</translation>
<translation>Ladataan %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Yhteydenotto FTP-palvelimelle ei onnistunut</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Kirjautuminen epäonnistui</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Vaihto oikeaan hakemistoon epäonnistui</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">FTP-lataus keskeytettiin</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Lataus peruutettiin</translation>
@@ -14907,10 +14759,6 @@ Haluatko yrittää paikallistaa tiedostoa vai sivuuttaa sen?</translation>
<translation>Graafinen suorituskyky</translation>
</message>
<message>
- <source>Normal</source>
- <translation type="obsolete">Normaali</translation>
- </message>
- <message>
<location line="+6"/>
<source>Safe</source>
<translation>Turvallinen</translation>
@@ -14981,10 +14829,6 @@ Haluatko yrittää paikallistaa tiedostoa vai sivuuttaa sen?</translation>
<translation>Adobe Acrobat Reader (ei-vapaa ohjelma)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation>Käytetään tuotetun LilyPond-tuotoksen esikatseluun</translation>
@@ -15064,13 +14908,6 @@ Haluatko yrittää paikallistaa tiedostoa vai sivuuttaa sen?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Guitar::Fingering</name>
- <message>
- <source>couldn't parse fingering '%1' in '%2'</source>
- <translation type="obsolete">ei voitu jäsennellä sormitusta '%1' kohdassa '%2'</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::GuitarChordEditorDialog</name>
<message>
<location filename="../../src/gui/editors/guitar/GuitarChordEditorDialog.cpp" line="+40"/>
@@ -15294,24 +15131,6 @@ Haluatko yrittää paikallistaa tiedostoa vai sivuuttaa sen?</translation>
<context>
<name>Rosegarden::IdentifyTextCodecDialog</name>
<message>
- <source>Choose Text Encoding</source>
- <translation type="obsolete">Valitse tekstin koodiaus</translation>
- </message>
- <message>
- <source>
-This file contains text in an unknown language encoding.
-
-Please select one of the following estimated text encodings
-for use with the text in this file:
-</source>
- <translation type="obsolete">
-Tässä tiedostossa on tuntemattomassa kielikoodauksessa olevaa tekstiä.
-
-Ole hyvä ja valitse yksi seuraavista arvioiduista koodauksista
-tätä tekstiä varten käytettäväksi:
-</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/IdentifyTextCodecDialog.cpp" line="+69"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
@@ -15613,7 +15432,7 @@ Esimerkkiteksti tiedostosta:</translation>
<translation>Instrumentin ominaisuudet</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Raita</translation>
</message>
@@ -15621,7 +15440,7 @@ Esimerkkiteksti tiedostosta:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -16006,7 +15825,6 @@ Esimerkkiteksti tiedostosta:</translation>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -16014,7 +15832,7 @@ Would you like to use
%1
instead?</source>
- <translation>LilyPond ei salli välilyöntejä tai kenoviivoja tiedostonnimissä.
+ <translation type="obsolete">LilyPond ei salli välilyöntejä tai kenoviivoja tiedostonnimissä.
Haluatko käyttää nimenä
@@ -16023,39 +15841,16 @@ Haluatko käyttää nimenä
sen sijaan?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">Vienti epäonnistui. Tiedostoa ei voitu avata kirjoittamista varten.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Vienti epäonnistui. Tiedostoa ei voitu avata kirjoittamista varten.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>varoitus: ylipitkä tahti katkaistiin tässä</translation>
+ <translation type="obsolete">varoitus: ylipitkä tahti katkaistiin tässä</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>varoitus: liian lyhyt tahti, täytetään tauoilla</translation>
+ <translation type="obsolete">varoitus: liian lyhyt tahti, täytetään tauoilla</translation>
</message>
</context>
<context>
@@ -16081,10 +15876,6 @@ sen sijaan?</translation>
<translation>Perusasetukset</translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Valitut raidat</translation>
- </message>
- <message>
<location line="+31"/>
<source>Compatibility level</source>
<translation>Yhteensopivuustaso</translation>
@@ -16571,10 +16362,6 @@ sen sijaan?</translation>
<context>
<name>Rosegarden::LoopRuler</name>
<message>
- <source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Double-click to start playback.</p></qt></source>
- <translation type="obsolete"><qt><p>Klikkaa ja vedä siirtääksesi toisto-osoitinta.</p><p>Shift-klikkaa ja vedä valitaksesi alueen silmukalle tai muokkaukselle.</p><p>Shift-klikkaa tyhjentääksesi silmukan tai alueen.</p><p>Tuplaklikkaa aloittaaksesi toiston.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/rulers/LoopRuler.cpp" line="+80"/>
<source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Ctrl-click and drag to move the playback pointer with snap to beat.</p><p>Double-click to start playback.</p></qt></source>
<translation type="unfinished"></translation>
@@ -16771,11 +16558,7 @@ toiston alussa siirrettävän tiedon määrän takia.</translation>
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <source><qt><p>Set the MIDI channel number.</p><p>Before changing this, consider switching to a different instrument instead. Instruments #1 through #16 match MIDI channels 1 through 16 by default. You may change this relationship using this control if you wish, but this can lead to confusion</p></qt></source>
- <translation type="obsolete"><qt><p>Aseta MIDI-kanavan numero.</p><p>Ennen kuin muutat tätä, harkitse instrumentin vaihtamista tämän sijaan. Instrumentit #1 - #16 vastaavat oletuksena MIDI-kanavia 1 - 16. Voit halutessasi muuttaa tätä vastaavuussuhdetta käyttäen tätä ohjainta, mutta se voi johtaa sekaannukseen</p></qt></translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation><qt>Aseta ylläolevan instrumentin variaatioita, jos saatavilla</qt></translation>
</message>
@@ -16815,10 +16598,6 @@ toiston alussa siirrettävän tiedon määrän takia.</translation>
<translation>Ohjelma</translation>
</message>
<message>
- <source>Channel out</source>
- <translation type="obsolete">Kanava ulos</translation>
- </message>
- <message>
<location line="-46"/>
<source>Percussion</source>
<translation>Lyömäsoittimet</translation>
@@ -16864,12 +16643,7 @@ toiston alussa siirrettävän tiedon määrän takia.</translation>
<translation>Vastaanota ulkoinen</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Ei yhteyttä</translation>
</message>
@@ -17087,16 +16861,21 @@ toiston alussa siirrettävän tiedon määrän takia.</translation>
<translation>Nauhoitetaan</translation>
</message>
<message>
- <source>Synth plugin </source>
- <translation type="obsolete">Synth-lisäosa </translation>
- </message>
- <message>
<location line="+124"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17302,12 +17081,12 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Klikkaa Shift välttääksesi iskuruudukkoon lukkiutumisen</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Kopioi ja siirrä tapahtuma</translation>
</message>
@@ -17466,7 +17245,7 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<translation>Muuta voimakkuuksia</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>Klikkaa ja vedä muuttaaksesi valittujen nuottien voimakkuutta</translation>
</message>
@@ -17479,12 +17258,12 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation>Tuntematon nuotinsyöttötapahtuma %1</translation>
</message>
<message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation><ei nimeä></translation>
</message>
@@ -17547,7 +17326,7 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<translation>Pois</translation>
</message>
<message>
- <location line="+666"/>
+ <location line="+668"/>
<source>Estimated time signature shown</source>
<translation>Näytetään arvioitu tahtilaji</translation>
</message>
@@ -17562,16 +17341,12 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<translation>Puolisävelten määrällä: </translation>
</message>
<message>
- <location line="+775"/>
+ <location line="+774"/>
<source>Estimated key signature shown</source>
<translation>Näytetään arvioitu sävellajimerkintä</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Aseta tapahtumien voimakkuudet</translation>
- </message>
- <message>
- <location line="-1095"/>
+ <location line="-1094"/>
<source>Trigger Segment</source>
<translation>Sysäävä osa</translation>
</message>
@@ -17581,12 +17356,12 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<translation>Poista sysääjät</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>Matriisi</translation>
</message>
<message>
- <location line="+1250"/>
+ <location line="+1252"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation type="unfinished"></translation>
</message>
@@ -17602,21 +17377,15 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
- <message>
- <location line="-95"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Ei voitu syöttää nuottia: Ruudukon kestoa ei oltu valittu</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Suurennos</translation>
</message>
@@ -17636,7 +17405,7 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<translation>Nollaa suurennos</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Kierrä kiekkoa valitaksesi aktiivisen osan</qt></translation>
</message>
@@ -17743,13 +17512,6 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">Kosketinkuvaus</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="+53"/>
@@ -17766,7 +17528,7 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>MIDI-sekoitin</translation>
</message>
@@ -17781,7 +17543,7 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<translation>Instrumentti</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -18078,13 +17840,13 @@ Tupla-klikkaa avataksesi merkintöjen muokkaimen.</translation>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Nuotinnus</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Oletustaittotila</translation>
</message>
@@ -18659,7 +18421,7 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> Kirjasin: </translation>
</message>
@@ -18679,7 +18441,7 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
<translation> Välit: </translation>
</message>
<message numerus="yes">
- <location line="-118"/>
+ <location line="-120"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> %n tapahtuma valittuna</numerusform>
@@ -18692,11 +18454,7 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
<translation> Ei valintaa </translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Tripletti</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation>Sointu</translation>
</message>
@@ -18706,7 +18464,7 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
<translation>Grave</translation>
</message>
<message>
- <location line="-2238"/>
+ <location line="-2263"/>
<source>Unknown spacing action %1</source>
<translation>Tuntematon välistystoiminto %1</translation>
</message>
@@ -18731,42 +18489,37 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
<translation>LilyPond-esikatselun ominaisuudet</translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Vienti epäonnistui. Tiedostoa ei voitu avata kirjoittamista varten.</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Leikepöytä on tyhjä</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>Ei voitu liittää useita osia yhteen</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+381"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>Tulosta LilyPondilla...</translation>
</message>
@@ -18781,29 +18534,29 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
<translation><qt><p>Väliaikaistiedoston avaus LilyPond-vientiä varten epäonnistui.</p><p>Tämä todennäköisesti tarkoittaa että levytila on loppu <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation><qt><p>Rajoitettu liittämistyyppi vaatii liitäntäpaikan kohdalla riittävästi tyhjää tilaa (jossa on vain taukoja), jotta kaikki tapahtumat voitaisiin liittää.</p><p>Tyhjää tilaa ei löytynyt riittävästi.</p><p>Jos haluat littää tästä huolimatta, harkitse toisen liitäntätyypin käyttöä "Muokkaa"-valikon<b> "Liitä..."</b>-valinnasta. Voit myös halutessasi vaihtaa oletusliitäntätyypin myös joksikin muuksi kuin Rajoitettu.</p></qt></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>Lisätään leikepöydän tietoja...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>Ei voitu liittää tähän paikkaan.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation>Siirrä tapahtumat ylläpuoliseen viivastoon</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>Voimakkuuksien nosto...</translation>
</message>
@@ -18813,15 +18566,7 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
<translation>Voimakkuuksien lasku...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Aseta tapahtumien voimakkuudet</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Aseta voimakkuudet...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation>Muokkaa tekstiä</translation>
</message>
@@ -18836,7 +18581,7 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
<translation>Luhistetaan kasaan nuotit...</translation>
</message>
<message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation>Tuntematon nuotinsyöttötapahtuma %1</translation>
</message>
@@ -18856,10 +18601,6 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
<translation>Koru tahdissa %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Tee koru</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>Käytä korua</translation>
@@ -18895,7 +18636,7 @@ Tämä on ohjelmointivirhe (aiemmin ohjelma kaatui tässä kohdassa)</translatio
<translation>Pedaali</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>Tälle laitteelle ei oltu määritelty pedaalin ohjainta.
@@ -18907,7 +18648,7 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<translation>Näytetään arvioitu tahtilaji</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - Osan raita #%3 - Nuotinnus</translation>
</message>
@@ -18947,7 +18688,7 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<translation>Puolisävelten määrällä: </translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>Aika: %1 (%2.%3s)</translation>
</message>
@@ -19002,16 +18743,11 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<source>Cycling slashes...</source>
<translation>Kierrätetään vinoviivoja...</translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>Ei voitu lisätä nuottia: Kestoa ei oltu valittu</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Suurennos</translation>
</message>
@@ -19036,7 +18772,7 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<translation>Sulje raitojen otsikot</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Kierrä kiekkoa valitaksesi aktiivisen osan</qt></translation>
@@ -19258,10 +18994,6 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">Taivutusjakso</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>Esivalinta</translation>
@@ -19272,10 +19004,6 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<translation>Esivalinta:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">Käyttäjä</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -19503,14 +19231,6 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<translation>Esitaivutus</translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Arvo (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Kesto (%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation>Rampin kesto (%):</translation>
@@ -19531,27 +19251,11 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<translation>Loppuarvo (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">Vibraaton alkuamplitudi (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">Vibraaton loppuamplitudi (%):</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation>Taivutusjakso</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Vibraaton aallonpituus:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">Tarkkuus:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Loppuaika ei ole kelvollinen. Oletko valinnut tapahtumia?</translation>
@@ -19882,18 +19586,10 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<context>
<name>Rosegarden::ProgressDialog</name>
<message>
- <source>Processing...</source>
- <translation type="obsolete">Käsitellään...</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/ProgressDialog.cpp" line="+65"/>
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
- <message>
- <source><qt><h3>Processing...</h3></qt></source>
- <translation type="obsolete"><qt><h3>Käsitellään...</h3></qt></translation>
- </message>
</context>
<context>
<name>Rosegarden::ProjectPackager</name>
@@ -20018,10 +19714,6 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<translation><qt><p>Tiedostojen pakkaus epäonnistui arvolla %1. Rivin "exit %1" etsiminen tiedostosta %2 voi olla hyödyllistä vian etsintää ajatellen.</p>%3</qt></translation>
</message>
<message>
- <source><qt><p>Unable to read to temporary file list.</p>%1</qt></source>
- <translation type="obsolete"><qt><p>Ei voitu lukea väliaikaista tiedostolistaa.</p>%1</qt></translation>
- </message>
- <message>
<location line="+257"/>
<source><qt><p>Extracting and decoding files failed with exit status %1. Checking %2 for the line that ends with "exit %1" may be useful for diagnostic purposes.</p>%3</qt></source>
<translation><qt><p>Tiedostojen purku epäonnistui arvolla %1. Rivin "exit %1" etsiminen tiedostosta %2 voi olla hyödyllistä vian etsintää ajatellen.</p>%3</qt></translation>
@@ -20090,13 +19782,6 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1 ohjaaja</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -20184,12 +19869,12 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Ei mitään</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>2 ajassa 3</translation>
</message>
@@ -20254,7 +19939,7 @@ Ole hyvä ja varmista, että laite on määritetty oikein pääikkunan Hallitse
<translation>Jaa-ja-sido päällekkäiset soinnut</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Täysi yksiköinti</translation>
</message>
@@ -20555,10 +20240,6 @@ Tiedostomuodossa voi olla joitain yhteensopimattomuuksia.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <source>Open Directory</source>
- <translation type="obsolete">Avaa hakemisto</translation>
- </message>
- <message>
<location line="+1335"/>
<source>Loading plugins...</source>
<translation>Ladataan lisäosat...</translation>
@@ -20598,8 +20279,8 @@ Tiedostomuodossa voi olla joitain yhteensopimattomuuksia.</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20611,7 +20292,7 @@ Tiedostomuodossa voi olla joitain yhteensopimattomuuksia.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>Dokumenttia %1 ei voitu tallentaa</translation>
</message>
@@ -20689,7 +20370,12 @@ Ole hyvä ja valitse haluamasi tiedostot poistaaksesi ne pysyvästi kovalevyltä
<translation>Sulauta</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>Väliaikaisen tiedoston luonti epäonnistui hakemistoon '%1': %2</translation>
</message>
@@ -20704,7 +20390,7 @@ Ole hyvä ja valitse haluamasi tiedostot poistaaksesi ne pysyvästi kovalevyltä
<translation>Väliaikaisen tiedoston '%1' uudelleen nimeäminen halutuksi ulostulotiedostoksi '%2' epäonnistui</translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished">Varoitus</translation>
</message>
@@ -20713,14 +20399,12 @@ Ole hyvä ja valitse haluamasi tiedostot poistaaksesi ne pysyvästi kovalevyltä
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Saving file...</source>
- <translation type="obsolete">Tiedoston tallennus...</translation>
+ <translation type="unfinished">Äänitiedostopolkua ei ole tai kirjoitus siihen ei onnistu.
+Ole hyvä ja aseta äänitiedostopoluksi kelpo hakemisto Asiakirjan ominaisuuksista ennen nauhoittamista.
+Haluatko asettaa sen nyt?</translation>
</message>
<message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation>Virhe kirjoitettaessa paikkaan '%1'</translation>
</message>
@@ -20779,10 +20463,6 @@ Tuki näille osasille voi kadota tulevissa Rosegardenin versioissa.
Suosittelemme, että talletat tämän tiedoston tällä Rosegarden-versiolla varmistaaksesi, että se voidaan ladata vielä tulevissa versioissa.</translation>
</message>
<message>
- <source><qt><h2>Channels were remapped</h2><p>Beginning with version 10.02, Rosegarden no longer provides controls for changing the channel associated with each MIDI instrument. Instead, each instrument uses the same channel as its instrument number. For example, "MIDI Input System Device #12" always uses channel 12.</p><p>The file you just loaded contained instruments whose channels differed from the instrument numbers. These channels have been reassigned so that instrument #1 will always use channel 1, regardless of what channel it might have used previously. In most cases, you will experience no difference, but you may have to make some small changes to this file in order for it to play as intended. We recommend that you save this file in order to avoid seeing this warning in the future.</p><p>We apologize for any inconvenience.</p></qt></source>
- <translation type="obsolete"><qt><h2>Kanavat järjesteltiin uudestaan</h2><p>Versiosta 10.02 alkaen Rosegardenissa ei ole mahdollista määritellä kunkin MIDI-instrumentin kanavaa. Sitävastoin jokainen instrumentti käyttää instumenttinumeron mukaista kanavaa. Esimerkiksi "MIDI-järjestelmälaite #12" käyttää aina kanavaa 12.</p><p>Juuri lataamasi tiedosto sisälsi instrumentteja joiden kanava poikkesi instrumenttinumerosta. Nämä kanavat on määritelty uudelleen siten että instrumentti #1 käyttää aina kanavaa 1 riippumatta siitä mitä kanavaa se käytti aikaisemmin. Useimmissa tapauksissa et havaitse eroa, mutta saatat joutua tekemään pieniä muutoksia tähän tiedostoon jotta se soi aiotulla tavalla. Suosittelemme että tallennat tämän tiedoston välttääksesi näkemästä tätä varoitusta tulevaisuudessa.</p><p>Olemme pahoillamme mahdollisesta vaivasta.</p></qt></translation>
- </message>
- <message>
<location line="+650"/>
<source>Insert Recorded MIDI</source>
<translation>Lisää nauhoitettu MIDI</translation>
@@ -20802,7 +20482,7 @@ Suosittelemme, että talletat tämän tiedoston tällä Rosegarden-versiolla var
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>Valinta saa sisältää vain yhden ääniosan tai muun kuin ääniosan</translation>
</message>
@@ -20813,7 +20493,7 @@ Suosittelemme, että talletat tämän tiedoston tällä Rosegarden-versiolla var
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20822,7 +20502,7 @@ Suosittelemme, että talletat tämän tiedoston tällä Rosegarden-versiolla var
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20843,7 +20523,7 @@ See Edit -> Preferences -> Audio.</source>
Katso Muokkaa -> Asetukset -> Ääni.</translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -20853,10 +20533,6 @@ Katso Muokkaa -> Asetukset -> Ääni.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">tuodaan ulkoista äänitiedostoa</translation>
- </message>
- <message>
<location line="+28"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>tuodaan äänitiedostoa, joka täytyisi muuntaa tai sen näytteenottotaajuutta muuttaa</translation>
@@ -20916,14 +20592,14 @@ Katso Muokkaa -> Asetukset -> Ääni.</translation>
<translation>Aloitetaan...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> Suurennos: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -20952,12 +20628,12 @@ Haluatko avata sen tämän asemesta?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Ei nimeä</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20997,12 +20673,12 @@ Virhe oli: %2</translation>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Kaikki tuetut tiedostot</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -21022,33 +20698,33 @@ Virhe oli: %2</translation>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Kaikki tiedostot</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Avaa tiedosto</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation></translation>
</message>
@@ -21058,24 +20734,20 @@ Virhe oli: %2</translation>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>Ei voitu avata tiedostoa %1</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>Tiedoston tallennus...</translation>
</message>
<message>
- <source>Save File</source>
- <translation type="obsolete">Tallenna tiedosto</translation>
- </message>
- <message>
<location line="+111"/>
<source><qt>Sorry.<br>"%1" is not a valid filename.</qt></source>
<translation><qt>Valitan.<br>"%1" ei ole kelpo tiedostonnimi.</qt></translation>
@@ -21091,10 +20763,6 @@ Virhe oli: %2</translation>
<translation>Määritetty tiedosto on jo olemassa. Kirjoitetaanko päälle?</translation>
</message>
<message>
- <source>Saving file%1with a new filename...</source>
- <translation type="obsolete">Tallennetaan tiedosto %1 uudella nimellä...</translation>
- </message>
- <message>
<location line="+27"/>
<source>Rosegarden templates</source>
<translation>Rosegarden-luonnokset</translation>
@@ -21115,14 +20783,6 @@ Virhe oli: %2</translation>
<translation>Suljetaan tiedosto...</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">Tulostetaan...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Esikatsellaan...</translation>
- </message>
- <message>
<location line="+13"/>
<source>Exiting...</source>
<translation>Lopetetaan...</translation>
@@ -21180,12 +20840,12 @@ Virhe oli: %2</translation>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Varoitus</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21241,12 +20901,12 @@ Haluatko asettaa sen nyt?</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Aseta yleistempo</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>Kytke työkalupalkki...</translation>
</message>
@@ -21314,12 +20974,12 @@ Haluatko asettaa sen nyt?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Rosegarden-projekti -tiedostot</translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation><qt><p>Tälle sävellykselle täytyy valita tiedostonimi ennen kuin ääntä voi tallentaa.</p><p>Äänitiedostot tallennetaan hakemistoon <b>%1</b> nimellä <b>rg-[<i>tiedostonimi</i>]-[<i>instrumentti</i>]-<i>päivämäärä</i>_<i>aika</i>-<i>n</i>.wav</b>. Saatat myös haluta nimetä instrumentit uudelleen ääntä varten ennen äänitystä. Katso <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a> saadaksesi lisätietoja.</p></qt></translation>
</message>
@@ -21329,13 +20989,13 @@ Haluatko asettaa sen nyt?</translation>
<translation>Sisääntulo</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-fi</translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21359,8 +21019,8 @@ Haluatko asettaa sen nyt?</translation>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21370,7 +21030,7 @@ Haluatko asettaa sen nyt?</translation>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21388,8 +21048,8 @@ Haluatko asettaa sen nyt?</translation>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21398,12 +21058,12 @@ Haluatko asettaa sen nyt?</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation><h3>Uudempi versio saatavilla</h3></translation>
</message>
@@ -21413,7 +21073,7 @@ Haluatko asettaa sen nyt?</translation>
<translation><p>Käytät versiota %1. Versio %2 on tällä hetkellä saatavilla.</p><p>Lisätietoja:<a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Rosegarden website</a></p></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>Avaa MIDI-tiedosto</translation>
</message>
@@ -21423,12 +21083,12 @@ Haluatko asettaa sen nyt?</translation>
<translation>Sulauta MIDI-tiedosto</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>Tuo MIDI-tiedosto...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>Lasketaan nuotinnusta...</translation>
</message>
@@ -21460,36 +21120,24 @@ Haluatko asettaa sen nyt?</translation>
<translation>Ei voitu ladata X11 Rosegarden -tiedostoa. Se vaikuttaa olevan viallinen.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Avaa Hydrogen-tiedosto</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Tuo Hydrogen-tiedosto...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Ei voitu ladata Hydrogen-tiedostoa. Se vaikuttaa olevan viallinen.</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>Rosegardenin sekvensseriprosessi keskeytyi odottamatta. Ääni ja nauhoitus eivät ole enää tässä istunnossa käytössä.
Ole hyvä, sulje ja käynnistä uudelleen Rosegarden palauttaaksesi äänitoiminnot.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>Käynnistetään sekvensseri...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>Tallennetaan tiedosto%1uudella nimellä...</translation>
@@ -21536,7 +21184,7 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation>Rosegardenin sekvensseriprosessi keskeytyi odottamatta. Ääni ja nauhoitus eivät ole enää tässä istunnossa käytössä.
@@ -21550,7 +21198,7 @@ Oikeiden ääni- ja MIDI-asetusten varalle löydät apua sivulta http://rosegard
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21558,7 +21206,7 @@ Oikeiden ääni- ja MIDI-asetusten varalle löydät apua sivulta http://rosegard
<translation>Vie...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Rosegarden-tiedoston tallennus ei onnistunut pakettiin: %1</translation>
</message>
@@ -21574,7 +21222,7 @@ Oikeiden ääni- ja MIDI-asetusten varalle löydät apua sivulta http://rosegard
<translation>Oletusmuotoiset MIDI-tiedostot</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21641,14 +21289,14 @@ Oikeiden ääni- ja MIDI-asetusten varalle löydät apua sivulta http://rosegard
<translation>Viedään MusicXML-tiedosto...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>XML-tiedostot</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-936"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation type="unfinished"></translation>
@@ -21665,7 +21313,7 @@ Oikeiden ääni- ja MIDI-asetusten varalle löydät apua sivulta http://rosegard
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1008"/>
+ <location line="+1003"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -21753,7 +21401,7 @@ Haluatko asettaa sen nyt?</translation>
<translation>Syötä uusi nimi</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Soittolista</translation>
</message>
@@ -21763,7 +21411,7 @@ Haluatko asettaa sen nyt?</translation>
<translation></translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>Ketjutetaan MIDI:n paniikkitapahtumat lähettämistä varten...</translation>
</message>
@@ -21843,7 +21491,7 @@ Virhe oli: %2</translation>
<translation><qt><p>Klikkaa ja vedä ylös ja alas, tai, vasemmalle ja oikealle muokataksesi.</p><p>Tuplaklikkaa muokataksesi arvoa suoraan.</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Valitse uusi arvo</translation>
</message>
@@ -21895,7 +21543,7 @@ Virhe oli: %2</translation>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Muuta osan väriä...</translation>
</message>
@@ -21938,7 +21586,7 @@ Virhe oli: %2</translation>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Klikkaa osan päällä poistaaksesi sen</translation>
</message>
@@ -21971,7 +21619,7 @@ Virhe oli: %2</translation>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">&Yhdistä</translation>
</message>
@@ -21979,7 +21627,7 @@ Virhe oli: %2</translation>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>Ni&meä uudelleen...</translation>
</message>
@@ -22016,22 +21664,22 @@ Virhe oli: %2</translation>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>Siirrä osaa</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>Siirrä osia</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Klikkaa Shift välttääksesi iskuruudukkoon lukkiutumisen</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>Klikkaa ja vedä siirtääksesi osan</translation>
</message>
@@ -22226,12 +21874,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>Pidä Shift pohjassa välttääksesi tahtiviivoihin lukkiutumisen</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>Nauhoita tai pudoa ääntä tähän</translation>
</message>
@@ -22307,7 +21955,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Varoitus</translation>
</message>
@@ -22331,17 +21979,17 @@ Haluatko asettaa sen nyt?</translation>
<translation>Luodaan äänen esikatselua...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Muuta osan kokoa</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Klikkaa Shift välttääksesi iskuruudukkoon lukkiutumisen</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>Pidä Shift pohjassa välttääksesi iskuruudukkoon lukkiutumisen; pidä myös Ctrl pohjassa mitoittaaksesi sisällön uudelleen</translation>
</message>
@@ -22351,7 +21999,7 @@ Haluatko asettaa sen nyt?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>Klikkaa ja vedä muuttaaksesi osan kokoa, pidä myös Ctrl pohjassa mitoittaaksesi uudelleen myös sisällön</translation>
</message>
@@ -22364,17 +22012,25 @@ Haluatko asettaa sen nyt?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Klikkaa ja vedä valitaksesi osia</translation>
</message>
+ <message numerus="yes">
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <location line="+323"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Klikkaa Shift välttääksesi iskuruudukkoon lukkiutumisen</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>Klikkaa ja vedä valitaksesi osia; klikkaa keskimmäisellä näppäimellä ja vedä piirtääksesi tyhjän osan</translation>
</message>
@@ -22399,31 +22055,15 @@ Haluatko asettaa sen nyt?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">Klikkaa ja vedä siirtääksesi osat; pidä myös Ctrl pohjassa kopioidaksesi ne</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation>Klikkaa ja vedä kopioidaksesi osat</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">Klikkaa ja vedä siirtääksesi osan; pidä myös Ctrl pohjassa kopioidaksesi sen; tuplaklikkaa muokataksesi</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation>Klikkaa ja vedä kopioidaksesi osan</translation>
</message>
- <message numerus="yes">
- <location line="-294"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Siirrä osa</numerusform>
- <numerusform>Siirrä osat</numerusform>
- </translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSingleRepeatToCopyCommand</name>
@@ -22490,24 +22130,12 @@ Haluatko asettaa sen nyt?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Jaa osa kahtia</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Klikkaa osan päällä halkaistaksesi sen kahtia, pidä Shift pohjassa välttääksesi iskuruudukkoon lukkiutumisen</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>Klikkaa osaa halkaistaksesi sen kahtia</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23349,17 +22977,6 @@ Toisten ohjelmien lopettaminen saattaa parantaa Rosegardenin suorituskykyä.</tr
</message>
</context>
<context>
- <name>Rosegarden::Studio</name>
- <message>
- <source>Audio</source>
- <translation type="obsolete">Ääni</translation>
- </message>
- <message>
- <source>Synth plugin</source>
- <translation type="obsolete">Synth-lisäosa</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SustainInsertionCommand</name>
<message>
<location filename="../../src/commands/notation/SustainInsertionCommand.h" line="+51"/>
@@ -24235,7 +23852,7 @@ Toisten ohjelmien lopettaminen saattaa parantaa Rosegardenin suorituskykyä.</tr
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><ei instrumenttia></translation>
</message>
@@ -24250,19 +23867,7 @@ Toisten ohjelmien lopettaminen saattaa parantaa Rosegardenin suorituskykyä.</tr
<translation><ei nimeä></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Varoitus</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Äänitiedostopolkua ei ole tai kirjoitus siihen ei onnistu.
-Ole hyvä ja aseta tiedostopoluksi kelvollinen hakemisto Asiakirjan ominaisuuksista ennen nauhoittamista.
-Haluatko asettaa sen nyt?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Vaienna raita</translation>
</message>
@@ -24275,25 +23880,17 @@ Haluatko asettaa sen nyt?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Muuta kertautuva osa todellisiksi kopioiksi</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Muuta kertautuvat osat todellisiksi kopioiksi</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -24301,7 +23898,7 @@ Haluatko asettaa sen nyt?</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -24309,7 +23906,7 @@ Haluatko asettaa sen nyt?</translation>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24318,18 +23915,10 @@ Haluatko asettaa sen nyt?</translation>
<source>Rosegarden cannot accept dropped files of this type.</source>
<translation>Rosegarden ei kelpuuta tämän tyyppisiä pudotettuja tiedostoja.</translation>
</message>
- <message>
- <source>You can't drop files into Rosegarden from this client. Try using Konqueror instead.</source>
- <translation type="obsolete">Et voi pudottaa tiedostoja Rosegardenille tältä asiakasohjelmalta. Yritä Konqueror:in käyttöä sen sijaan.</translation>
- </message>
</context>
<context>
<name>Rosegarden::TrackLabel</name>
<message>
- <source><qt>Click and hold with either mouse button to assign this track to an instrument.</qt></source>
- <translation type="obsolete"><qt>Klikkaa ja pidä kumpaa hyvänsä hiiren nappia liittääksesi tämän raidan instrumenttiin.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/editors/segment/TrackLabel.cpp" line="+61"/>
<source><qt><p>Click to select all the segments on this track.</p><p>Shift+click to add to or to remove from the selection all the segments on this track.</p><p>Click and hold with either mouse button to assign this track to an instrument.</p></qt></source>
<translation type="unfinished"></translation>
@@ -24363,7 +23952,7 @@ Haluatko asettaa sen nyt?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Raita</translation>
</message>
@@ -24374,12 +23963,12 @@ Haluatko asettaa sen nyt?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><ei nimeä></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Toiston ominaisuudet</translation>
</message>
@@ -24520,7 +24109,103 @@ Haluatko asettaa sen nyt?</translation>
<translation><qt><p>Tämä avain lisätään luotavien osien alkuun.</p></qt></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+2"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">diskantti</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">basso</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">crotales</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">ksylofoni</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">kitara</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">kontrabasso</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">celesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">vanha celesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">ranskalainen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">sopraano</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">mezzosopraano</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">altto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">tenori</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">baritoni</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">varbaritoni</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">alibasso</translation>
+ </message>
+ <message>
+ <location line="+39"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation><qt><p>Valitse alin suositeltava toistettava nuotti käyttäen viivastoa</p></qt></translation>
</message>
@@ -24535,10 +24220,6 @@ Haluatko asettaa sen nyt?</translation>
<translation><qt><p>Valitse raidan toistoon käyttämä laite.</p><p>Klikkaa <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> kytkeäksesi tämä laite käyttökelpoiseen ulostuloon jos et kuule ääntä</p></qt></translation>
</message>
<message>
- <source><qt><p>This track will only record Audio/ MIDI from the selected device, filtering anything else out</p></qt></source>
- <translation type="obsolete"><qt><p>Tämä raita nauhoittaa ääntä/ MIDI-dataa vain valitusta laitteesta, kaikki muu suodatetaan pois</p></qt></translation>
- </message>
- <message>
<location line="+55"/>
<source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
<translation><qt><p>Tämä raita nauhoittaa ääntä/MIDI-dataa vain valitulta kanavalta, kaikki muu suodatetaan pois</p></qt></translation>
@@ -24554,87 +24235,71 @@ Haluatko asettaa sen nyt?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>treble</source>
- <translation>diskantti</translation>
+ <translation type="obsolete">diskantti</translation>
</message>
<message>
- <location line="+1"/>
<source>bass</source>
- <translation>basso</translation>
+ <translation type="obsolete">basso</translation>
</message>
<message>
- <location line="+1"/>
<source>crotales</source>
- <translation>crotales</translation>
+ <translation type="obsolete">crotales</translation>
</message>
<message>
- <location line="+1"/>
<source>xylophone</source>
- <translation>ksylofoni</translation>
+ <translation type="obsolete">ksylofoni</translation>
</message>
<message>
- <location line="+1"/>
<source>guitar</source>
- <translation>kitara</translation>
+ <translation type="obsolete">kitara</translation>
</message>
<message>
- <location line="+1"/>
<source>contrabass</source>
- <translation>kontrabasso</translation>
+ <translation type="obsolete">kontrabasso</translation>
</message>
<message>
- <location line="+1"/>
<source>celesta</source>
- <translation>celesta</translation>
+ <translation type="obsolete">celesta</translation>
</message>
<message>
- <location line="+1"/>
<source>old celesta</source>
- <translation>vanha celesta</translation>
+ <translation type="obsolete">vanha celesta</translation>
</message>
<message>
- <location line="+1"/>
<source>french</source>
- <translation>ranskalainen</translation>
+ <translation type="obsolete">ranskalainen</translation>
</message>
<message>
- <location line="+1"/>
<source>soprano</source>
- <translation>sopraano</translation>
+ <translation type="obsolete">sopraano</translation>
</message>
<message>
- <location line="+1"/>
<source>mezzosoprano</source>
- <translation>mezzosopraano</translation>
+ <translation type="obsolete">mezzosopraano</translation>
</message>
<message>
- <location line="+1"/>
<source>alto</source>
- <translation>altto</translation>
+ <translation type="obsolete">altto</translation>
</message>
<message>
- <location line="+1"/>
<source>tenor</source>
- <translation>tenori</translation>
+ <translation type="obsolete">tenori</translation>
</message>
<message>
- <location line="+1"/>
<source>baritone</source>
- <translation>baritoni</translation>
+ <translation type="obsolete">baritoni</translation>
</message>
<message>
- <location line="+1"/>
<source>varbaritone</source>
- <translation>varbaritoni</translation>
+ <translation type="obsolete">varbaritoni</translation>
</message>
<message>
- <location line="+1"/>
<source>subbass</source>
- <translation>alibasso</translation>
+ <translation type="obsolete">alibasso</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+36"/>
<source>Transpose</source>
<translation>Transponointi</translation>
</message>
@@ -24675,7 +24340,7 @@ Haluatko asettaa sen nyt?</translation>
<translation><qt><p>Uudet osat luodaan käyttäen tätä väriä</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Ääni</translation>
@@ -25071,13 +24736,6 @@ Haluatko asettaa sen nyt?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Ui</name>
- <message>
- <source>[ No port ]</source>
- <translation type="obsolete">[ Ei porttia ]</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::UnGraceCommand</name>
<message>
<location filename="../../src/commands/notation/UnGraceCommand.h" line="+43"/>
@@ -25314,13 +24972,6 @@ Haluatko asettaa sen nyt?</translation>
</message>
</context>
<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">(nauhoitettu)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/fr.ts b/data/locale/fr.ts
index 1a15f6b..4a28eb7 100644
--- a/data/locale/fr.ts
+++ b/data/locale/fr.ts
@@ -293,10 +293,6 @@
<translation>Oscillations amorties - Varier %1 alternativement du max au min, avec max et min tendant tous deux vers 0</translation>
</message>
<message>
- <source>Half-wave crescendo - set %1 rising from min to max n a half sine wave contour</source>
- <translation type="obsolete">Crescendo demi onde - Croissance de %1 avec une variation analogue à la moitié d'une période de sinusoïde</translation>
- </message>
- <message>
<location filename="../../src/base/parameterpattern/HalfSinePattern.cpp" line="+28"/>
<source>Half-wave crescendo - set %1 rising from min to max in a half sine wave contour</source>
<translation>Crescendo demi onde - Croissance de %1 avec une variation analogue à la moitié d'une période de sinusoïde</translation>
@@ -335,23 +331,23 @@
<translation>Impossible d'ouvrir le fichier de correspondances %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&Fichier</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>&Ajouter un fichier audio...</translation>
</message>
@@ -361,37 +357,37 @@
<translation>&Exporter un fichier audio...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>&Fermer</translation>
</message>
<message>
- <location line="-4676"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Editer</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>&Décharger le fichier Audio</translation>
</message>
@@ -416,155 +412,151 @@
<translation>Jouer la pré-version</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>&Aide</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">&Tutoriel Rosegarden</translation>
- </message>
- <message>
- <location line="-3206"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3121"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>Comment signaler un &bogue</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>A propos de &Rosegarden</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Barre d'outils méta</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>Rie&n à défaire</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2636"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>Rien à re&faire</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2530"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>&Copier</translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>Co&ller</translation>
</message>
<message>
- <location line="-4369"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2802"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Sélecteur</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Insérer notes</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Gomme</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>&Sauver</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="-1382"/>
<source>&Insert Event</source>
<translation>&Insérer événement</translation>
</message>
@@ -584,33 +576,33 @@
<translation>Éditeur &avancé d'événement</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>Cou&per</translation>
</message>
<message>
- <location line="-4206"/>
+ <location line="-1366"/>
<source>&Select All</source>
<translation>&Tout sélectionner</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+281"/>
+ <location line="-1114"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>Ann&uler la sélection</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1363"/>
+ <location line="-1114"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>F&iltrer la sélection</translation>
</message>
<message>
- <location line="-1644"/>
+ <location line="-1435"/>
<source>Set Se&gment Start Time...</source>
<translation>Définir le temps initial du &segment...</translation>
</message>
@@ -620,82 +612,82 @@
<translation>Définir la durée du seg&ment...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Visualiser</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>Temps &musicaux</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>Temps &réels</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>Temps &bruts</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Se&gment</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Éditer &avec</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Ouvrir dans l'éditeur &matriciel</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Ouvrir dans l'éditeur de partitio&n</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>A propos de &Qt</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>Ajouter &segno</translation>
</message>
@@ -725,7 +717,7 @@
<translation>B&lanche pointée</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>Entrer des ¬es</translation>
</message>
@@ -745,12 +737,12 @@
<translation>Ne pas &pointer les notes et silences</translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>Afficher la barre des &symboles</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-1078"/>
<source>Insert into Selected Audio Track</source>
<translation>Insérer dans la piste audio sélectionnée</translation>
</message>
@@ -765,7 +757,7 @@
<translation>Aide</translation>
</message>
<message>
- <location line="+3445"/>
+ <location line="+2618"/>
<source>Duration Toolbar</source>
<translation>Bare d'outils des durées</translation>
</message>
@@ -775,41 +767,41 @@
<translation>Barre d'outils des symboles</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+2059"/>
+ <location line="-2438"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation>&Mettre à jour tous les traits</translation>
</message>
@@ -879,7 +871,7 @@
<translation></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>Montrer la &Barre d'outils</translation>
</message>
@@ -889,89 +881,89 @@
<translation>Cacher la b&arre d'état</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Barre d'outils Actions</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Barre d'outils temps</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Barre d'outils bloc de commande</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Barre d'outils zoom</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
- <translation type="unfinished"></translation>
+ <translation>Barre des outils d'interprétation</translation>
</message>
<message>
<location line="+1"/>
<source>&Interpret Active Segment</source>
- <translation type="unfinished"></translation>
+ <translation>Appliquer l'&Interpretation au segment actif</translation>
</message>
<message>
<location line="+1"/>
<source>Interpret &Text Dynamics</source>
- <translation type="unfinished"></translation>
+ <translation>Appliquer la dynamique définie par &Texte</translation>
</message>
<message>
<location line="+5"/>
<source>Adjust velocity to follow text dynamics (f, p, mf...)</source>
- <translation type="unfinished"></translation>
+ <translation>Ajuster la "vélocité" en fonction de la dynamique définie par texte (f, p, mf...)</translation>
</message>
<message>
<location line="+2"/>
<source>Interpret &Hairpins</source>
- <translation type="unfinished"></translation>
+ <translation>Appliquer les crescendos/decrescendos</translation>
</message>
<message>
<location line="+5"/>
<source>Adjust velocity to follow hairpin dynamics</source>
- <translation type="unfinished"></translation>
+ <translation>Ajuster la "vélocité" en fonction des crescendos/decrescendos</translation>
</message>
<message>
<location line="+2"/>
<source>Interpret &Slurs and Marks</source>
- <translation type="unfinished"></translation>
+ <translation>Appliquer les liai&sons et les marques</translation>
</message>
<message>
<location line="+5"/>
<source>Articulate slurs, staccato, tenuto, etc.</source>
- <translation type="unfinished"></translation>
+ <translation>Exécuter les liaisons, staccato, tenuto, etc.</translation>
</message>
<message>
<location line="+2"/>
<source>Interpret &Beats</source>
- <translation type="unfinished"></translation>
+ <translation>Appliquer la &pulsation</translation>
</message>
<message>
<location line="+5"/>
<source>Place accents on certain beats according to the time signature</source>
- <translation type="unfinished"></translation>
+ <translation>Accentuer certains temps conformément au chiffrage de la mesure</translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Insérer un marqueur</translation>
</message>
@@ -991,50 +983,42 @@
<translation>Éditer un marqueur</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2747"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Déplacement</translation>
</message>
<message>
- <location line="-1279"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4706"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Dessiner</translation>
</message>
<message>
- <location line="-1252"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4697"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Redimensionnement</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">Rien à &défaire</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Rien à &refaire</translation>
- </message>
- <message>
- <location line="-1133"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4641"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>&Supprimer</translation>
</message>
<message>
- <location line="-4082"/>
+ <location line="-1755"/>
<source>&Grid</source>
<translation>&Grille</translation>
</message>
@@ -1110,62 +1094,62 @@
</message>
<message>
<location line="+41"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&Composition</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Ajouter un changement de te&mpo...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>Changer le chiffra&ge de la mesure...</translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Ouvrir la liste des &événements</translation>
</message>
<message>
- <location line="-3737"/>
- <location line="+1570"/>
+ <location line="-2477"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>A&juster</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Quantifier</translation>
</message>
<message>
- <location line="-2408"/>
+ <location line="-1581"/>
<source>&Action</source>
<translation>&Action</translation>
</message>
<message>
- <location line="+654"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-1369"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>&Quantifier...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>&Répéter la dernière quantification</translation>
</message>
@@ -1176,36 +1160,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>Fusionner les notes de &hauteur égale</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>Aller à &gauche</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>Aller à &droite</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>&Augmenter Vélocité</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>D&iminuer Vélocité</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation>Mettre à la vélo&cité courante</translation>
</message>
@@ -1221,315 +1205,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>Di&viser par 2 les durées</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>&Doubler les durées</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>&Allonger ou rétrécir...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>&Transposer</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>&Monter d'un demi-ton</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>&Descendre d'un demi-ton</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>Monter d'une &octave</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>Descendre d'une octa&ve</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>&Transposer par demi-tons...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Transposer par i&ntervalle...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>&Convertir</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>&Inverse</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>&Rétrograde</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>Ré&trograde inverse</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>&Segment déclenché...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>&Outils</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>&Sélectionner et Editer</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>&Dessiner</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>&Effacer</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Bouger</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>&Redimensionner</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>Di&viser</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>&Vélocité</translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation>Reculer le curseur et s&électionner</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>Avancer le &curseur et sélectionner</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>Boucler sur la sélec&tion</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>Enlever la &boucle</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>Bloc de &commande</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>&Exécution</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&Arrêt</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>&Retour</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Avance rap&ide</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Retour au &début</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Aller à la &fin</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation></translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>Faire dé&filer en suivant l'exécution</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>Pani&que</translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>Octave &supérieure</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>Mode insertion d'acc&ords</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>Enregistrement &pas à pas</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>Barres d'ou&tils</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>Rè&glettes</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>Afficher la règlette &noms des accords</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>Afficher la réglette &tempo</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Barre d'outils Outils</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>Enre&gistrer</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>Préférence&s</translation>
</message>
@@ -1614,7 +1598,7 @@
<translation>Voir les potentiomètres n&on assignés</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Outil d'insertion</translation>
</message>
@@ -1624,13 +1608,13 @@
<translation>Fusionner les silences après effacement</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>Im&primer...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>Ape&rçu avant impression...</translation>
</message>
@@ -1725,21 +1709,21 @@
<translation>Afficher les &en-têtes de portées</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Ouvrir dans l'éditeur de &percussions matriciel</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>Ajouter un changement de cle&f...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Ajouter un changement de &tonalité...</translation>
</message>
@@ -1754,23 +1738,23 @@
<translation>&Relâcher la pédale</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>&Convertir cette partition pour...</translation>
</message>
<message>
- <location line="-2184"/>
+ <location line="-74"/>
<source>Search and Selec&t</source>
- <translation type="unfinished"></translation>
+ <translation>Chercher et sélec&tionner</translation>
</message>
<message>
<location line="+42"/>
<source>Show &Interpret Toolbar</source>
- <translation type="unfinished"></translation>
+ <translation>Montrer la barre des outils d'interprétation</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>N&ote</source>
<translation>N&ote</translation>
</message>
@@ -2062,8 +2046,8 @@
<translation>&Rétablir les queues</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>&Phrase</translation>
</message>
@@ -2133,14 +2117,14 @@
<translation>Lié au &dessous</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>L&ier</translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>&Délier</translation>
</message>
@@ -2305,13 +2289,13 @@
<translation>Timin&g précis</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>Aller à &droite</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>&Visibilité</translation>
</message>
@@ -2346,26 +2330,26 @@
<translation>&Descendre d'une portée</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>Aller au segment &précédent</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>Aller au segment &suivant</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>Recu&ler</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>A&vancer</translation>
</message>
@@ -2510,14 +2494,14 @@
<translation>Accords pour &guitare</translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>&Insérer une note</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>Octave &inférieure</translation>
</message>
@@ -2537,13 +2521,13 @@
<translation>&Mode d'insertion de fioritures</translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>Afficher la barre d'outils des &outils</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>Afficher la barre d'outils des &altérations</translation>
</message>
@@ -2563,18 +2547,18 @@
<translation>Afficher la barre d'outils des &groupes</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>Afficher la barre d'outils trans&port</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>Afficher la barre d'outils de &mise en Page</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2587,13 +2571,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2604,7 +2588,7 @@
<translation>Afficher la règlette des noms d'acco&rds</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation>Afficher la règlette des notes &brutes</translation>
</message>
@@ -2619,7 +2603,7 @@
<translation>Afficher les directives Lil&yPond</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>Barre d'outils des clefs</translation>
</message>
@@ -2639,7 +2623,7 @@
<translation>Barre d'outils marques</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation>Sélectionner tout les é&vénements</translation>
</message>
@@ -2660,54 +2644,54 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>&Manuel de Rosegarden</translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>Configuration...</translation>
</message>
<message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>Montrer la réglette des &vélocités</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Montrer la réglette de "Pitch &Bend"</translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation>Recu&ler le curseur et sélectionner</translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Barre d'outils des réglettes</translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>Config&uration...</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation>Afficher la barre des &réglettes</translation>
</message>
<message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>Reculer (flèche gauche)</translation>
</message>
@@ -2717,247 +2701,247 @@
<translation>Jouer</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>Avancer (Flèche droite)</translation>
</message>
<message>
- <location line="-2680"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-3611"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4666"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-2620"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4686"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-4368"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2595"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4365"/>
+ <location line="-2765"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4392"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-2671"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4420"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="-2823"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4270"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-2728"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4428"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-3873"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4206"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-2674"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4401"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-2725"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4120"/>
- <location line="+1363"/>
+ <location line="-2540"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1563"/>
- <location line="+36"/>
+ <location line="-2871"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3923"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4706"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4697"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4078"/>
+ <location line="-4463"/>
<source>Nothing to &Undo</source>
<translation>Rien à &défaire</translation>
</message>
@@ -2967,181 +2951,181 @@
<translation>Rien à &refaire</translation>
</message>
<message>
- <location line="+43"/>
- <location line="+4120"/>
+ <location line="-151"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3804"/>
- <location line="+1724"/>
+ <location line="+316"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>Insérer séquence de Pitch &Bend...</translation>
</message>
<message>
- <location line="-2000"/>
- <location line="+2350"/>
+ <location line="-3196"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2340"/>
- <location line="+2331"/>
+ <location line="-3536"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2321"/>
- <location line="+2312"/>
+ <location line="-3517"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2302"/>
- <location line="+2293"/>
+ <location line="-3498"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2283"/>
- <location line="+2274"/>
+ <location line="-3479"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2264"/>
- <location line="+2255"/>
+ <location line="-3460"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2246"/>
- <location line="+2237"/>
+ <location line="-3442"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2228"/>
- <location line="+2219"/>
+ <location line="-3424"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2205"/>
- <location line="+1302"/>
+ <location line="-3401"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>Ajouter une réglette de &Contrôle</translation>
</message>
<message>
- <location line="-1261"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2456"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -3154,710 +3138,711 @@
</message>
<message>
<location line="+6"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation>Couper événements contrôleurs (&X)</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation>&Copier événements contrôleurs</translation>
</message>
<message>
- <source>Paste Events (&V)</source>
- <translation type="obsolete">Coller événements (&V)</translation>
- </message>
- <message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation>&Associer un contrôleur à chaque note</translation>
</message>
<message>
- <location line="-1712"/>
- <location line="+1724"/>
+ <location line="-2908"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>Reculer le curseur d'une &mesure et sélectionner</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>Ava&ncer le curseur d'une mesure et sélectionner</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>I dièse</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II bémol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II dièse</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III bémol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V bémol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V dièse</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI bémol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>Vi dièse</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII bémol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation>&Tutoriel Rosegarden</translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation>Rie&n à défaire</translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation>Rien à re&faire</translation>
</message>
<message>
- <location line="-2526"/>
+ <location line="+105"/>
<source>&Guess Beats</source>
<translation>&Deviner la pulsation</translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+41"/>
+ <source>Check for Parallels...</source>
+ <translation>Chercher les mouvements parallèles</translation>
+ </message>
+ <message>
+ <location line="+8"/>
<source>Add Clef Change in This Link Only...</source>
<translation>Ajouter un changement de clef dans ce lien précis...</translation>
</message>
@@ -3922,7 +3907,7 @@
<translation>Ne pas &pointer les notes et silences</translation>
</message>
<message>
- <location line="+783"/>
+ <location line="-1960"/>
<source>Import Rosegarden &Project File...</source>
<translation>Importer un fichier &Projet Rosegarden...</translation>
</message>
@@ -4008,13 +3993,13 @@
<translation>Ajuster la pulsation existante à celle du segment de pulsation</translation>
</message>
<message>
- <location line="+53"/>
- <location line="+371"/>
+ <location line="-570"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation>Ouvrir dans l'éditeur par &défaut</translation>
</message>
<message>
- <location line="-295"/>
+ <location line="+76"/>
<source>Create &Anacrusis...</source>
<translation>Créer &Anacrouse...</translation>
</message>
@@ -4024,7 +4009,7 @@
<translation>Changer les li&ens en copies</translation>
</message>
<message>
- <location line="-2266"/>
+ <location line="+476"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4053,11 +4038,7 @@
<translation>Dump BarDataMap (debug)</translation>
</message>
<message>
- <source>Add Clef Change in this link only...</source>
- <translation type="obsolete">Ajouter un changement de clef dans ce lien précis...</translation>
- </message>
- <message>
- <location line="+19"/>
+ <location line="+20"/>
<source>Add &Layer</source>
<translation>Ajouter &voix (calque)</translation>
</message>
@@ -4074,7 +4055,7 @@
<translation></translation>
</message>
<message>
- <location line="-1384"/>
+ <location line="-2580"/>
<source>Show A&ctions Toolbar</source>
<translation>Afficher la barre d'outils des &actions</translation>
</message>
@@ -4085,40 +4066,24 @@
</message>
<message>
<location line="+196"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation>Co&ntrôleurs</translation>
</message>
<message>
- <source>Cut controller events (&X)</source>
- <translation type="obsolete">Couper événements contrôleurs (&X)</translation>
- </message>
- <message>
- <source>&Copy controller events</source>
- <translation type="obsolete">&Copier événements contrôleurs</translation>
- </message>
- <message>
- <source>Paste events (&V)</source>
- <translation type="obsolete">Coller événements (&V)</translation>
- </message>
- <message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation>Définir le&s valeurs des contrôleurs</translation>
</message>
<message>
- <source>&Place a controller for each note</source>
- <translation type="obsolete">&Associer un contrôleur à chaque note</translation>
- </message>
- <message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation>Insérer une séquence de &contrôleurs...</translation>
</message>
<message>
- <location line="-810"/>
+ <location line="-1645"/>
<source>Panning &Law</source>
<translation>Mode d'équilibrage (&Balance)</translation>
</message>
@@ -4143,7 +4108,7 @@
<translation>&Autre loi à -3 dB (Puissance constante et 0 dB au centre)</translation>
</message>
<message>
- <location line="+116"/>
+ <location line="+950"/>
<source>&Move to Staff Above...</source>
<translation>Dé&placer vers la portée du dessus</translation>
</message>
@@ -4158,14 +4123,14 @@
<translation>Afficher la barre des &durées</translation>
</message>
<message>
- <location line="+23"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1251"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation>Ouvrir dans le Testeur de &Justesse</translation>
</message>
<message>
- <location line="-2445"/>
+ <location line="+17"/>
<source>Ctrl+Alt++</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4253,14 +4218,14 @@
<translation></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4278,8 +4243,8 @@
<translation></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4312,25 +4277,25 @@
<translation>Choisir la sélection comme &Trait</translation>
</message>
<message>
- <location line="+11"/>
- <location line="+1472"/>
+ <location line="-1260"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3015"/>
- <location line="+1554"/>
+ <location line="-2739"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1604"/>
- <location line="+1550"/>
+ <location line="-2800"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
- <translation type="unfinished"></translation>
+ <translation>`</translation>
</message>
<message>
<location line="+58"/>
@@ -4583,21 +4548,21 @@
<translation></translation>
</message>
<message>
- <location line="+471"/>
- <location line="+516"/>
+ <location line="-1756"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation>Mode insertion de &N-olets</translation>
</message>
@@ -4768,7 +4733,7 @@
<translation>Barre d'outils calques</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Insertion</translation>
</message>
@@ -4823,7 +4788,7 @@
<translation>Rendre visible</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Ligatures automatiques quand approprié</translation>
</message>
@@ -4863,7 +4828,7 @@
<translation>Double bémol</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>&Nouveau</translation>
</message>
@@ -4873,23 +4838,11 @@
<translation>&Importer</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Importer un fichier &Projet Rosegarden...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Importer un fichier &MIDI...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>Importer un fichier &Hydrogen...</translation>
</message>
<message>
- <source>Import MusicXM&L file...</source>
- <translation type="obsolete">Importer un fichier MusicXM&L...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Merge</source>
<translation>F&usionner</translation>
@@ -4900,44 +4853,16 @@
<translation>&Fusionner un fichier...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Fusionner un fichier &MIDI...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Fusionner un fichier &Hydrogen...</translation>
</message>
<message>
- <source>Merge MusicXM&L file...</source>
- <translation type="obsolete">Fusionner un fichier MusicXM&L...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Export</source>
<translation>&Exporter</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Exporter un fichier &Projet Rosegarden...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Exporter en fichier &MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Exporter en fichier partition &Csound...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Exporter en fichier M&up...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Exporter en fichier Music&XML...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>&Ouvrir...</translation>
@@ -4948,10 +4873,6 @@
<translation>Ouvrir un fichier &récemment ouvert</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Enre&gistrer sous...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>Sauver comme &modèle...</translation>
@@ -5037,10 +4958,6 @@
<translation>Ajuster le tempo à partir de la &pulsation d'un segment</translation>
</message>
<message>
- <source>Fit existing beats to beat segment</source>
- <translation type="obsolete">Ajuster la pulsation existante à celle du segment de pulsation</translation>
- </message>
- <message>
<location line="+2"/>
<source>Change &Composition Start and End...</source>
<translation>Changer la durée de la &composition...</translation>
@@ -5061,13 +4978,13 @@
<translation>Positionner le marqueur &rapide à l'emplacement du pointeur d'exécution</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>&Aller au marqueur rapide</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation>&Studio</translation>
</message>
@@ -5122,48 +5039,44 @@
<translation>&Enregistrer le document courant comme studio par défaut</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Ouvrir dans l'éditeur par &défaut</translation>
- </message>
- <message>
- <location line="+66"/>
- <location line="+452"/>
+ <location line="-476"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>Ré-é&tiqueter...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>Ref&aire la dernière quantification</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>Allonger &ou rétrécir...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>Définir l'&instant du début...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>Définir la d&urée...</translation>
</message>
<message>
- <location line="+19"/>
- <location line="+382"/>
+ <location line="-1219"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Joindre</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>&Séparer</translation>
</message>
@@ -5273,26 +5186,26 @@
<translation>&Redéfinir Instruments...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>&Redimensionner</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation>&Pointer enregistrement</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>Afficher la barre d'ou&tils principale</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>Afficher la barre d'outils p&istes</translation>
</message>
@@ -5307,27 +5220,19 @@
<translation>Afficher la barre d'outils &zoom</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>Afficher la barre d'ét&at</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>Afficher réglette de position du curseur d'exéc&ution</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Importer un fichier Rosegarden &X11...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Fusionner un fichier Rosegarden &X11...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>Mélan&geur MIDI</translation>
@@ -5343,10 +5248,6 @@
<translation>Afficher réglette de te&mpo</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Exporter en Fichier &Lilypond...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>Afficher tra&nsport</translation>
@@ -5393,26 +5294,26 @@
<translation>Barre d'outils éditeurs</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Retourner au début</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Aller à la fin</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>&Soutenir Rosegarden</translation>
</message>
<message>
- <location line="+221"/>
+ <location line="-1791"/>
<source>Insert Tempo Change</source>
<translation>Insérer un changement de tempo</translation>
</message>
@@ -5452,7 +5353,7 @@
<translation>Ouvrir l'éditeur de tempo et de chiffrage de la mesure</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>Édit&er l'objet</translation>
</message>
@@ -5472,7 +5373,7 @@
<translation>&Configuration</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>Coller en tant que nouveau &segment déclenché</translation>
</message>
@@ -5494,7 +5395,7 @@
<message>
<location line="+2"/>
<source>Bass</source>
- <translation>Fa</translation>
+ <translation>Basse</translation>
</message>
<message>
<location line="-329"/>
@@ -5577,7 +5478,7 @@
<message>
<location line="+1"/>
<source>Classical Guitar</source>
- <translation type="unfinished"></translation>
+ <translation>Guitare classique</translation>
</message>
<message>
<location line="+1"/>
@@ -8456,16 +8357,16 @@
<translation><aucun></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>Greffon de synthétiseur</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>Audio</translation>
@@ -10606,20 +10507,15 @@
<translation>Inconnu</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10634,10 +10530,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 Contrôleur %2 %3</translation>
</message>
@@ -10652,7 +10548,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Bienvenue !</translation>
</message>
@@ -10760,45 +10656,57 @@
<translation><qt><p>Aucune piste n'était en mode enregistrement.</p><p>Veuillez allumer au moins l'une des DEL d'enregistrement <img src=":pixmaps/tooltip/record-leds.png"> et essayer de nouveau</p></qt></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>Echec de l'enregistrement audio.</p><p>Veuillez définir un emplacement valide pour les fichiers audio dans <b>Composition -> Editer les propriétés du document... -> Audio</b></p></qt></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>Taille anormale d'une donnée "long" dans un flux MIDI</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>Taille anormale d'une donnée "int" dans un flux MIDI</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>La fin du fichier MIDI a été atteinte pendant la lecture</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation>Tentative d'accès à plus d'octets que le nombre attendu pour cette piste</translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation>Tentative de lecture au delà de la fin du fichier MIDI</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation>Fichier corrompu ou pas du format attendu</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation>Ce n'est pas un fichier MIDI</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation>Format de fichier MIDI inattendu</translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>Un code d'événement invalide a été trouvé</translation>
+ <translation type="obsolete">Un code d'événement invalide a été trouvé</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation>Le premier événement de la piste utilise le "Running status"</translation>
</message>
@@ -10916,7 +10824,7 @@
<translation>Fichier audio anormal </translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation>Cet événement est lié à autre événement.</translation>
</message>
@@ -10956,10 +10864,6 @@ Le démarrage du pilote a échoué avec le message suivant :
<translation>Aucun pilote audio n'est disponible. L'application aurait-elle été compilée sans le support audio ?</translation>
</message>
<message>
- <source>G</source>
- <translation type="obsolete">Sol</translation>
- </message>
- <message>
<location filename="../../src/base/figuration/SegmentFigData.cpp" line="+53"/>
<source>Replace segment contents</source>
<translation>Remplacer le contenu des segments</translation>
@@ -11004,6 +10908,58 @@ Le démarrage du pilote a échoué avec le message suivant :
<source>Update Figurations</source>
<translation>Mettre à jour les traits</translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation>Lilypond n'accepte pas d'espaces ou de barre inverse ("\") dans les noms de fichiers.
+
+Voulez-vous utiliser
+
+ %1
+
+ Ã la place?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation>Échec d'exportation. Le fichier n'a pas pu être ouvert en écriture.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation>L'exportation s'est bien passée, mais la composition est vide.</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation>Echec de l'exportation des pistes non assourdies. Il n'y a pas de pistes non assourdies ou elles ne contiennent pas de segments.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation>Echec de l'exportation de la piste sélectionnée. Il n'y a pas de segment sur la piste sélectionnée.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation>Echec de l'exportation des segments sélectionnés. Aucun segment n'est sélectionné.</translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation>avertissement: une mesure anormalement longue a été tronquée</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation>avertissement: une mesure trop courte a été complétée par des silences</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11019,20 +10975,8 @@ Le démarrage du pilote a échoué avec le message suivant :
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation><p>Copyright 2000-2014 par l'équipe de développement de Rosegarden</p><p>Version : %1 Qt version : %2<br>Build key : %3</p><p>Rosegarden vous a été apporté par un groupe de volontaires du monde entier. Pour une liste des contributeurs, voir <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>pour plus d'informations sur Rosegarden, voir <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License : GNU General Public License Version 2 ou ultérieure</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="obsolete"><p>Copyright 2000-2012 par l'équipe de développement de Rosegarden</p><p>Version : %1 Qt version : %2<br>Build key : %3</p><p>Rosegarden vous a été apporté par un groupe de volontaires du monde entier. Pour une liste des contributeurs, voir <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>pour plus d'informations sur Rosegarden, voir <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License : GNU General Public License Version 2 ou ultérieure</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2011 par l'équipe de développement de Rosegarden</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden vous a été apporté par un groupe de volontaires du monde entier. Pour une liste des contributeurs, voir <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>pour plus d'informations sur Rosegarden, voir <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2010 par l'équipe de développement de Rosegarden</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden vous a été apporté par un groupe de volontaires du monde entier. Pour une liste des contributeurs, voir <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>pour plus d'informations sur Rosegarden, voir <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></translation>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <translation><p>Copyright 2000-2015 par l'équipe de développement de Rosegarden</p><p>Version : %1 Qt version : %2<br>Build key : %3</p><p>Rosegarden vous a été apporté par un groupe de volontaires du monde entier. Pour une liste des contributeurs, voir <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>pour plus d'informations sur Rosegarden, voir <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License : GNU General Public License Version 2 ou ultérieure</p></translation>
</message>
</context>
<context>
@@ -11093,12 +11037,12 @@ Le démarrage du pilote a échoué avec le message suivant :
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>Il n'est pas possible de superposer deux indications identiques</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>Ajouter un &lié</translation>
</message>
@@ -11484,7 +11428,7 @@ Le démarrage du pilote a échoué avec le message suivant :
<message>
<location line="+6"/>
<source>Start JACK automatically</source>
- <translation type="unfinished"></translation>
+ <translation>Démarrer JACK automatiquement</translation>
</message>
<message>
<location line="+12"/>
@@ -11606,24 +11550,24 @@ Le démarrage du pilote a échoué avec le message suivant :
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Cliquer pour renommer cet instrument</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>Cliquer le nouton ci-dessus pour renommer cet instrument</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><pas de synthétiseur></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><pas de module externe></translation>
</message>
@@ -11676,10 +11620,6 @@ Le démarrage du pilote a échoué avec le message suivant :
<translation>Fichier</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><Aucun fichier audio></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Enregistrer le fichier sous</translation>
@@ -11839,7 +11779,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Mixeur audio</translation>
</message>
@@ -11855,20 +11795,20 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Balance</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>Niveau audio</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Mono ou stereo</translation>
</message>
@@ -11879,21 +11819,21 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><Aucun></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>Cliquer pour charger un greffon audio</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>Cliquer pour renommer cet instrument</translation>
</message>
@@ -11913,7 +11853,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<translation>Cliquer le nouton ci-dessus pour renommer cet instrument</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Groupe %1</translation>
</message>
@@ -11929,14 +11869,14 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<translation>Maître</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><pas de greffon></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation></translation>
</message>
@@ -12495,7 +12435,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<translation><Nouvelle banque %1></translation>
</message>
<message>
- <location line="+508"/>
+ <location line="+514"/>
<source>Some internal error: no device selected</source>
<translation>Erreur interne: aucun périphérique n'est sélectionné</translation>
</message>
@@ -12511,7 +12451,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<translation></translation>
</message>
<message>
- <location line="-774"/>
+ <location line="-780"/>
<source><new bank></source>
<translation><nouvelle banque></translation>
</message>
@@ -12531,7 +12471,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<translation>Confirmez-vous l'effacement de cette banque ?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>Confirmez-vous l'effacement de cette liste de percussions ?</translation>
</message>
@@ -12699,6 +12639,120 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation>Chercher des mouvements parallèles</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation>Chercher des unisons</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation>Chercher des mouvements parallèles cachés</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation>Commencer</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation>Effacer</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation>Exporter</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation>Ok</translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation>mesure</translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation> </translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation>temps</translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation>fraction</translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation>Relancer</translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation>notes multiples pour</translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation>parallélisme à la mesure</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation>parallélismes à la mesure</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation>unisons</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation>quintes</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation>octaves</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation>quintes cachées</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation>octaves cachées</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation>pour</translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -12821,7 +12875,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<message>
<location line="+2"/>
<source>Bass</source>
- <translation>Fa</translation>
+ <translation>Basse</translation>
</message>
<message>
<location line="+2"/>
@@ -13016,13 +13070,13 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<message>
<location line="+10"/>
<source>Auto-Expand when Editing</source>
- <translation type="unfinished"></translation>
+ <translation>Allongement automatique à l'édition</translation>
</message>
</context>
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13247,7 +13301,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Vélocité</translation>
</message>
@@ -13263,7 +13317,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Type d'événement non supporté</translation>
</message>
@@ -13278,12 +13332,13 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<translation>Événements contrôleurs</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>Insérer une ligne de contrôleurs</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>Numéro de l'événement contrôleur</translation>
</message>
@@ -13291,7 +13346,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>&Copier</translation>
</message>
@@ -13301,7 +13356,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<translation>(extrait)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(copié)</translation>
</message>
@@ -13371,7 +13426,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>Cou&per</translation>
</message>
@@ -13411,10 +13466,6 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Commande joindre à nouveau</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>Effacer une plage</translation>
@@ -13439,12 +13490,12 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation>[ Pas de port ]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -13984,12 +14035,12 @@ Cela peut causer des problèmes si elle masque une valeur différente devant êt
<message>
<location line="+5"/>
<source>Use notation duration</source>
- <translation type="unfinished"></translation>
+ <translation>Utiliser la durée indiquée dans la partition</translation>
</message>
<message>
<location line="+4"/>
<source>Select rests</source>
- <translation type="unfinished"></translation>
+ <translation>Selectionner les silences</translation>
</message>
<message>
<location line="+13"/>
@@ -14072,46 +14123,10 @@ Cela peut causer des problèmes si elle masque une valeur différente devant êt
<translation>Motif</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Constant - %1 reste à valeur</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Alternance - alterner %1 entre max et min à chacun des événements successifs</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo - %1 du min au max</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo - %1 du min au max</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Oscillations amorties - Varier %1 alternativement du max au min, avec max et min tendant tous deux vers 0</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>Valeur</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">1ère valeur</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">2ème valeur</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Valeur faible</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Valeur élevée</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14506,22 +14521,6 @@ Voulez-vous essayer de localiser ce fichier?</translation>
<translation>Chargement de %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Echec de la connexion au serveur FTP</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Echec de la connexion</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Echec du déplacement vers le répertoire correct</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">Chargement via FTP avorté</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Chargement annulé</translation>
@@ -14739,17 +14738,17 @@ Voulez-vous essayer de localiser ce fichier?</translation>
<message>
<location line="+43"/>
<source>MuPDF</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
<source>ePDFView</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
<source>xdg-open (recommended)</source>
- <translation type="unfinished"></translation>
+ <translation>xdg-open (recommendé)</translation>
</message>
<message>
<location line="+14"/>
@@ -14849,10 +14848,6 @@ Voulez-vous essayer de localiser ce fichier?</translation>
<translation>Adobe Acrobat Reader (non libre)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation>Utilisé pour prévisualiser la sortie vers LilyPond</translation>
@@ -14863,10 +14858,6 @@ Voulez-vous essayer de localiser ce fichier?</translation>
<translation>Utilitaire d'impression de fichier depuis la ligne de commande</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">KPrinter (KDE 3)</translation>
- </message>
- <message>
<location line="+5"/>
<source>Gtk-LP (GNOME)</source>
<translation>Gtk-LP (GNOME)</translation>
@@ -14924,13 +14915,6 @@ Voulez-vous essayer de localiser ce fichier?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Guitar::Fingering</name>
- <message>
- <source>couldn't parse fingering '%1' in '%2'</source>
- <translation type="obsolete">Échec de l'analyse du doigté '%1' dans '%2'</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::GuitarChordEditorDialog</name>
<message>
<location filename="../../src/gui/editors/guitar/GuitarChordEditorDialog.cpp" line="+40"/>
@@ -15455,7 +15439,7 @@ Texte d'exemple depuis le fichier:</translation>
<translation>Paramètres d'instrument</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Piste</translation>
</message>
@@ -15463,7 +15447,7 @@ Texte d'exemple depuis le fichier:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation>aucun</translation>
</message>
@@ -15848,7 +15832,6 @@ Texte d'exemple depuis le fichier:</translation>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15856,7 +15839,7 @@ Would you like to use
%1
instead?</source>
- <translation>Lilypond n'accepte pas d'espaces ou de barre inverse ("\") dans les noms de fichiers.
+ <translation type="obsolete">Lilypond n'accepte pas d'espaces ou de barre inverse ("\") dans les noms de fichiers.
Voulez-vous utiliser
@@ -15865,39 +15848,32 @@ Voulez-vous utiliser
à la place?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation>Echec de l'exportation. Le fichier ne peut pas être écrit.</translation>
+ <translation type="obsolete">Echec de l'exportation. Le fichier ne peut pas être écrit.</translation>
</message>
<message>
- <location line="+169"/>
<source>Export succeeded, but the composition was empty.</source>
- <translation>L'exportation s'est bien passée, mais la composition est vide.</translation>
+ <translation type="obsolete">L'exportation s'est bien passée, mais la composition est vide.</translation>
</message>
<message>
- <location line="+42"/>
<source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation>Echec de l'exportation des pistes non assourdies. Il n'y a pas de pistes non assourdies ou elles ne contiennent pas de segments.</translation>
+ <translation type="obsolete">Echec de l'exportation des pistes non assourdies. Il n'y a pas de pistes non assourdies ou elles ne contiennent pas de segments.</translation>
</message>
<message>
- <location line="+6"/>
<source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation>Echec de l'exportation de la piste sélectionnée. Il n'y a pas de segment sur la piste sélectionnée.</translation>
+ <translation type="obsolete">Echec de l'exportation de la piste sélectionnée. Il n'y a pas de segment sur la piste sélectionnée.</translation>
</message>
<message>
- <location line="+5"/>
<source>Export of selected segments failed. No segments are selected.</source>
- <translation>Echec de l'exportation des segments sélectionnés. Aucun segment n'est sélectionné.</translation>
+ <translation type="obsolete">Echec de l'exportation des segments sélectionnés. Aucun segment n'est sélectionné.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>avertissement: une mesure anormalement longue a été tronquée</translation>
+ <translation type="obsolete">avertissement: une mesure anormalement longue a été tronquée</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>avertissement: une mesure trop courte a été complétée par des silences</translation>
+ <translation type="obsolete">avertissement: une mesure trop courte a été complétée par des silences</translation>
</message>
</context>
<context>
@@ -15923,10 +15899,6 @@ Voulez-vous utiliser
<translation>Options de base</translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Pistes sélectionnées</translation>
- </message>
- <message>
<location line="+31"/>
<source>Compatibility level</source>
<translation>Niveau de compatibilité</translation>
@@ -15963,7 +15935,7 @@ Voulez-vous utiliser
<message>
<location line="+1"/>
<source>2.14</source>
- <translation type="unfinished">2.14</translation>
+ <translation>2.14</translation>
</message>
<message>
<location line="+4"/>
@@ -16021,10 +15993,6 @@ Voulez-vous utiliser
<translation>Imprimer les noms de portées courts</translation>
</message>
<message>
- <source><qt>Useful for large, complex scores, this prints the short name every time there is a line break in the score, making it easier to follow which line belongs to which instrument across pages</qt></source>
- <translation type="obsolete"><qt>Utile pour les partitions complexes et de grande taille. Un nom court est imprimé a chaque changement de ligne dans la partition. Ceci facilite la reconnaissance de l'instrument associés à chaque ligne sur les différentes pages.</qt></translation>
- </message>
- <message>
<location line="+42"/>
<source>Notation language</source>
<translation>Langue du fichier LilyPond</translation>
@@ -16077,12 +16045,12 @@ Voulez-vous utiliser
<message>
<location line="+3"/>
<source>Allow fingerings inside staff</source>
- <translation type="unfinished"></translation>
+ <translation>Autoriser les doigtés à l'intérieur des portées</translation>
</message>
<message>
<location line="+2"/>
<source><qt>When checked, LilyPond is allowed print fingerings inside the staff. This can improve rendering in polyphonic scores with fingerings in different voices, and is on by default.</qt></source>
- <translation type="unfinished"></translation>
+ <translation><qt>Si cette case est cochée, LilyPond peut imprimer les doigtés à l'intérieur des portées. Cette option, active par défaut, améliorer le rendu des partitions polyphoniques avec des doigtés sur plusieurs voix.</qt></translation>
</message>
<message>
<location line="+40"/>
@@ -16188,7 +16156,7 @@ Voulez-vous utiliser
<message>
<location line="+3"/>
<source><qt>Useful for large, complex scores, this prints the short name every time there is a line break in the score, making it easier to follow which line belongs to which instrument across pages; requires LilyPond 2.10 or higher</qt></source>
- <translation type="unfinished"></translation>
+ <translation><qt>Les noms courts des portées sont écrits à chaque changement de ligne. Ceci facilite la reconnaissance des portées associées aux différents instruments sur les partitions longues et complexes. Une version 2.10 ou supérieure' de LilyPond est nécessaire.</qt></translation>
</message>
<message>
<location line="+13"/>
@@ -16418,10 +16386,6 @@ répartis verticalement sur la page)</translation>
<context>
<name>Rosegarden::LoopRuler</name>
<message>
- <source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Double-click to start playback.</p></qt></source>
- <translation type="obsolete"><qt><p>Cliquer et glisser pour déplacer le pointeur d'exécution.</p><p>Majuscule+cliquer et glisser pour définir une plage à exécuter en boucle ou à éditer.</p><p>Majuscule+cliquer pour supprimer la définition d'une plage.</p><p>Double-cliquer pour démarrer l'exécution.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/rulers/LoopRuler.cpp" line="+80"/>
<source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Ctrl-click and drag to move the playback pointer with snap to beat.</p><p>Double-click to start playback.</p></qt></source>
<translation><qt><p>Cliquer et glisser pour déplacer le pointeur d'exécution.</p><p>Majuscule+cliquer et glisser pour définir une plage à exécuter en boucle ou à éditer.</p><p>Majuscule+cliquer pour supprimer la définition d'une plage.</p>Ctrl+cliquer et glisser pour déplacer le pointeur d'exécution sans rester accroché à la grille des temps.<p>Double-cliquer pour démarrer l'exécution.</p></qt></translation>
@@ -16618,7 +16582,7 @@ un peu d'attente au début de l'exécution à cause du volume de donn
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation><qt>Choisir une variation du the programme ci-dessus, si le studio en dispose</qt></translation>
</message>
@@ -16628,14 +16592,6 @@ un peu d'attente au début de l'exécution à cause du volume de donn
<translation><qt>Choisir la banque MIDI d'où les programmes pourront être sélectionnés</qt></translation>
</message>
<message>
- <source>auto</source>
- <translation type="obsolete">Auto</translation>
- </message>
- <message>
- <source>fixed</source>
- <translation type="obsolete">Fixé</translation>
- </message>
- <message>
<location line="+26"/>
<source><qt>Set the MIDI program or "patch"</p></qt></source>
<translation><qt>Choisir le programme MIDI ou "patch"</p></qt></translation>
@@ -16673,17 +16629,17 @@ un peu d'attente au début de l'exécution à cause du volume de donn
<message>
<location line="+20"/>
<source><qt>Send bank select</qt></source>
- <translation type="unfinished"></translation>
+ <translation><qt>Sélectionne la banque</qt></translation>
</message>
<message>
<location line="+33"/>
<source><qt>Send program change</qt></source>
- <translation type="unfinished"></translation>
+ <translation><qt>Sélectionne le programme</qt></translation>
</message>
<message>
<location line="+26"/>
<source><qt>Send bank select for variation</qt></source>
- <translation type="unfinished"></translation>
+ <translation><qt>Emettre la banque sélectionnée pour les variations</qt></translation>
</message>
<message>
<location line="+19"/>
@@ -16693,12 +16649,12 @@ un peu d'attente au début de l'exécution à cause du volume de donn
<message>
<location line="+12"/>
<source>Auto</source>
- <translation type="unfinished"></translation>
+ <translation>Automatique</translation>
</message>
<message>
<location line="+1"/>
<source>Fixed</source>
- <translation type="unfinished"></translation>
+ <translation>Fixé</translation>
</message>
<message>
<location line="+10"/>
@@ -16711,12 +16667,7 @@ un peu d'attente au début de l'exécution à cause du volume de donn
<translation>Accepter contrôles externes</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Pas de connexion</translation>
</message>
@@ -16940,6 +16891,15 @@ un peu d'attente au début de l'exécution à cause du volume de donn
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17145,12 +17105,12 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Maintenez enfoncé la touche "Majuscules" pour ne pas rester accroché à la grille des temps</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Copier et déplacer l'événement</translation>
</message>
@@ -17309,7 +17269,7 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<translation>Modifier les vélocités</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>Cliquer et glisser pour modifier la vélocité des notes sélectionnées</translation>
</message>
@@ -17322,12 +17282,12 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation>Action d'insertion de note %1 inconnue</translation>
</message>
<message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation><Sans titre></translation>
</message>
@@ -17390,7 +17350,7 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<translation>Arrêté</translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation></translation>
</message>
@@ -17406,8 +17366,7 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -17417,7 +17376,7 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<translation>Armature estimée</translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation>Chiffrage de la mesure estimé</translation>
</message>
@@ -17432,10 +17391,6 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<translation>Par nombre de demi-tons :</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Définir une variation de vélocité</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation>Segment déclenché</translation>
@@ -17446,20 +17401,15 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<translation>Enlever les déclencheurs</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>la matrice</translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Impossible d'insérer la note: Pas de grille de durée sélectionnée</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
@@ -17479,7 +17429,7 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<translation>Retour au zoom initial</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Tourner la molette pour sélectionner le segment actif</qt></translation>
</message>
@@ -17602,7 +17552,7 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>Mélangeur MIDI</translation>
</message>
@@ -17617,7 +17567,7 @@ Double-cliquer pour ouvrir l'éditeur de marqueur.</translation>
<translation>Instrument</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation></translation>
</message>
@@ -17873,50 +17823,26 @@ MSB/LSB sont toujours uniques pour tous les périphériques)</translation>
<translation><qt><p>Certains instruments transpositeurs (comme les saxophones ténors et barytons) transposent sur plus d'une octave. Pour des transpositions aussi étendues, certains logiciels ont besoin d'un élément "<octave-shift>" alors que d'autres ne connaissentent pas cet élément.</p><p>En important le fichier MusicXML produit dans un logiciel externe, vérifiez soigneusement le comportement des instruments transpositeurs dans les deux modes jeu audio et partition. Un rendu incorrect pourrait être amélioré en modifiant cette option.</p></qt></translation>
</message>
<message>
- <source><qt>Set the MusicXML version you want export.</qt></source>
- <translation type="obsolete"><qt>Définir la version de MusicXML à utiliser.</qt></translation>
- </message>
- <message>
<location line="-29"/>
<source>MusicXML type</source>
<translation>Type de fichier MusicXML</translation>
</message>
<message>
- <source><qt><p>Choose the format of the MusicXML file.Both partwise and timewise file are available.</p></qt></source>
- <translation type="obsolete"><qt><p>Choix du format du fichier MusicXML file.Les deux types de fichiers "partwise" et "timewise" sont disponibles.</p></qt></translation>
- </message>
- <message>
- <source>Export multistave instrument</source>
- <translation type="obsolete">Exporter les instruments utilisant plusieurs portées</translation>
- </message>
- <message>
<location line="+10"/>
<source>None</source>
<translation>Aucun</translation>
</message>
<message>
- <source><qt>Choose which bracket will create a multi staff system</qt></source>
- <translation type="obsolete"><qt>Sélectionner les accolades à utiliser</qt></translation>
- </message>
- <message>
<location line="+7"/>
<source>Don't export percussion tracks</source>
<translation>Ne pas exporter les percussions</translation>
</message>
<message>
- <source><qt>Exporting percussion is still experimental.<br>Percussion can be exported "as notes" or "as percussion". When exporting "as notes" a percussion track is handled as a normal track.<br>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden hasn't a real percussion notation MusicXML Export tries to convert the percussion track to a percussion notation. This option is still experimental.</qt></source>
- <translation type="obsolete"><qt>L'exportation des percussions est encore experimentale.<br>Les percussions peuvent être exportées "comme des notes" ou "comme des percussions". Si l'exportation est faite "comme des notes" une piste de percussion est traitée comme une piste normale.<br>Si une piste est exportée "comme des percussions" une partition de percussion MusicXML sera produite. Comme Rosegarden ne gère pas actuellement les partitions de percussion, l'exporteur MusicXML fait lui-même la conversion. Cette option est encore experimentale.</qt></translation>
- </message>
- <message>
<location line="+8"/>
<source>Use "<octave-shift>" for transposing instruments</source>
<translation>Utiliser "<octave-shift>" pour les instruments transpositeurs</translation>
</message>
<message>
- <source><qt>Some transposing instruments (like a tenor or bariton sax) transposes over more than 1 octave. For such large transpositions some tools require a "<octave-shif>" element while other tools will not support this element! Therefor the use of the "<octave-shift>" element can be controlled by this option.<br>When importing the MusicXML file into another tool, check transposing instrument carefully in both concert and notated pitch. When this is not correct toggling this option might help.</qt></source>
- <translation type="obsolete"><qt>Certains instruments transpositeurs (comme un saxophone tenor ou bariton) transposent sur plus d'une octave. Pour de telles transpositions, certains outils ont besoin d'une indication "<octave-shif>" que d'autres outils ne supporteront pas! C'est pourquoi cette option permet de contrôler l'utilisation de l'indication "<octave-shift>.<br>Pour utiliser un fichier MusicXML depuis un autre outil, vérifier soigneusement l'instrument transpositeur, en mode concert comme en mode notation. Quand le basculement entre ces deux modes est incorrect, il peut être utile de modifier cette option.</qt></translation>
- </message>
- <message>
<location line="+45"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
<translation></translation>
@@ -17941,13 +17867,13 @@ MSB/LSB sont toujours uniques pour tous les périphériques)</translation>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>la partition</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Mise en page par défaut</translation>
</message>
@@ -18522,7 +18448,7 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> Police: </translation>
</message>
@@ -18542,7 +18468,7 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation> Espacement: </translation>
</message>
<message numerus="yes">
- <location line="-118"/>
+ <location line="-120"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> %n événement sélectionné</numerusform>
@@ -18555,11 +18481,7 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation> Pas de sélection </translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Triolet</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation>Accord</translation>
</message>
@@ -18576,7 +18498,7 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation>%1 %2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation>Action d'espacement inconnue %1</translation>
</message>
@@ -18601,42 +18523,37 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation>Options de prévisualisation Lilypond</translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Échec d'exportation. Le fichier n'a pas pu être ouvert en écriture.</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Le presse-papiers est vide</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>Ne peut pas coller plusieurs segments dans un seul</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
- <translation type="unfinished"></translation>
+ <translation><qt><p>Applique les interprétations définies par les icônes ci-contre à la sélection.</p><p>En l'absence de sélection, les interprétations s'appliquent à la totalité du segment.</p></qt></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+381"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>Impression avec LilyPond...</translation>
</message>
@@ -18651,29 +18568,29 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation><qt><p>Echec d'ouverture d'un fichier temporaire pour exporter vers LilyPond.</p><p>Ceci signifie vraisemblablement que votre disque est plein <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation><qt><p>Le mode de collage dans un silence existant [restricted] nécessite suffisamment d'espace (ne contenant que des silences) à l'emplacement de destination pour contenir tous les événements à coller.</p><p>L'espace disponible est insuffisant.</p><p>Si vous souhaitez néanmoins effectuer cette opération, envisagez de sélectionner un autre mode de collage en utilisant les options de l'entrée <b>Coller...</b> du menu "Édition". Vous pouvez également, si vous le désirez, remplacer le mode de collage par défaut par autre chose que "dans un silence existant" [restricted].</p></qt></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>Insertion du contenu du presse-papiers...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>Ne peut pas coller ici.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation>Déplacer les événements vers la portée au-dessus</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>Augmentation de la vélocité...</translation>
</message>
@@ -18683,15 +18600,7 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation>Diminution de la vélocité...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Définir une variation de vélocité</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Réglages Vélocités...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation>Editer l'événement texte</translation>
</message>
@@ -18706,7 +18615,7 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation>Fusion des notes...</translation>
</message>
<message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation>Action d'insertion de note %1 inconnue</translation>
</message>
@@ -18716,13 +18625,13 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation>Insérer Note</translation>
</message>
<message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation>Ajouter point...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation>Ornement piste %1 mesure %2</translation>
</message>
@@ -18732,10 +18641,6 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation>Ornement mesure %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Réaliser un ornement</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>Utiliser un ornement</translation>
@@ -18771,7 +18676,7 @@ Ceci est un bogue (le programme aurait dû s'arrêter anormalement)</transl
<translation>Maintien (sustain)</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>Il n'y a pas de contrôleur de maintien (sustain) défini pour ce périphérique.
@@ -18783,7 +18688,7 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<translation>Afficher le chiffrage de la mesure estimé</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - Segment Piste #%3 - Partition</translation>
</message>
@@ -18816,7 +18721,7 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<translation>Par nombre de demi-tons :</translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>Temps: %1 (%2.%3s)</translation>
</message>
@@ -18865,16 +18770,11 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<source>Cycling slashes...</source>
<translation>Parcourir les modes de notes barrées...</translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>Impossible d'insérer la note: Pas de durée de note sélectionnée</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
@@ -18899,7 +18799,7 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<translation>Cacher les en-têtes des portées</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Tourner la molette pour sélectionner le segment actif</qt></translation>
@@ -19121,10 +19021,6 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">Séquence de Pitch Bend</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>Préselection</translation>
@@ -19132,11 +19028,7 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<message>
<location line="+5"/>
<source>Preset:</source>
- <translation>Type:</translation>
- </message>
- <message>
- <source>User</source>
- <translation type="obsolete">Utilisateur</translation>
+ <translation>Type:</translation>
</message>
<message>
<location line="-67"/>
@@ -19361,23 +19253,11 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<translation></translation>
</message>
<message>
- <source>User %1</source>
- <translation type="obsolete">Utilisateur %1</translation>
- </message>
- <message>
<location line="-901"/>
<source>Pre Bend</source>
<translation>Valeur initiale</translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Valeur (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Durée (%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation>Durée de la rampe (%):</translation>
@@ -19398,27 +19278,11 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<translation>Valeur finale (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">Amplitude initiale du vibrato (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">Amplitude finale du vibrato (%):</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation>Paramètres de la variation</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Période du vibrato:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">Résolution:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Instant final non valide. Des événements sont-ils sélectionnés?</translation>
@@ -19572,12 +19436,12 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<message>
<location line="+30"/>
<source>Tunings</source>
- <translation type="unfinished"></translation>
+ <translation>Tempérament</translation>
</message>
<message>
<location line="+19"/>
<source>Pitch estimate method</source>
- <translation type="unfinished"></translation>
+ <translation>Détermination de la hauteur</translation>
</message>
</context>
<context>
@@ -19946,13 +19810,6 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1 contrôleur</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -20040,12 +19897,12 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Aucun</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>2 pendant la durée de 3</translation>
</message>
@@ -20110,7 +19967,7 @@ Veuillez vérifier que le périphérique est configuré correctement dans le dia
<translation>Séparer et lier les notes des accords qui se chevauchent</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Quantification complète</translation>
</message>
@@ -20450,8 +20307,8 @@ Il peut y avoir des incompatibilités avec ce format de fichier.</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20463,7 +20320,7 @@ Il peut y avoir des incompatibilités avec ce format de fichier.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>Echec sauvegarde du document en %1</translation>
</message>
@@ -20542,7 +20399,12 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<translation>Fusionner</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation>'%1' est en lecture seule. Choisir un autre fichier.</translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>Impossible de créer un fichier temporaire dans le répertoire de '%1': %2</translation>
</message>
@@ -20557,7 +20419,7 @@ Veuillez sélectionner ceux que vous souhaitez effacer définitivement du disque
<translation>Echec du renommage du fichier de sortie temporaire '%1' vers le nom souhaité '%2'</translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation>Avertissement</translation>
</message>
@@ -20571,11 +20433,7 @@ Veuillez déclarer un répertoire valide comme chemin du fichier audio dans les
Souhaitez vous le faire tout de suite ?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Enregistrement du fichier...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation>Erreur d'écriture en '%1'</translation>
</message>
@@ -20634,10 +20492,6 @@ Ces éléments risquent de ne plus être supportés dans les versions futures de
Nous vous recommandons de sauver à nouveau ce fichier en utilisant la version courante de Rosegarden pour être certain qu'il sera encore utilisable avec les versions futures.</translation>
</message>
<message>
- <source><qt><h2>Channels were remapped</h2><p>Beginning with version 10.02, Rosegarden no longer provides controls for changing the channel associated with each MIDI instrument. Instead, each instrument uses the same channel as its instrument number. For example, "MIDI Input System Device #12" always uses channel 12.</p><p>The file you just loaded contained instruments whose channels differed from the instrument numbers. These channels have been reassigned so that instrument #1 will always use channel 1, regardless of what channel it might have used previously. In most cases, you will experience no difference, but you may have to make some small changes to this file in order for it to play as intended. We recommend that you save this file in order to avoid seeing this warning in the future.</p><p>We apologize for any inconvenience.</p></qt></source>
- <translation type="obsolete"><qt><h2>Les canaux ont été redistribués</h2><p>A partir de la version 10.02, Rosegarden ne permet plus de modifier le numéro de canal associé à un instrument MIDI. Maintenant, chaque instrument utilise le canal de même numéro. Par exemple, "MIDI Input System Device #12" utilise toujours le canal 12.</p><p>Le fichier que vous venez de charger contient des instruments associés à des canaux dont les numéros sont différents. Ces canaux doivent être réassignés afin que l'instrument n°1 utilise toujours le canal n°1, quelque fut le canal qui était utilisé auparavant. La plupart du temps vous ne constaterez aucune différence, il se peut cependant qu'une légère modification du fichier soit nécessaire pour obtenir le résultat attendu. Dans ce cas, nous vous recommandons de sauvegarder ce fichier si vous ne voulez plus revoir cet avertissement.</p><p>Nous vous prions de bien vouloir nous excuser si cette évolution vous à occasionné un dérangement.</p></qt></translation>
- </message>
- <message>
<location line="+650"/>
<source>Insert Recorded MIDI</source>
<translation>Insérer un enregistrement Midi</translation>
@@ -20657,7 +20511,7 @@ Nous vous recommandons de sauver à nouveau ce fichier en utilisant la version c
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>La sélection ne doit contenir que des segments audio ou que des segments non-audio</translation>
</message>
@@ -20668,7 +20522,7 @@ Nous vous recommandons de sauver à nouveau ce fichier en utilisant la version c
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20677,7 +20531,7 @@ Nous vous recommandons de sauver à nouveau ce fichier en utilisant la version c
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20698,7 +20552,7 @@ See Edit -> Preferences -> Audio.</source>
Voir : Editer -> Configuration -> Audio.</translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation>Impossible d'ajouter le fichier déposé. Le serveur audio JACK n'est pas disponible.</translation>
</message>
@@ -20767,14 +20621,14 @@ Voir : Editer -> Configuration -> Audio.</translation>
<translation>Démarrage...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> Zoom: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -20803,12 +20657,12 @@ Voulez-vous l'ouvrir à la place ?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Sans titre</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20848,12 +20702,12 @@ L'erreur était : %2</translation>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Tous les fichiers supportés</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20873,33 +20727,33 @@ L'erreur était : %2</translation>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Tous les fichiers</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Ouvrir Fichier</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation></translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -20909,16 +20763,16 @@ L'erreur était : %2</translation>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>Impossible d'ouvrir le fichier %1</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>Enregistrement du fichier...</translation>
</message>
@@ -21015,12 +20869,12 @@ L'erreur était : %2</translation>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Avertissement</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21076,12 +20930,12 @@ Souhaitez vous le faire maintenant ?</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Régler le tempo global</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>(Dés)Activer la barre d'outils...</translation>
</message>
@@ -21149,12 +21003,12 @@ Souhaitez vous le faire maintenant ?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Fichiers projet Rosegarden</translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation><qt><p>Vous devez choisir un nom de fichier pour cette composition avant d'enregistrer de l'audio.</p><p>Les fichiers audio seront choisis dans <b>%1</b> comme <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. Vous pouvez désirer renommer les instruments audio avant d'enregistrer. Pour plus d'information, veuillez consulter le <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Wiki Rosegarden</a>.</p></qt></translation>
</message>
@@ -21164,13 +21018,13 @@ Souhaitez vous le faire maintenant ?</translation>
<translation>Entrée</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-fr</translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21194,8 +21048,8 @@ Souhaitez vous le faire maintenant ?</translation>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21205,7 +21059,7 @@ Souhaitez vous le faire maintenant ?</translation>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21223,8 +21077,8 @@ Souhaitez vous le faire maintenant ?</translation>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21233,12 +21087,12 @@ Souhaitez vous le faire maintenant ?</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation></translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation><h3>Une nouvelle version est disponible</h3></translation>
</message>
@@ -21248,7 +21102,7 @@ Souhaitez vous le faire maintenant ?</translation>
<translation><p>Vous utilisez la version %1. La version %2 est maintenant disponible.</p><p>Pour plus d'information, veuillez consulter le <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">site web Rosegarden</a>.</p></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>Ouvrir un fichier MIDI</translation>
</message>
@@ -21258,12 +21112,12 @@ Souhaitez vous le faire maintenant ?</translation>
<translation>Fusionner un fichier MIDI</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>Importer un fichier MIDI...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>Évaluation de la partition...</translation>
</message>
@@ -21295,36 +21149,24 @@ Souhaitez vous le faire maintenant ?</translation>
<translation>Impossible de charger le fichier Rosegarden X11. Il semble être corrompu.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Ouvrir un fichier Hydrogen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Importer un fichier Hydrogen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Échec d'ouverture du fichier Hydrogen. Il semble corrompu.</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>Echec d'ouverture d'un fichier temporaire pour exporter vers LilyPond.</p><p>Ceci signifie vraisemblablement que votre disque est plein <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>Le processus séquenceur de Rosegarden s'est achevé de façon inattendue. La production et l'enregistrement du son ne seront plus possible pendant cette session.
Veuillez quitter puis relancer Rosegarden pour rétablir ces fonctionnalités.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>Démarrage du séquenceur...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>Sauvegarde du fichier%1sous un nouveau nom...</translation>
@@ -21371,7 +21213,7 @@ No segment will be split.</source>
<translation>Retirer les tempo et chiffrage de la mesure initiaux</translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation>Le séquenceur de Rosegarden n'a pas pu démarrer, le son et l'enregistrement ne seront pas pris en charge lors de cette session.
@@ -21385,7 +21227,7 @@ Afin de recevoir de l'assistance pour configurer correctement votre audio e
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21393,7 +21235,7 @@ Afin de recevoir de l'assistance pour configurer correctement votre audio e
<translation>Exporter...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Échec de la sauvegarde d'un fichier Rosegarden dans un paquetage: %1</translation>
</message>
@@ -21409,12 +21251,12 @@ Afin de recevoir de l'assistance pour configurer correctement votre audio e
<translation>Fichiers MIDI standards</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation>Échec d'exportation. Le fichier n'a pas put être ouvert en écriture.</translation>
+ <translation>Échec d'exportation. Le fichier n'a pas pu être ouvert en écriture.</translation>
</message>
<message>
<location line="-216"/>
@@ -21476,14 +21318,14 @@ Afin de recevoir de l'assistance pour configurer correctement votre audio e
<translation>Exportation en fichier MusicXML...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>Fichiers XML</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-936"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation>Ouvrir un fichier MusicXML</translation>
@@ -21501,7 +21343,7 @@ Afin de recevoir de l'assistance pour configurer correctement votre audio e
</translation>
</message>
<message>
- <location line="+1008"/>
+ <location line="+1003"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -21589,7 +21431,7 @@ Souhaitez vous le faire tout de suite ?</translation>
<translation>Entrer la nouvelle étiquette</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Jouer la liste</translation>
</message>
@@ -21599,7 +21441,7 @@ Souhaitez vous le faire tout de suite ?</translation>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>Insertion d'événements MIDI "panique" pour transmission...</translation>
</message>
@@ -21679,7 +21521,7 @@ Erreur obtenue : %2</translation>
<translation><qt><p>Cliquer et glisser de haut en bas ou de droite à gauche pour modifier.</p><p>Double-cliquer pour éditer directement la valeur.</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Sélectionner une nouvelle valeur</translation>
</message>
@@ -21731,7 +21573,7 @@ Erreur obtenue : %2</translation>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Changer la couleur du segment...</translation>
</message>
@@ -21774,7 +21616,7 @@ Erreur obtenue : %2</translation>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Cliquer sur un segment pour l'effacer</translation>
</message>
@@ -21807,7 +21649,7 @@ Erreur obtenue : %2</translation>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation>&Joindre</translation>
</message>
@@ -21815,7 +21657,7 @@ Erreur obtenue : %2</translation>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>Re&nommer...</translation>
</message>
@@ -21852,22 +21694,22 @@ Erreur obtenue : %2</translation>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>Bouger le Segment</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>Bouger les segments</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Maintenez enfoncé la touche "Majuscules" pour ne pas rester accroché à la grille des temps</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>Cliquer et glisser pour déplacer un segment</translation>
</message>
@@ -21918,7 +21760,7 @@ Erreur obtenue : %2</translation>
<message>
<location line="+14"/>
<source><qt>Click to edit the segment label for any selected segments</qt></source>
- <translation type="unfinished"></translation>
+ <translation><qt>Cliquer pour modifier le nom de tous les segments sélectionnés</qt></translation>
</message>
<message>
<location line="+8"/>
@@ -22063,12 +21905,12 @@ il est nécessaire de supprimer les anciennes transpositions.</translation>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>Maintenir la touche "Majuscules" enfoncée pour ne pas accrocher aux lignes des mesures</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>Enregistrer ou déposer l'audio ici</translation>
</message>
@@ -22144,7 +21986,7 @@ il est nécessaire de supprimer les anciennes transpositions.</translation>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Attention</translation>
</message>
@@ -22168,27 +22010,27 @@ Souhaitez vous le faire tout de suite ?</translation>
<translation>Génération des pré-versions audio...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
- <translation type="unfinished">Redimensionner le segment</translation>
+ <translation>Redimensionner le segment</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Maintenez enfoncé la touche "Majuscules" pour ne pas rester accroché à la grille des temps</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>Maintenir la touche "Majuscules" enfoncée pour ne pas s'accrocher à la grille de la mesure; maintenir de même la touche "Ctrl" pour redimensionner le contenu</translation>
</message>
<message>
<location line="+2"/>
<source>Hold Ctrl to rescale contents</source>
- <translation type="unfinished"></translation>
+ <translation>Maintenir Ctrl pour redimensionner le contenu</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>Cliquer et glisser pour modifier la taille d'un segment; si la touche Ctrl est maintenue enfoncé, le contenu du segment sera également redimensionné</translation>
</message>
@@ -22201,25 +22043,25 @@ Souhaitez vous le faire tout de suite ?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Cliquer et glisser pour sélectionner des segments</translation>
</message>
<message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
<translation>
- <numerusform>Déplace le segment</numerusform>
- <numerusform>Déplacer les segments</numerusform>
+ <numerusform>Déplacer %n Segment(s)</numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+154"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Maintenez enfoncé la touche "Majuscules" pour ne pas rester accroché à la grille des temps</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>Cliquer et glisser pour sélectionner des segments; cliquer avec le bouton du milieu et glisser pour tracer un segment vide</translation>
</message>
@@ -22244,19 +22086,11 @@ Souhaitez vous le faire tout de suite ?</translation>
<translation>Cliquer et glisser pour déplacer le segment; avec Ctrl copier le segment; avec Ctrl + Alt créer un segment lié; double-cliquer pour l'éditer</translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">Cliquer et glisser pour déplacer des segments; si la touche Ctrl est maintenue enfoncée, ils seront copiés</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation>Cliquer et glisser pour copier des segments</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">Cliquer et glisser pour déplacer un segments; si la touche Ctrl est maintenue enfoncée, ils sera copié; double-cliquer pour l'éditer</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation>Cliquer et glisser pour copier un segment</translation>
@@ -22327,24 +22161,12 @@ Souhaitez vous le faire tout de suite ?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Séparer le segment deux fois</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Cliquer sur un segment pour le séparer en deux; Maintenez la touche "Majuscules" pour qu'il ne reste pas accroché à la grille des temps</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>Cliquer sur un segment pour le séparer en deux</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -22400,52 +22222,52 @@ Souhaitez vous le faire tout de suite ?</translation>
<message>
<location filename="../../src/gui/dialogs/SelectDialog.cpp" line="+49"/>
<source>Search and Select</source>
- <translation type="unfinished"></translation>
+ <translation>Chercher et sélectionner</translation>
</message>
<message>
<location line="+12"/>
<source>Duration</source>
- <translation type="unfinished">Durée</translation>
+ <translation>Durée</translation>
</message>
<message>
<location line="+4"/>
<source>Pitch</source>
- <translation type="unfinished">Tessiture</translation>
+ <translation>Tessiture</translation>
</message>
<message>
<location line="+4"/>
<source>Special</source>
- <translation type="unfinished"></translation>
+ <translation>Spécial</translation>
</message>
<message>
<location line="+4"/>
<source>Advanced</source>
- <translation type="unfinished"></translation>
+ <translation>Avancé</translation>
</message>
<message>
<location line="+7"/>
<source>Replace existing selection</source>
- <translation type="unfinished"></translation>
+ <translation>Remplacer la sélection existante</translation>
</message>
<message>
<location line="+1"/>
<source>Extend existing selection</source>
- <translation type="unfinished"></translation>
+ <translation>Agrandir la sélection existante</translation>
</message>
<message>
<location line="+38"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-search-and-select-en</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+275"/>
<source>Include notes with shorter performance durations</source>
- <translation type="unfinished"></translation>
+ <translation>Inclure les notes dont les durées d'exécution sont plus courtes</translation>
</message>
<message>
<location line="+4"/>
<source>Include notes with longer performance durations</source>
- <translation type="unfinished"></translation>
+ <translation>Inclure les notes dont les durées d'exécution sont plus longues</translation>
</message>
</context>
<context>
@@ -24059,7 +23881,7 @@ Si d'autres applications sont actuellement en fonctionnement, les arrêter
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><Sans instrument></translation>
</message>
@@ -24074,19 +23896,7 @@ Si d'autres applications sont actuellement en fonctionnement, les arrêter
<translation><Sans titre></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Attention</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Le chemin du fichier audio n'existe pas ou ne peut pas être écrit.
-Veuillez déclarer un répertoire valide comme chemin du fichier audio dans les Paramètres du Document avant d'enregistrer en audio.
-Souhaitez vous le faire tout de suite ?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Assourdir la piste</translation>
</message>
@@ -24099,25 +23909,17 @@ Souhaitez vous le faire tout de suite ?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Transformer les répétitions du segment en véritables copies</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Transformer les répétitions des segments en véritables copies</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
- <translation type="unfinished"></translation>
+ <translation>Supprimer les pistes</translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
- <translation type="unfinished"></translation>
+ <translation>Supprimer les segments</translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform>Transformer un segment répété en segments indépendants</numerusform>
@@ -24125,7 +23927,7 @@ Souhaitez vous le faire tout de suite ?</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform>Transformer un segment lié en une copie indépendante</numerusform>
@@ -24133,7 +23935,7 @@ Souhaitez vous le faire tout de suite ?</translation>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24171,23 +23973,15 @@ Souhaitez vous le faire tout de suite ?</translation>
<translation><qt>Le nom court est une autre version du nom qui est affiché à chaque saut de ligne du système de portées, exemple "Tr."</qt></translation>
</message>
<message>
- <source>The track name is also the notation staff name, eg. "Trumpet."</source>
- <translation type="obsolete"><qt>Le nom de la piste est aussi le nom de la portée sur la partition, exemple "Trompette"</qt></translation>
- </message>
- <message>
<location line="-2"/>
<source>Enter short name</source>
<translation>Entrer le nom court</translation>
</message>
- <message>
- <source>The short name is an alternate name that appears each time the staff system wraps, eg. "Tr."</source>
- <translation type="obsolete"><qt>Le nom court est une autre version du nom qui est affiché à chaque saut de ligne du système de portées, exemple "Tr."</qt></translation>
- </message>
</context>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Piste</translation>
</message>
@@ -24198,12 +23992,12 @@ Souhaitez vous le faire tout de suite ?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><Sans titre></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Paramètres d'exécution</translation>
</message>
@@ -24344,117 +24138,197 @@ Souhaitez vous le faire tout de suite ?</translation>
<translation><qt><p>Les nouveaux segments seront créés avec cette clef comme premier élément</p></qt></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation><qt><p>Choix de la plus basse note jouable suggérée sur les portées de ce type</p></qt></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation><qt><p>Choix de la plus haute note jouable suggérée sur les portées de ce type</p></qt></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation><qt><p>Choix du périphérique utilisé pour cette piste à l'exécution.</p><p>Si aucun son n'est produit, cliquer <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> pour connecter ce périphérique à une sortie utile</p></qt></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation><qt><p>Cette piste n'enregistrera qu'à partir du canal Audio/ MIDI sélectionné. Tous les autres canaux seront ignorés.</p></qt></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation><qt><p>Choix d'une taille de caractères musicaux (normale, petite ou minuscule) pour cette portée (dont la taille restera normale) à l'exportation vers LilyPond.</p><p>C'est le maximum que nous puissions faire pour vous permettre d'imprimer le rappel d'une partie dans la partition d'une autre partie.</p></qt></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation><qt><p>Charge une préselection de paramètres de segments à partir de notre base de données d'instruments de musique réels.</p><p>Les nouveaux segments créés utiliseront ces paramètres. Pour utiliser ces paramètres sur des segments préexistants (par exemple pour convertir une partie écrite pour un instrument en Ut en vue de la jouer sur une trompette en Si b) utiliser <b>Segment -> Convertir cette partition pour...</b> dans l'éditeur de partition.</p></qt></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
+ <comment>Clef name</comment>
<translation>Sol</translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
+ <comment>Clef name</comment>
<translation>Fa</translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation>Sol +15va</translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
+ <comment>Clef name</comment>
<translation>Sol +8va</translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
+ <comment>Clef name</comment>
<translation>Sol -15va</translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
+ <comment>Clef name</comment>
<translation>Fa -8va</translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation>Fa +15va</translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation>Fa +8va</translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation>Sol 1ère</translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
+ <comment>Clef name</comment>
<translation>Ut 1ère</translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
+ <comment>Clef name</comment>
<translation>Ut 2ème</translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
+ <comment>Clef name</comment>
<translation>Ut 3ème</translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
+ <comment>Clef name</comment>
<translation>Ut 4ème</translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
+ <comment>Clef name</comment>
<translation>Ut 5ème</translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
+ <comment>Clef name</comment>
<translation>Fa 3ème</translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
+ <comment>Clef name</comment>
<translation>Fa 5ème</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
+ <translation><qt><p>Choix de la plus basse note jouable suggérée sur les portées de ce type</p></qt></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation><qt><p>Choix de la plus haute note jouable suggérée sur les portées de ce type</p></qt></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation><qt><p>Choix du périphérique utilisé pour cette piste à l'exécution.</p><p>Si aucun son n'est produit, cliquer <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> pour connecter ce périphérique à une sortie utile</p></qt></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation><qt><p>Cette piste n'enregistrera qu'à partir du canal Audio/ MIDI sélectionné. Tous les autres canaux seront ignorés.</p></qt></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation><qt><p>Choix d'une taille de caractères musicaux (normale, petite ou minuscule) pour cette portée (dont la taille restera normale) à l'exportation vers LilyPond.</p><p>C'est le maximum que nous puissions faire pour vous permettre d'imprimer le rappel d'une partie dans la partition d'une autre partie.</p></qt></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation><qt><p>Charge une préselection de paramètres de segments à partir de notre base de données d'instruments de musique réels.</p><p>Les nouveaux segments créés utiliseront ces paramètres. Pour utiliser ces paramètres sur des segments préexistants (par exemple pour convertir une partie écrite pour un instrument en Ut en vue de la jouer sur une trompette en Si b) utiliser <b>Segment -> Convertir cette partition pour...</b> dans l'éditeur de partition.</p></qt></translation>
+ </message>
+ <message>
+ <source>treble</source>
+ <translation type="obsolete">Sol</translation>
+ </message>
+ <message>
+ <source>bass</source>
+ <translation type="obsolete">Fa</translation>
+ </message>
+ <message>
+ <source>crotales</source>
+ <translation type="obsolete">Sol +15va</translation>
+ </message>
+ <message>
+ <source>xylophone</source>
+ <translation type="obsolete">Sol +8va</translation>
+ </message>
+ <message>
+ <source>guitar</source>
+ <translation type="obsolete">Sol -15va</translation>
+ </message>
+ <message>
+ <source>contrabass</source>
+ <translation type="obsolete">Fa -8va</translation>
+ </message>
+ <message>
+ <source>celesta</source>
+ <translation type="obsolete">Fa +15va</translation>
+ </message>
+ <message>
+ <source>old celesta</source>
+ <translation type="obsolete">Fa +8va</translation>
+ </message>
+ <message>
+ <source>french</source>
+ <translation type="obsolete">Sol 1ère</translation>
+ </message>
+ <message>
+ <source>soprano</source>
+ <translation type="obsolete">Ut 1ère</translation>
+ </message>
+ <message>
+ <source>mezzosoprano</source>
+ <translation type="obsolete">Ut 2ème</translation>
+ </message>
+ <message>
+ <source>alto</source>
+ <translation type="obsolete">Ut 3ème</translation>
+ </message>
+ <message>
+ <source>tenor</source>
+ <translation type="obsolete">Ut 4ème</translation>
+ </message>
+ <message>
+ <source>baritone</source>
+ <translation type="obsolete">Ut 5ème</translation>
+ </message>
+ <message>
+ <source>varbaritone</source>
+ <translation type="obsolete">Fa 3ème</translation>
+ </message>
+ <message>
+ <source>subbass</source>
+ <translation type="obsolete">Fa 5ème</translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation>Transposer</translation>
</message>
@@ -24495,7 +24369,7 @@ Souhaitez vous le faire tout de suite ?</translation>
<translation><qt><p>Les nouveaux segments créés auront cette couleur</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Audio</translation>
@@ -24891,13 +24765,6 @@ Souhaitez vous le faire tout de suite ?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Ui</name>
- <message>
- <source>[ No port ]</source>
- <translation type="obsolete">[ Pas de port ]</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::UnGraceCommand</name>
<message>
<location filename="../../src/commands/notation/UnGraceCommand.h" line="+43"/>
@@ -25134,13 +25001,6 @@ Souhaitez vous le faire tout de suite ?</translation>
</message>
</context>
<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">(enregistré)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/id.ts b/data/locale/id.ts
index fec33a8..1485ebc 100644
--- a/data/locale/id.ts
+++ b/data/locale/id.ts
@@ -331,23 +331,23 @@
<translation>Tidak dapat membuka berkas pemetaan huruf %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&Berkas</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>T&ambah Berkas Suara...</translation>
</message>
@@ -357,54 +357,54 @@
<translation>&Ekspor Berkas Suara...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>&Tutup</translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Sunting</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>Melepas Berkas S&uara</translation>
</message>
@@ -429,350 +429,346 @@
<translation>Putar Pratampil</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>&Bantuan</translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation>F1</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">Tutorial &Rosegarden</translation>
- </message>
- <message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>Panduan Melaporkan &Kode Hama</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>Tent&ang Rosegarden</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Baris Alat Umum</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>Tidak ada yang bisa dibatalka&n</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>Tidak ada &yang bisa diulang</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>&Salin</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16m Ctrl+Ins</translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>Tem&pel</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Pindah ke Perkakas Seleksi</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Pindah ke Modus Sisip Not</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Pindah ke Perkakas Hapus</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>&Simpan</translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation>Delete</translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>Po&tong</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation>Pilih &Semua</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>Bersihkan Se&leksi</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>&Penyaring Seleksi</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation></translation>
</message>
@@ -782,82 +778,82 @@
<translation>Atur Durasi Seg&men...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Tampilan</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>Waktu &Musikal</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>Waktu N&yata</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Se&gmen</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Sunting &Dengan</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Buka di Penyunting Matri&ks</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Buka di Penyunting &Notasi</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>Tentang &Qt</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>Tambah &Segno</translation>
</message>
@@ -887,7 +883,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation type="unfinished"></translation>
</message>
@@ -907,12 +903,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>Tampilkan Baris Alat &Simbol</translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>Baris Alat Durasi</translation>
</message>
@@ -922,7 +918,7 @@
<translation>Baris Alat Simbol</translation>
</message>
<message>
- <location line="+73"/>
+ <location line="-2670"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -997,47 +993,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>Enter</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -1107,7 +1103,7 @@
<translation>End</translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>&Tampilkan Baris Alat</translation>
</message>
@@ -1117,39 +1113,39 @@
<translation>Sembunyik&an Baris Status</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Baris Alat Aksi</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Baris Alat Waktu</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Baris Alat Transpor</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Baris Alat Zum</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1199,7 +1195,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Sisip Penanda</translation>
</message>
@@ -1219,125 +1215,117 @@
<translation>Sunting Penanda</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation>F2</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Pindah ke Perkakas Pindah</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation>F5</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Pindah ke Perkakas Gambar</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation>F3</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Pindah ke Perkakas Pengubah Ukuran</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation>F4</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">Tidak ada yang bisa dibatalka&n</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Tidak ada &yang bisa diulang</translation>
- </message>
- <message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>&Hapus</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Delete, Ctrl+D</translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation>Jejarin&g</translation>
</message>
@@ -1353,13 +1341,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation>0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation>Kancing ke &1/48</translation>
</message>
@@ -1370,13 +1358,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation>Kancing ke 1/&24</translation>
</message>
@@ -1387,13 +1375,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation>Kan&cing ke 1/12</translation>
</message>
@@ -1404,13 +1392,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation>8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation>Kancing ke &3/16</translation>
</message>
@@ -1421,13 +1409,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation>Kancing ke 3/8</translation>
</message>
@@ -1438,37 +1426,37 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation>Kancing ke Ke&tukan</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation>Kancing ke &Bar</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1479,143 +1467,143 @@
</message>
<message>
<location line="+25"/>
- <location line="+1550"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2744"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&Komposisi</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Tambah Perubahan Te&mpo...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation>=</translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation>+</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation>-</translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Kiri</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Kanan</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Atas</translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Bawah</translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation>Atas</translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation>Bawah</translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Atas</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Bawah</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Alt+I</translation>
@@ -1628,679 +1616,679 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Kiri</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Kanan</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Kiri</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Kanan</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+;</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgUp</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgDown</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation>Kiri</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation>Kanan</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Kiri</translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Kanan</translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation>F7</translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I/do</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>I/do tajam</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II/re datar</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II/re</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation>S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II/re tajam</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III/mi datar</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III/mi</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV/fa</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV/fa tajam</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V/sol datar</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V/sol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V/sol tajam</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI/la datar</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI/la</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI/la tajam</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII/ti datar</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII/ti</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation>L</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+E</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation>R</translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Shift+R</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation>U</translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+I</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+I</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation>O</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation>Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+X</translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation>X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Shift+X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation>V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Shift+V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation>N</translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+M</translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation>M</translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation>H</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2516"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -2325,7 +2313,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+929"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Shift+X</translation>
@@ -2372,14 +2360,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="+4"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-1269"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2445"/>
+ <location line="+17"/>
<source>Ctrl+Alt++</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -2477,14 +2470,14 @@
<translation>Ctrl+U</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+R</translation>
@@ -2502,8 +2495,8 @@
<translation>Ctrl+)</translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation>~</translation>
@@ -2521,27 +2514,27 @@
<translation>></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>Se&tel</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Kuantisasi</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>&Kuantisasi...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>Ulang Kuantisasi Terakhi&r</translation>
</message>
@@ -2552,36 +2545,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>Na&ikkan Velositas</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>Ku&rangi Velositas</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -2597,315 +2590,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>Trans&pos</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>Naik Setengah &Nada</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>Turun Setengah Na&da</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>Naik Satu &Oktaf</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>Turun Satu Okta&f</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>&Transposisi oleh Setengah Nada...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Transposisi oleh &Interval...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>&Konversi</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>Kebal&ikan</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>Perkaka&s</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>Pilih dan &Sunting</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>Hapu&s</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Pindah</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>Ubah Uku&ran</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>&Pisah</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>&Velositas</translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>T&ranspor</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>&Putar</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&Henti</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>Putar &Ulang</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Putar Ce&pat</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Putar Ulang &ke Awal</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>S&olo</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>P&anic</translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation type="unfinished">Oktaf Ting&gi</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>Baris Ala&t</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>Pengga&ris</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>Tampilkan Peng&garis Nama Padu Nada</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>Tampilkan Penggaris &Tempo</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Baris Alat Perkakas</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>&Rekam</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>Pengatur&an</translation>
</message>
@@ -2990,7 +2983,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Pindah ke Perkakas Sisip</translation>
</message>
@@ -3000,13 +2993,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>&Cetak...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>P&ratampil cetak...</translation>
</message>
@@ -3101,21 +3094,21 @@
<translation>Tampilkan &Tajuk Jalur</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Buka di Penyunting Matriks &Perkusi</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Tambah Perubahan &Kunci...</translation>
</message>
@@ -3130,13 +3123,13 @@
<translation>Tambah Pelepasan Peda&l</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2110"/>
+ <location line="+1"/>
<source>Add &Layer</source>
<translation>Tambah &Lapis</translation>
</message>
@@ -3152,7 +3145,7 @@
<translation>N&ot</translation>
</message>
<message>
- <location line="-1510"/>
+ <location line="-2706"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -3163,51 +3156,51 @@
</message>
<message>
<location line="+355"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1030"/>
- <location line="+1936"/>
+ <location line="-2226"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2526"/>
+ <location line="+105"/>
<source>&Guess Beats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -3508,8 +3501,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation type="unfinished"></translation>
</message>
@@ -3585,14 +3578,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation type="unfinished"></translation>
</message>
@@ -3672,14 +3665,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+N</translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation type="unfinished"></translation>
</message>
@@ -3689,8 +3682,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+=</translation>
@@ -3798,13 +3791,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>&Visibilitas</translation>
</message>
@@ -3861,26 +3854,26 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>Segmen Sebelumn&ya</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>Segmen Selanjutn&ya</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation type="unfinished"></translation>
</message>
@@ -4025,14 +4018,14 @@
<translation>Padu Nada &Gitar</translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>S&isip Not</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>Oktaf Ren&dah</translation>
</message>
@@ -4052,13 +4045,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -4078,18 +4071,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+O</translation>
@@ -4102,13 +4095,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Ins</translation>
@@ -4119,7 +4112,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+767"/>
<source>Show &Annotations</source>
<translation type="unfinished"></translation>
</message>
@@ -4129,7 +4122,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -4149,7 +4142,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation type="unfinished"></translation>
</message>
@@ -4170,48 +4163,48 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>&Manual Rosegarden</translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>Preferensi...</translation>
</message>
<message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Baris Alat Penggaris</translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>&Preferensi...</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation>Tampilkan Ba&ris Alat Penggaris</translation>
</message>
@@ -4221,8 +4214,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1014"/>
- <location line="+1754"/>
+ <location line="-2209"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation type="unfinished"></translation>
</message>
@@ -4232,13 +4225,13 @@
<translation>Putar</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation>&Aksi</translation>
</message>
@@ -4258,14 +4251,14 @@
<translation>Bantuan</translation>
</message>
<message>
- <location line="+809"/>
- <location line="+1724"/>
+ <location line="-1214"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1918"/>
- <location line="+1302"/>
+ <location line="-3114"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation type="unfinished"></translation>
</message>
@@ -4275,7 +4268,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+307"/>
+ <location line="+308"/>
<source>&Figuration</source>
<translation type="unfinished"></translation>
</message>
@@ -4526,21 +4519,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation>P</translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
@@ -4711,7 +4704,7 @@
<translation>Baris Alat Lapis</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Pindah ke Perkakas Sisip</translation>
</message>
@@ -4766,7 +4759,7 @@
<translation>Buat Terlihat</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation type="unfinished"></translation>
</message>
@@ -4806,7 +4799,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>&Baru</translation>
</message>
@@ -4816,14 +4809,6 @@
<translation>&Impor</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Impor berkas &Proyek Rosegarden...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Impor berkas &MIDI...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>Impor berkas &Hydrogen...</translation>
@@ -4839,10 +4824,6 @@
<translation>Gabungkan Ber&kas...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Gabungkan berkas &MIDI...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Gabungkan berkas &Hydrogen...</translation>
@@ -4853,26 +4834,6 @@
<translation>&Ekspor</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Ekspor berkas &Proyek Rosegarden...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Ekspor berkas &MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Ekspor berkas skor &Csound...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Ekspor berkas M&up...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Ekspor berkas Music&XML...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>&Buka...</translation>
@@ -4883,10 +4844,6 @@
<translation>Te&rakhir Dibuka</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Simpan Sebag&ai...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>Simpan sebagai Pale&t...</translation>
@@ -5003,13 +4960,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation>&Studio</translation>
</message>
@@ -5069,53 +5026,49 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Buka &di Penyunting Baku</translation>
- </message>
- <message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>Ganti Lab&el...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>Ul&angi Kuantisasi Terakhir</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>Atur &Durasi...</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Gabung</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>Pi&sah</translation>
</message>
@@ -5230,26 +5183,26 @@
<translation>Petakan Ulang Inst&rumen...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>Ubah Uku&ran</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>Tampilkan Baris Ala&t Utama</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>Tampil&kan Baris Alat Jalur</translation>
</message>
@@ -5264,27 +5217,19 @@
<translation>Tampilkan Baris Alat &Zum</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>Tampilkan B&aris Status</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Impor berkas &X11 Rosegarden...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Gabungkan berkas &X11 Rosegarden...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>Mi&kser MIDI</translation>
@@ -5295,10 +5240,6 @@
<translation>Tampilkan Penggaris Te&mpo</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Ekspor berkas &LilyPond...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>Tampilkan Tra&nspor</translation>
@@ -5345,26 +5286,26 @@
<translation>Baris Alat Penyunting</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>Dukung &Rosegarden</translation>
</message>
<message>
- <location line="+221"/>
+ <location line="-1791"/>
<source>Insert Tempo Change</source>
<translation>Sisip Perubahan Tempo</translation>
</message>
@@ -5404,7 +5345,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>Sunting It&em</translation>
</message>
@@ -5424,7 +5365,7 @@
<translation>&Preferensi</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation type="unfinished"></translation>
</message>
@@ -6745,7 +6686,7 @@
<translation>Simbal Cina</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2626"/>
+ <location filename="../QMenuStrings.cpp" line="+345"/>
<location filename="../InstrumentStrings.cpp" line="+1"/>
<source>Triangle</source>
<translation type="unfinished"></translation>
@@ -7229,35 +7170,30 @@
<translation>Tembakan pistol</translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-25"/>
<source>Synth plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>Suara</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1 %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -7272,10 +7208,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 Kontroler %2 %3</translation>
</message>
@@ -7290,7 +7226,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Selamat Datang!</translation>
</message>
@@ -7398,7 +7334,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -7410,40 +7346,48 @@
<translation type="unfinished">Berkas suara jelek</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation type="unfinished"></translation>
</message>
@@ -10814,10 +10758,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Blue pastel</source>
- <translation type="obsolete">Biru pastel</translation>
- </message>
- <message>
<location line="+2"/>
<source>Red pastel</source>
<translation>Merah pastel</translation>
@@ -10867,7 +10807,7 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
@@ -10913,52 +10853,100 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
<location filename="../../src/base/figuration/SegmentFigData.cpp" line="+53"/>
<source>Replace segment contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/base/figuration/SegmentID.cpp" line="+69"/>
- <source>Chord Source Segment</source>
- <translation type="unfinished"></translation>
+ <location filename="../../src/base/figuration/SegmentID.cpp" line="+69"/>
+ <source>Chord Source Segment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Figuration Source Segment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Generated Segment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Segment of unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/base/parameterpattern/RelativeRamp.cpp" line="+30"/>
+ <source>Relative Ramp - modify existing %1 values linearly</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Increase first value this much: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Increase last value this much: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/commands/segment/UpdateFigurationCommand.cpp" line="+27"/>
+ <source>Update Figurations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Lilypond tidak memperbolehkan spasi atau garis miring dalam nama berkas.
+
+Apakah Anda ingin menggunakan
+
+ %1
+
+ di dalam nama berkas?</translation>
</message>
<message>
- <location line="+2"/>
- <source>Figuration Source Segment</source>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Generated Segment</source>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Segment of unknown type</source>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/base/parameterpattern/RelativeRamp.cpp" line="+30"/>
- <source>Relative Ramp - modify existing %1 values linearly</source>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <source>Increase first value this much: </source>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Increase last value this much: </source>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/segment/UpdateFigurationCommand.cpp" line="+27"/>
- <source>Update Figurations</source>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -10976,17 +10964,9 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Hak cipta 2000-2010 pada tim pengembang Rosegarden</p><p>Versi %1 versi Qt %2<br>Kunci bangun: %3</p><p>Rosegarden dipersembahkan untuk Anda oleh tim dari para relawan di penjuru dunia. Untuk daftar kontributor, kunjungi <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Untuk informasi lebih lanjut mengenai Rosegarden, kunjungi <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Lisensi: Lisensi Publik Umum GNU Versi 2</p> {2000-2011 ?} {1 ?} {2<?} {3<?} {2<?}</translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Hak cipta 2000-2010 pada tim pengembang Rosegarden</p><p>Versi %1 versi Qt %2<br>Kunci bangun: %3</p><p>Rosegarden dipersembahkan untuk Anda oleh tim dari para relawan di penjuru dunia. Untuk daftar kontributor, kunjungi <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Untuk informasi lebih lanjut mengenai Rosegarden, kunjungi <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Lisensi: Lisensi Publik Umum GNU Versi 2</p></translation>
- </message>
</context>
<context>
<name>Rosegarden::ActionCommandArgumentQuerier</name>
@@ -11046,12 +11026,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation type="unfinished">Tambah S&lur</translation>
</message>
@@ -11546,14 +11526,6 @@
<translation type="unfinished">Mengonversi berkas suara...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">Mensampel ulang berkas suara...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">Mengonversi dan mensampel ulang berkas suara...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation>Mengimpor berkas suara...</translation>
@@ -11567,24 +11539,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Klik untuk mengubah nama instrumen ini</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>Klik tombol di atas untuk mengubah nama instrumen ini</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><tidak ada sintetiser></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><tidak ada pengaya></translation>
</message>
@@ -11637,10 +11609,6 @@
<translation>Berkas</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><tidak ada berkas suara></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Simpan Berkas Sebagai</translation>
@@ -11766,10 +11734,6 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<translation>Masukkan label baru</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">mengimpor berkas suara jarak jauh</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>mengimpor berkas suara yang perlu dikonversi atau disampel ulang</translation>
@@ -11804,7 +11768,7 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Mikser Suara</translation>
</message>
@@ -11820,20 +11784,20 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>Tingkat suara</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Mono atau stereo</translation>
</message>
@@ -11844,21 +11808,21 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><nihil></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>Klik untuk memuat pengaya suara</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>Klik untuk mengubah nama instrumen ini</translation>
</message>
@@ -11878,7 +11842,7 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<translation>Klik tombol di atas untuk mengubah nama instrumen ini</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Sub %1</translation>
</message>
@@ -11894,14 +11858,14 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<translation>Master</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><tidak ada pengaya></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</translation>
</message>
@@ -12480,7 +12444,7 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<translation>Sungguh-sungguh ingin menghapus bank ini?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>Sungguh-sungguh ingin menghapus pemetaan kunci ini?</translation>
</message>
@@ -12664,6 +12628,120 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"> </translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -12987,7 +13065,7 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13212,7 +13290,7 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Velositas</translation>
</message>
@@ -13228,7 +13306,7 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation type="unfinished"></translation>
</message>
@@ -13243,12 +13321,13 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation type="unfinished"></translation>
</message>
@@ -13256,7 +13335,7 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>&Salin</translation>
</message>
@@ -13266,7 +13345,7 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<translation>(kutipan)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(disalin)</translation>
</message>
@@ -13336,7 +13415,7 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>Po&tong</translation>
</message>
@@ -13400,12 +13479,12 @@ Silakan pilih salah satu yang hendak dibuang permanen dari hard disk.
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation type="unfinished">[ Tiada port ]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -14033,22 +14112,6 @@ This could cause problems if it overrides a different computed value later on.</
<source>Value</source>
<translation>Nilai</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Nilai Pertama</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Nilai Kedua</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Nilai Rendah</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Nilai Tinggi</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14443,14 +14506,6 @@ Apakah Anda ingin tetap mencari berkas ini atau melewatinya saja?</translation>
<translation>Mengunduh %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Gagal terhubung ke server FTP</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Gagal masuk</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Proses unduh dibatalkan</translation>
@@ -14778,10 +14833,6 @@ Apakah Anda ingin tetap mencari berkas ini atau melewatinya saja?</translation>
<translation>Adobe Acrobat Reader (tidak bebas)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation>Dipakai untuk melihat hasil LilyPond</translation>
@@ -14792,10 +14843,6 @@ Apakah Anda ingin tetap mencari berkas ini atau melewatinya saja?</translation>
<translation>Utilitas cetak berkas dari baris perintah</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">KPrinter (KDE 3)</translation>
- </message>
- <message>
<location line="+5"/>
<source>Gtk-LP (GNOME)</source>
<translation>Gtk-LP (GNOME)</translation>
@@ -15377,7 +15424,7 @@ Teks contoh dari berkas:</translation>
<translation>Parameter Instrumen</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Jalur</translation>
</message>
@@ -15385,7 +15432,7 @@ Teks contoh dari berkas:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -15770,7 +15817,6 @@ Teks contoh dari berkas:</translation>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15778,7 +15824,7 @@ Would you like to use
%1
instead?</source>
- <translation>Lilypond tidak memperbolehkan spasi atau garis miring dalam nama berkas.
+ <translation type="obsolete">Lilypond tidak memperbolehkan spasi atau garis miring dalam nama berkas.
Apakah Anda ingin menggunakan
@@ -15786,41 +15832,6 @@ Apakah Anda ingin menggunakan
di dalam nama berkas?</translation>
</message>
- <message>
- <location line="+11"/>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1823"/>
- <source>warning: overlong bar truncated here</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>warning: bar too short, padding with rests</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Rosegarden::LilyPondOptionsDialog</name>
@@ -15850,10 +15861,6 @@ Apakah Anda ingin menggunakan
<translation type="unfinished"></translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Jalur terpilih</translation>
- </message>
- <message>
<location line="+16"/>
<source>Compatibility level</source>
<translation>Tingkat kompatibilitas</translation>
@@ -16529,7 +16536,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -16614,12 +16621,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Tidak ada koneksi</translation>
</message>
@@ -16843,6 +16845,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17046,12 +17057,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation type="unfinished"></translation>
</message>
@@ -17210,7 +17221,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation type="unfinished"></translation>
</message>
@@ -17286,7 +17297,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:matrix-en</translation>
</message>
@@ -17302,8 +17313,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -17318,7 +17328,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation type="unfinished"></translation>
</message>
@@ -17343,20 +17353,15 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>Matriks</translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Zum</translation>
</message>
@@ -17376,7 +17381,7 @@ Double-click to open the marker editor.</source>
<translation>Atur Ulang Zum</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -17499,7 +17504,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>Mikser MIDI</translation>
</message>
@@ -17514,7 +17519,7 @@ Double-click to open the marker editor.</source>
<translation>Instrumen</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</translation>
</message>
@@ -17811,13 +17816,13 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Notasi</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Modus tampilan baku</translation>
</message>
@@ -18390,7 +18395,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> Huruf: </translation>
</message>
@@ -18410,7 +18415,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation> Spasi: </translation>
</message>
<message>
- <location line="+2538"/>
+ <location line="+2563"/>
<source>Chord</source>
<translation>Padu Nada</translation>
</message>
@@ -18427,7 +18432,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>%1 %2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation type="unfinished"></translation>
</message>
@@ -18452,17 +18457,17 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>Opsi pratampil LilyPond</translation>
</message>
<message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Papan klip kosong</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -18480,23 +18485,22 @@ This is a bug (the program would previously have crashed by now)</source>
<translation> Tidak ada seleksi </translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+85"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>Mencetak dengan LilyPond...</translation>
</message>
@@ -18511,29 +18515,29 @@ This is a bug (the program would previously have crashed by now)</source>
<translation><qt><p>Gagal membuka berkas temporer untuk ekspor LilyPond.</p><p>Mungkin saja ini diakibatkan Anda kekurangan ruang kosong disk pada <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>Memasukkan isi papan klip...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>Menaikkan velositas...</translation>
</message>
@@ -18543,10 +18547,6 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>Menurunkan velositas...</translation>
</message>
<message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Mengatur Velositas...</translation>
- </message>
- <message>
<location line="+744"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished"></translation>
@@ -18567,10 +18567,6 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Buat Ornamen</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>Pakai Ornamen</translation>
@@ -18606,7 +18602,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation type="unfinished"></translation>
@@ -18617,7 +18613,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation type="unfinished"></translation>
</message>
@@ -18650,7 +18646,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation type="unfinished"></translation>
</message>
@@ -18720,16 +18716,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Cycling slashes...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Zum</translation>
</message>
@@ -18754,7 +18745,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
@@ -18986,10 +18977,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>Preset:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">Pengguna</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -19217,14 +19204,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Nilai (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Durasi (%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation type="unfinished"></translation>
@@ -19245,19 +19224,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resolution:</source>
- <translation type="obsolete">Resolusi:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation type="unfinished"></translation>
@@ -19592,10 +19563,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Rosegarden</source>
<translation type="unfinished">Rosegarden</translation>
</message>
- <message>
- <source><qt><h3>Processing...</h3></qt></source>
- <translation type="obsolete"><qt><h3>Memproses...</h3></qt></translation>
- </message>
</context>
<context>
<name>Rosegarden::ProjectPackager</name>
@@ -19788,13 +19755,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1 kontroler</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -19882,12 +19842,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Nihil</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation type="unfinished"></translation>
</message>
@@ -19952,7 +19912,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation type="unfinished"></translation>
</message>
@@ -20253,10 +20213,6 @@ Mungkin saja ada beberapa ketidakcocokan dengan format berkasnya.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <source>Open Directory</source>
- <translation type="obsolete">Buka Direktori</translation>
- </message>
- <message>
<location line="+1335"/>
<source>Loading plugins...</source>
<translation>Memuat pengaya...</translation>
@@ -20295,8 +20251,8 @@ Mungkin saja ada beberapa ketidakcocokan dengan format berkasnya.</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20308,7 +20264,7 @@ Mungkin saja ada beberapa ketidakcocokan dengan format berkasnya.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>Tidak dapat menyimpan dokumen pada %1</translation>
</message>
@@ -20380,7 +20336,12 @@ Please select any you wish to delete permanently from the hard disk.
<translation>Gabung</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation type="unfinished"></translation>
</message>
@@ -20395,7 +20356,7 @@ Please select any you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished">Peringatan</translation>
</message>
@@ -20407,11 +20368,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Menyimpan berkas...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation type="unfinished"></translation>
</message>
@@ -20489,7 +20446,7 @@ Kami menyarankan supaya Anda menyimpan ulang berkas ini dari versi Rosegarden ya
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation type="unfinished"></translation>
</message>
@@ -20500,7 +20457,7 @@ Kami menyarankan supaya Anda menyimpan ulang berkas ini dari versi Rosegarden ya
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20509,7 +20466,7 @@ Kami menyarankan supaya Anda menyimpan ulang berkas ini dari versi Rosegarden ya
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20529,7 +20486,7 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -20539,10 +20496,6 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">mengimpor berkas suara jarak jauh</translation>
- </message>
- <message>
<location line="+28"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>mengimpor berkas suara yang perlu dikonversi atau disampel ulang</translation>
@@ -20602,14 +20555,14 @@ See Edit -> Preferences -> Audio.</source>
<translation>Memulai...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> Zum: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -20637,12 +20590,12 @@ Do you want to open it instead ?</source>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Tanpa Judul</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20682,12 +20635,12 @@ Kesalahan adalah: %2</translation>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Semua berkas yang didukung</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20707,33 +20660,33 @@ Kesalahan adalah: %2</translation>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Semua berkas</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Buka Berkas</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -20743,16 +20696,16 @@ Kesalahan adalah: %2</translation>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>Tidak dapat membuka berkas %1</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>Menyimpan berkas...</translation>
</message>
@@ -20854,12 +20807,12 @@ Kesalahan adalah: %2</translation>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Peringatan</translation>
</message>
<message>
- <location line="-2767"/>
+ <location line="-2756"/>
<source>Jog Selection</source>
<translation type="unfinished"></translation>
</message>
@@ -20906,12 +20859,12 @@ Kesalahan adalah: %2</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Atur Tempo Global</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation type="unfinished"></translation>
</message>
@@ -20976,23 +20929,23 @@ Kesalahan adalah: %2</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Berkas Proyek Rosegarden</translation>
</message>
<message>
- <location line="+1713"/>
+ <location line="+1708"/>
<source>Input</source>
<translation>Masukan</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-en</translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21016,8 +20969,8 @@ Kesalahan adalah: %2</translation>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21027,7 +20980,7 @@ Kesalahan adalah: %2</translation>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21045,8 +20998,8 @@ Kesalahan adalah: %2</translation>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21055,12 +21008,12 @@ Kesalahan adalah: %2</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation><h3>Tersedia versi lebih baru</h3></translation>
</message>
@@ -21070,7 +21023,7 @@ Kesalahan adalah: %2</translation>
<translation><p>Anda memakai versi %1. Versi %2 sudah tersedia.</p><p>Silakan kunjungi <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">situs Rosegarden</a> untuk informasi lebih lanjut.</p></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>Buka Berkas MIDI</translation>
</message>
@@ -21080,12 +21033,12 @@ Kesalahan adalah: %2</translation>
<translation>Gabung Berkas MIDI</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>Mengimpor berkas MIDI...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>Menkalkulasi notasi...</translation>
</message>
@@ -21117,35 +21070,23 @@ Kesalahan adalah: %2</translation>
<translation>Tidak dapat memuat berkas X11 Rosegarden. Sepertinya rusak.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Buka Berkas Hydrogen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Mengimpor berkas Hydrogen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Tidak dapat memuat berkas Hydrogen. Sepertinya rusak..</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>Gagal membuka berkas temporer untuk ekspor LilyPond.</p><p>Mungkin saja ini diakibatkan Anda kekurangan ruang kosong pada <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>Memulai sekuenser...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>Menyimpan berkas%1dengan nama baru...</translation>
@@ -21187,7 +21128,7 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1394"/>
+ <location line="+1388"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation type="unfinished"></translation>
@@ -21217,7 +21158,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21225,7 +21166,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation>Ekspor sebagai...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -21241,7 +21182,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation>Berkas MIDI standar</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21308,9 +21249,9 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation>Mengekspor berkas MusicXML...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>Berkas XML</translation>
</message>
@@ -21404,21 +21345,17 @@ Would you like to set it now?</source>
<translation>Berikan label baru</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Daftar Main</translation>
</message>
<message>
- <source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
- <translation type="obsolete">http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</translation>
- </message>
- <message>
<location line="+51"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation type="unfinished"></translation>
</message>
@@ -21489,7 +21426,7 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5907"/>
+ <location line="-5853"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21504,7 +21441,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Pilih nilai baru</translation>
</message>
@@ -21556,7 +21493,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Ubah Warna Segmen...</translation>
</message>
@@ -21599,7 +21536,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation type="unfinished"></translation>
</message>
@@ -21632,7 +21569,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished"></translation>
</message>
@@ -21640,7 +21577,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>&Labeli Ulang...</translation>
</message>
@@ -21677,22 +21614,22 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation type="unfinished"></translation>
</message>
@@ -21887,12 +21824,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation type="unfinished"></translation>
</message>
@@ -21968,7 +21905,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Peringatan</translation>
</message>
@@ -21990,17 +21927,17 @@ Would you like to set it now?</source>
<translation>Membuat pratampil suara...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Ubah Ukuran Segmen</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation type="unfinished"></translation>
</message>
@@ -22010,7 +21947,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation type="unfinished"></translation>
</message>
@@ -22023,25 +21960,17 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation type="unfinished">
- <numerusform>
- </numerusform>
- </translation>
- </message>
<message>
- <location line="+154"/>
+ <location line="+348"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation type="unfinished"></translation>
</message>
@@ -22070,8 +21999,15 @@ Would you like to set it now?</source>
<source>Click and drag to copy segments</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <location line="-287"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <location line="+6"/>
+ <location line="+293"/>
<source>Click and drag to copy segment</source>
<translation type="unfinished"></translation>
</message>
@@ -22143,15 +22079,10 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23862,7 +23793,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><tidak ada instrumen></translation>
</message>
@@ -23877,11 +23808,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation><belum berjudul></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Peringatan</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation type="unfinished"></translation>
</message>
@@ -23894,31 +23821,31 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -23964,7 +23891,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Jalur</translation>
</message>
@@ -23975,12 +23902,12 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><tanpa judul></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation type="unfinished"></translation>
</message>
@@ -24121,117 +24048,181 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+56"/>
- <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-227"/>
- <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+55"/>
- <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+35"/>
- <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+60"/>
- <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+2"/>
<source>treble</source>
- <translation>tribel</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">tribel</translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
- <translation>bas</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">bas</translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
- <translation>silofon</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">silofon</translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
- <translation>gitar</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">gitar</translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
- <translation>kontrabas</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">kontrabas</translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
- <translation>sopran</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">sopran</translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
- <translation>mesosopran</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">mesosopran</translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
- <translation>alto</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">alto</translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
- <translation>tenor</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">tenor</translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
- <translation>bariton</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">bariton</translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
- <translation>varbariton</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">varbariton</translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
- <translation>subbas</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">subbas</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+39"/>
+ <source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-227"/>
+ <source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+55"/>
+ <source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>treble</source>
+ <translation type="obsolete">tribel</translation>
+ </message>
+ <message>
+ <source>bass</source>
+ <translation type="obsolete">bas</translation>
+ </message>
+ <message>
+ <source>xylophone</source>
+ <translation type="obsolete">silofon</translation>
+ </message>
+ <message>
+ <source>guitar</source>
+ <translation type="obsolete">gitar</translation>
+ </message>
+ <message>
+ <source>contrabass</source>
+ <translation type="obsolete">kontrabas</translation>
+ </message>
+ <message>
+ <source>soprano</source>
+ <translation type="obsolete">sopran</translation>
+ </message>
+ <message>
+ <source>mezzosoprano</source>
+ <translation type="obsolete">mesosopran</translation>
+ </message>
+ <message>
+ <source>alto</source>
+ <translation type="obsolete">alto</translation>
+ </message>
+ <message>
+ <source>tenor</source>
+ <translation type="obsolete">tenor</translation>
+ </message>
+ <message>
+ <source>baritone</source>
+ <translation type="obsolete">bariton</translation>
+ </message>
+ <message>
+ <source>varbaritone</source>
+ <translation type="obsolete">varbariton</translation>
+ </message>
+ <message>
+ <source>subbass</source>
+ <translation type="obsolete">subbas</translation>
+ </message>
+ <message>
+ <location line="+36"/>
<source>Transpose</source>
<translation>Transposisi</translation>
</message>
@@ -24272,7 +24263,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation><qt><p>Segmen baru akan dibuat dengan warna ini</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Audio</translation>
@@ -24668,13 +24659,6 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
</context>
<context>
- <name>Rosegarden::Ui</name>
- <message>
- <source>[ No port ]</source>
- <translation type="obsolete">[ Tiada port ]</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::UnGraceCommand</name>
<message>
<location filename="../../src/commands/notation/UnGraceCommand.h" line="+43"/>
@@ -24911,13 +24895,6 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
</context>
<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">(direkam)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/it.ts b/data/locale/it.ts
index a34c0fd..d4967b8 100644
--- a/data/locale/it.ts
+++ b/data/locale/it.ts
@@ -2,13 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0" language="it_IT">
<context>
- <name></name>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
-</context>
-<context>
<name>:</name>
<message>
<source></source>
@@ -55,10 +48,6 @@
<translation>Dispositivo di riproduzione predefinito</translation>
</message>
<message>
- <source><qt><p>Create new playback devices here. Click the device name to change it. Select a device here and connect it to a MIDI output port by clicking on a port to the right.</p></qt></source>
- <translation type="obsolete"><qt><p>Crea qui nuovi dispositivi di riproduzione. Clicca sul nome del dispositivo per cambiarlo. Seleziona un dispositivo e connettilo a una porta di uscita MIDI cliccando su una porta sulla destra.</p></qt></translation>
- </message>
- <message>
<location line="+44"/>
<location filename="../../src/gui/studio/DeviceManagerDialogUi.h" line="+7"/>
<source><qt><p>Bank definitions allow you to tell Rosegarden about the programs or patches available for use on the equipment (hardware or software synth) connected to this device.</p><p>You must have something defined for any program or bank changes you wish to transmit, as Rosegarden hides all bank and program numbers that are undefined.</p></qt></source>
@@ -343,23 +332,23 @@
<translation>Non è possibile aprire il font %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&File</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>&Aggiungi file audio...</translation>
</message>
@@ -369,54 +358,54 @@
<translation>&Esporta file audio...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>&Chiudi</translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Modifica</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>Togli il file a&udio</translation>
</message>
@@ -441,350 +430,346 @@
<translation>Riproduci anteprima</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>&Aiuto</translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">Tutorial di &Rosegarden</translation>
- </message>
- <message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>Linee-guida per comunicare un &Bug</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>Inform&azioni su Rosegarden</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Barra degli strumenti generale</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>&Nulla da ripristinare</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>N&ulla da rifare</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>&Copia</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>&Incolla</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Tasto per lo Strumento Selezione</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Tasto per Inserimento Note</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Tasto per lo Strumento Cancella</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>&Salva</translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation>&Inserisci evento</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation>&Elimina evento</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation>&Modifica Evento</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation>Editor &avanzato degli eventi</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>&Taglia</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation></translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>Pu&lisci la Selezione</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>&Filtra la selezione</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation>Imposta il tempo d'inizio del se&gmento...</translation>
</message>
@@ -794,82 +779,82 @@
<translation>Imposta la durata del seg&mento...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Vedi</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>Tempi &Musicali</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>Tempo &reale</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>&Tempi puri</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Se&gmento</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Modifica &con</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Apri nell'editor di matri&ce</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Apri nell'editor di ¬azione</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>Informazioni su &Qt</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>Aggiungi &Segno</translation>
</message>
@@ -899,7 +884,7 @@
<translation>Mezza nota &puntata</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>Trasforma in &Note</translation>
</message>
@@ -919,12 +904,12 @@
<translation>&Disattiva punti</translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>Mostra la barra dei &Simboli</translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>Barra della Durata</translation>
</message>
@@ -934,7 +919,7 @@
<translation>Barra dei Simboli</translation>
</message>
<message>
- <location line="+73"/>
+ <location line="-2670"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -1009,47 +994,47 @@
<translation type="unfinished">Adatta Ritmi esistenti al ritmo del Segmento</translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -1119,7 +1104,7 @@
<translation></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>&Mostra Barra</translation>
</message>
@@ -1129,39 +1114,39 @@
<translation>Nascondi la Barra di &stato</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Barra delle azioni</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Barra degli strumenti del tempo</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Barra degli strumenti per il Trasporto</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Barra degli strumenti per l'ingrandimento</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1211,7 +1196,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Inserisci marcatore</translation>
</message>
@@ -1231,134 +1216,117 @@
<translation>Modifica marcatore</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation>F2</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Commuta per muovere lo strumento</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation>F5</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Commuta per trascinare lo strumento</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation>F3</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Commuta per ridimensionare lo strumento</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation>F4</translation>
</message>
<message>
- <source>E&dit</source>
- <translation type="obsolete">Mo&difica</translation>
- </message>
- <message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">N&ulla da ripristinare</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Nulla da &rifare</translation>
- </message>
- <message>
- <source>Ctrl+V, F18, Shift+Insert</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Ctrl+V, F18, Shift+Insert</translation>
- </message>
- <message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>&Cancella</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Delete, Ctrl+D</translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation>&Griglia</translation>
</message>
@@ -1374,13 +1342,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation>Aggancia a &1/48</translation>
</message>
@@ -1391,13 +1359,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation>Aggancia a 1/&24</translation>
</message>
@@ -1408,13 +1376,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation>Aggancia a 1/12</translation>
</message>
@@ -1425,13 +1393,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation>8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation>Aggancia a &3/16</translation>
</message>
@@ -1442,13 +1410,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation>Aggancia a 3/8</translation>
</message>
@@ -1459,185 +1427,173 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation>Separa sul ba&ttito</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation>Spezza alla &battuta</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2205"/>
- <location line="+1302"/>
+ <location line="-3401"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>Aggiungi Barra dei Controlli</translation>
</message>
<message>
- <location line="-1282"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2477"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&Composizione</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Aggiungi cambio di te&mpo...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>A&ggiungi Cambio di misura...</translation>
</message>
<message>
- <source>&Segment</source>
- <translation type="obsolete">&Segmento</translation>
- </message>
- <message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Apri nell'editor della lista degli &eventi</translation>
</message>
<message>
- <source>Set Segment Start &Time...</source>
- <translation type="obsolete">Imposta il &tempo d'inizio del segmento...</translation>
- </message>
- <message>
- <source>Set Segment &Duration...</source>
- <translation type="obsolete">Imposta la &durata del segmento...</translation>
- </message>
- <message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation>=</translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation>+</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation>-</translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Alt+I</translation>
@@ -1650,701 +1606,701 @@
</message>
<message>
<location line="+6"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1712"/>
- <location line="+1724"/>
+ <location line="-2908"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>Cursore indietro e &seleziona</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Sinistra</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>Cursore avanti e &seleziona</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Destra</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation>F7</translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>I diesis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II bemolle</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation>S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II diesis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III bemolle</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV diesis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V bemolle</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V diesis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>Vi bemolle</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI diesis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII bemolle</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation>L</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2588"/>
+ <location line="+43"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2376,7 +2332,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+17"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -2478,14 +2439,14 @@
<translation></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+R</translation>
@@ -2503,8 +2464,8 @@
<translation></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2522,27 +2483,27 @@
<translation></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>Ag&giusta</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Quantizza</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>&Quantizza...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>&Ripeti l'ultima quantizzazione</translation>
</message>
@@ -2553,36 +2514,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>Unisci le note alla st&essa altezza</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>Piccolo avanzamento a &sinistra</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>&Piccolo avanzamento a destra</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>&Aumenta la velocity</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>&Riduci la velocity</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation>&Imposta alla velocity corrente</translation>
</message>
@@ -2598,411 +2559,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>Di&mezza le durate</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>Raddoppia le &durate</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>Dilata o &comprimi...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>Tras&poni</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>Alza di &un semitono</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>Abbassa &di un semitono</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>Alza di un'&ottava</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>Abbassa di un'otta&va</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>&Trasponi per semitoni...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Trasponi per &Intervallo...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>&Converti</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>&Inverti</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>&Retrogrado</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>Inverti re&trogrado</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>Attiva il se&gmento...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>&Strumenti</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>&Seleziona e modifica</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>&Disegna</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>Canc&ella</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Sposta</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>Ridimen&siona</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>Se¶</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>&Velocity</translation>
</message>
<message>
- <source>Local &Cursor</source>
- <translation type="obsolete">&Cursore locale</translation>
- </message>
- <message>
- <source>Cursor &Back</source>
- <translation type="obsolete">Cursore indietro</translation>
- </message>
- <message>
- <source>Cursor &Forward</source>
- <translation type="obsolete">Cursore avanti</translation>
- </message>
- <message>
- <source>Cursor For&ward Bar</source>
- <translation type="obsolete">Cursore avanti per battute</translation>
- </message>
- <message>
- <source>Cursor to St&art</source>
- <translation type="obsolete">Cursore all'inizio</translation>
- </message>
- <message>
- <source>Cursor to &End</source>
- <translation type="obsolete">Cursore alla fine</translation>
- </message>
- <message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation>Cursore indietro a se&leziona</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>Cursore avanti e &seleziona</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>Imposta la s&elezione come ciclica</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>Pulisci il l&oop</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>T&rasporto</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>&Riproduci</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&Interrompi</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>Ria&vvolgi</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>&Avanti veloce</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Riavvolgi all'&inizio</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Avanti veloce alla fin&e</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>S&olo</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>Scorri per seguire i&l suono</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>P&anico</translation>
</message>
<message>
- <source>I&nsert Note</source>
- <translation type="obsolete">I&nserisci nota</translation>
- </message>
- <message>
- <source>&I</source>
- <translation type="obsolete">&I</translation>
- </message>
- <message>
- <source>I &sharp</source>
- <translation type="obsolete">I &diesis</translation>
- </message>
- <message>
- <source>II &flat</source>
- <translation type="obsolete">II &bemolle</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>II sh&arp</source>
- <translation type="obsolete">II &diesis</translation>
- </message>
- <message>
- <source>III flat</source>
- <translation type="obsolete">III bemolle</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>IV sha&rp</source>
- <translation type="obsolete">IV &diesis</translation>
- </message>
- <message>
- <source>&V flat</source>
- <translation type="obsolete">&V bemolle</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>V s&harp</source>
- <translation type="obsolete">V &diesis</translation>
- </message>
- <message>
- <source>VI fla&t</source>
- <translation type="obsolete">VI &bemolle</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VI shar&p</source>
- <translation type="obsolete">VI &diesis</translation>
- </message>
- <message>
- <source>VII flat</source>
- <translation type="obsolete">VII bemolle</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>Ottava più &alta</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>Modo inserimento a&ccordi</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>&Registra passo passo</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>&Strumenti</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>Ba&rre</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>Mostra Barra Nome Acc&ordi</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>Mostra la barra del ri&tmo</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Barra degli strumenti</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>&Registra</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>&Preferenze</translation>
</message>
@@ -3087,7 +2952,7 @@
<translation>Mostra i faders &non assegnati</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Passa a strumento d'inserimento</translation>
</message>
@@ -3097,13 +2962,13 @@
<translation>Ridurre le pause dopo la cancellazione</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>&Stampa...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>Ante&prima di stampa...</translation>
</message>
@@ -3168,10 +3033,6 @@
<translation>S&paziatura</translation>
</message>
<message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Fattore di du&rata</translation>
- </message>
- <message>
<location line="+1"/>
<source>&Layout Mode</source>
<translation>Modo di &visualizzazione</translation>
@@ -3197,36 +3058,32 @@
<translation>Apri editor &testi</translation>
</message>
<message>
- <source>Add Event Ruler</source>
- <translation type="obsolete">Aggiungi barra eventi</translation>
- </message>
- <message>
<location line="+23"/>
<source>Show &Track Headers</source>
<translation>Mostra le intestazioni della &traccia</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Apri nell'editor di matrice &Percussioni</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>Aggiungi cambio di chi&ave...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Aggiungi cambio di &tonalità ...</translation>
</message>
<message>
- <location line="-1125"/>
- <location line="+1724"/>
+ <location line="-2321"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>Inserisci sequenza di &portamento...</translation>
</message>
@@ -3241,13 +3098,13 @@
<translation>Aggiungi &rilascio di pedale</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>&Converti notazione per...</translation>
</message>
<message>
- <location line="-2110"/>
+ <location line="+1"/>
<source>Add &Layer</source>
<translation>Aggiungi &livello</translation>
</message>
@@ -3263,7 +3120,7 @@
<translation>N&ota</translation>
</message>
<message>
- <location line="-1344"/>
+ <location line="-2540"/>
<source>Show A&ctions Toolbar</source>
<translation>Mostra barra delle &azioni</translation>
</message>
@@ -3274,24 +3131,24 @@
</message>
<message>
<location line="+196"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-810"/>
+ <location line="-1645"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -3316,7 +3173,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+116"/>
+ <location line="+950"/>
<source>&Move to Staff Above...</source>
<translation type="unfinished"></translation>
</message>
@@ -3341,18 +3198,14 @@
<translation>Scarica BarDataMap (debug)</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation>Apri nell'editor delle altezz&e</translation>
</message>
<message>
- <source>Add Clef Change in this link only...</source>
- <translation type="obsolete">Aggiungi cambio di chiave solo in questo link...</translation>
- </message>
- <message>
- <location line="-2441"/>
+ <location line="+21"/>
<source>Mar&ks</source>
<translation>Ma&rcatori</translation>
</message>
@@ -3655,8 +3508,8 @@
<translation>&Ripristina i gambi</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>&Frase</translation>
</message>
@@ -3732,14 +3585,14 @@
<translation>Legatura &sotto</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>Legatura di &valore</translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>&Slega</translation>
</message>
@@ -3829,14 +3682,14 @@
<translation>&Normalizza le pause</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation>&Unisci le pause</translation>
</message>
@@ -3846,8 +3699,8 @@
<translation>&Note</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4103,13 +3956,13 @@
<translation>Suddivisione fine del te&mpo</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>&Piccolo avanzamento a destra</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>&Visibilità </translation>
</message>
@@ -4156,26 +4009,26 @@
<translation>Prossimo rigo gi&ù</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>Segmento &precedente</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>Segmento &seguente</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>&Indietreggia</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>&Avanza</translation>
</message>
@@ -4320,30 +4173,14 @@
<translation>Accordi &chitarra</translation>
</message>
<message>
- <source>Cursor &Up Staff</source>
- <translation type="obsolete">Cursore sul rigo s&uperiore</translation>
- </message>
- <message>
- <source>Cursor &Down Staff</source>
- <translation type="obsolete">Cursore sul rigo inferiore</translation>
- </message>
- <message>
- <source>Cursor Pre&vious Segment</source>
- <translation type="obsolete">Cursore al segmento precedente</translation>
- </message>
- <message>
- <source>Cursor Ne&xt Segment</source>
- <translation type="obsolete">Cursore al segmento successivo</translation>
- </message>
- <message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>&Inserisci nota</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>Ottava più &bassa</translation>
</message>
@@ -4363,13 +4200,13 @@
<translation>Modalità di &abbellimento</translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>Mostra Barra degli St&rumenti</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>Mostra la barra degli &accidenti</translation>
</message>
@@ -4389,18 +4226,18 @@
<translation>Mostra la barra dei ra&ggruppatori</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>Mostra la barra degli strumenti di Tras&porto</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>Mostra la barra degli strumenti di &visualizzazione</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4413,13 +4250,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4430,7 +4267,7 @@
<translation>Mostra Barra Nome Acco&rdi</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation>Mostra barra delle note &pure</translation>
</message>
@@ -4445,7 +4282,7 @@
<translation>Mostra le direttive di Lily&Pond</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>Barra delle chiavi</translation>
</message>
@@ -4465,7 +4302,7 @@
<translation>Barra dei marcatori</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation>Seleziona &tutti gli eventi</translation>
</message>
@@ -4475,10 +4312,6 @@
<translation>Mostra gli s&trumenti</translation>
</message>
<message>
- <source>&Events</source>
- <translation type="obsolete">&Eventi</translation>
- </message>
- <message>
<location line="+198"/>
<source>Remove &Triggers</source>
<translation>Rimuovi &attivatori</translation>
@@ -4489,299 +4322,55 @@
<translation>Mostra lo strumento t&rasporto</translation>
</message>
<message>
- <source>Ctrl+W</source>
- <translation type="obsolete">Ctrl+W</translation>
- </message>
- <message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>&Manuale di Rosegarden</translation>
</message>
<message>
- <source>F1</source>
- <translation type="obsolete">F1</translation>
+ <location line="-4102"/>
+ <location line="+1116"/>
+ <source>Preferences...</source>
+ <translation>Preferenze...</translation>
</message>
<message>
- <source>Ctrl+Z</source>
- <translation type="obsolete">Ctrl+Z</translation>
+ <location line="-1025"/>
+ <location line="+2497"/>
+ <source>Show &Velocity Ruler</source>
+ <translation>Mostra il righello della &velocity</translation>
</message>
<message>
- <source>Ctrl+Shift+Z</source>
- <translation type="obsolete">Ctrl+Shift+Z</translation>
- </message>
- <message>
- <source>Ctrl+C, F16, Ctrl+Ins</source>
- <translation type="obsolete">Ctrl+C, F16, Ctrl+Ins</translation>
- </message>
- <message>
- <source>Ctrl+V, F18, Shift+Ins</source>
- <translation type="obsolete">Ctrl+V, F18, Shift+Ins</translation>
- </message>
- <message>
- <source>Ctrl+S</source>
- <translation type="obsolete">Ctrl+S</translation>
- </message>
- <message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>Delete</source>
- <translation type="obsolete">Cancella</translation>
- </message>
- <message>
- <source>Ctrl+X, F20, Shift+Del</source>
- <translation type="obsolete">Ctrl+X, F20, Shift+Del</translation>
- </message>
- <message>
- <source>Ctrl+A</source>
- <translation type="obsolete">Ctrl+A</translation>
- </message>
- <message>
- <source>Escape</source>
- <translation type="obsolete">Escape</translation>
- </message>
- <message>
- <source>Ctrl+F</source>
- <translation type="obsolete">Ctrl+F</translation>
- </message>
- <message>
- <location line="-4074"/>
- <location line="+288"/>
- <source>Preferences...</source>
- <translation>Preferenze...</translation>
- </message>
- <message>
- <source>F2</source>
- <translation type="obsolete">F2</translation>
- </message>
- <message>
- <source>F5</source>
- <translation type="obsolete">F5</translation>
- </message>
- <message>
- <source>F3</source>
- <translation type="obsolete">F3</translation>
- </message>
- <message>
- <source>F6</source>
- <translation type="obsolete">F6</translation>
- </message>
- <message>
- <source>F4</source>
- <translation type="obsolete">F4</translation>
- </message>
- <message>
- <source>Ctrl+V, F18, Shift+Insert</source>
- <translation type="obsolete">Ctrl+V, F18, Shift+Insert</translation>
- </message>
- <message>
- <source>Delete, Ctrl+D</source>
- <translation type="obsolete">Delete, Ctrl+D</translation>
- </message>
- <message>
- <source>0</source>
- <translation type="obsolete">0</translation>
- </message>
- <message>
- <source>3</source>
- <translation type="obsolete">3</translation>
- </message>
- <message>
- <source>6</source>
- <translation type="obsolete">6</translation>
- </message>
- <message>
- <source>8</source>
- <translation type="obsolete">8</translation>
- </message>
- <message>
- <source>4</source>
- <translation type="obsolete">4</translation>
- </message>
- <message>
- <source>2</source>
- <translation type="obsolete">2</translation>
- </message>
- <message>
- <source>1</source>
- <translation type="obsolete">1</translation>
- </message>
- <message>
- <source>5</source>
- <translation type="obsolete">5</translation>
- </message>
- <message>
- <location line="+91"/>
- <location line="+1302"/>
- <source>Show &Velocity Ruler</source>
- <translation>Mostra il righello della &velocity</translation>
- </message>
- <message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Mostra il righello del &portamento</translation>
</message>
<message>
- <source>=</source>
- <translation type="obsolete">=</translation>
- </message>
- <message>
- <source>+</source>
- <translation type="obsolete">+</translation>
- </message>
- <message>
- <source>-</source>
- <translation type="obsolete">-</translation>
- </message>
- <message>
- <source>Ctrl+H</source>
- <translation type="obsolete">Ctrl+H</translation>
- </message>
- <message>
- <source>Ctrl+Shift+H</source>
- <translation type="obsolete">Ctrl+Shift+H</translation>
- </message>
- <message>
- <source>Shift+Alt+I</source>
- <translation type="obsolete">Shift+Alt+I</translation>
- </message>
- <message>
- <source>Shift+Alt+R</source>
- <translation type="obsolete">Shift+Alt+R</translation>
- </message>
- <message>
- <source>Left</source>
- <translation type="obsolete">A Sinistra</translation>
- </message>
- <message>
- <source>Right</source>
- <translation type="obsolete">A Destra</translation>
- </message>
- <message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation>Cursore indietro e se&leziona</translation>
</message>
<message>
- <source>Ctrl+:</source>
- <translation type="obsolete">Ctrl+:</translation>
- </message>
- <message>
- <source>Alt+Ctrl+P</source>
- <translation type="obsolete">Alt+Ctrl+P</translation>
- </message>
- <message>
- <source>F7</source>
- <translation type="obsolete">F7</translation>
- </message>
- <message>
- <source>Shift+A</source>
- <translation type="obsolete">Shift+A</translation>
- </message>
- <message>
- <source>Ctrl+Shift+S</source>
- <translation type="obsolete">Ctrl+Shift+S</translation>
- </message>
- <message>
- <source>S</source>
- <translation type="obsolete">S</translation>
- </message>
- <message>
- <source>Shift+S</source>
- <translation type="obsolete">Shift+S</translation>
- </message>
- <message>
- <source>Ctrl+Shift+D</source>
- <translation type="obsolete">Ctrl+Shift+D</translation>
- </message>
- <message>
- <source>Shift+F</source>
- <translation type="obsolete">Shift+F</translation>
- </message>
- <message>
- <source>Ctrl+Shift+J</source>
- <translation type="obsolete">Ctrl+Shift+J</translation>
- </message>
- <message>
- <source>J</source>
- <translation type="obsolete">J</translation>
- </message>
- <message>
- <source>Shift+J</source>
- <translation type="obsolete">Shift+J</translation>
- </message>
- <message>
- <source>Ctrl+Shift+K</source>
- <translation type="obsolete">Ctrl+Shift+K</translation>
- </message>
- <message>
- <source>K</source>
- <translation type="obsolete">K</translation>
- </message>
- <message>
- <source>Shift+K</source>
- <translation type="obsolete">Shift+K</translation>
- </message>
- <message>
- <source>Ctrl+Shift+L</source>
- <translation type="obsolete">Ctrl+Shift+L</translation>
- </message>
- <message>
- <source>L</source>
- <translation type="obsolete">L</translation>
- </message>
- <message>
- <source>Q</source>
- <translation type="obsolete">Q</translation>
- </message>
- <message>
- <source>Shift+Q</source>
- <translation type="obsolete">Shift+Q</translation>
- </message>
- <message>
- <source>Ctrl+Shift+W</source>
- <translation type="obsolete">Ctrl+Shift+W</translation>
- </message>
- <message>
- <source>W</source>
- <translation type="obsolete">W</translation>
- </message>
- <message>
- <source>Shift+W</source>
- <translation type="obsolete">Shift+W</translation>
- </message>
- <message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Barra dei righelli</translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>&Preferenze...</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation>Mostra la barra dei &righelli</translation>
</message>
<message>
- <source>Ctrl+R</source>
- <translation type="obsolete">Ctrl+R</translation>
- </message>
- <message>
- <source>Rewind</source>
- <translation type="obsolete">Riavvolgi</translation>
- </message>
- <message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>Indietreggia (sinistra)</translation>
</message>
@@ -4791,13 +4380,13 @@
<translation>Riproduci</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>Avanza (destra)</translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation>&Azione</translation>
</message>
@@ -4817,7 +4406,7 @@
<translation>Aiuto</translation>
</message>
<message>
- <location line="+441"/>
+ <location line="-1582"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -4828,7 +4417,7 @@
</message>
<message>
<location line="+183"/>
- <location line="+1550"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -4937,21 +4526,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation>Modalità di &terzina</translation>
</message>
@@ -5122,7 +4711,7 @@
<translation>Barra del livello</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Tasto per lo Strumento Inserimento</translation>
</message>
@@ -5177,7 +4766,7 @@
<translation>Rendi visibile</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Auto-collega quando appropriato</translation>
</message>
@@ -5217,7 +4806,7 @@
<translation>Doppio bemolle</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>&Nuovo</translation>
</message>
@@ -5227,23 +4816,11 @@
<translation>&Importa</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Importa file di &Progetto di Rosegarden...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Importa file &MIDI...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>Importa file &Hydrogen...</translation>
</message>
<message>
- <source>Import MusicXM&L file...</source>
- <translation type="obsolete">Importa file MusicXM&L</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Merge</source>
<translation>&Inserisci</translation>
@@ -5254,44 +4831,16 @@
<translation>Inserisci &File...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Inserisci file &MIDI...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Inserisci file &Hydrogen...</translation>
</message>
<message>
- <source>Merge MusicXM&L file...</source>
- <translation type="obsolete">Unisci file MusicXM&L...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Export</source>
<translation>&Esporta</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Esporta come file &progetto di Rosegarden... </translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Esporta come file &MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Esporta come file &Csound...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Esporta come file M&up...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Esporta come file Music&XML...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>&Apri...</translation>
@@ -5302,10 +4851,6 @@
<translation>&Recenti</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Salva &Con nome...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>Salva come &modello...</translation>
@@ -5402,10 +4947,6 @@
<translation>Imposta i ritmi dal Segmento del &Battito</translation>
</message>
<message>
- <source>Fit existing beats to beat segment</source>
- <translation type="obsolete">Adatta battiti esistenti al battere del segmento</translation>
- </message>
- <message>
<location line="+2"/>
<source>Change &Composition Start and End...</source>
<translation>Cambia inizio e fine della &composizione...</translation>
@@ -5426,13 +4967,13 @@
<translation>&Metti un segno alla posizione del playback</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>&Salta al segno</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation>&Studio</translation>
</message>
@@ -5487,62 +5028,54 @@
<translation>&Salva il documento corrente come studio predefinito</translation>
</message>
<message>
- <source>Se&gments</source>
- <translation type="obsolete">Se&gmenti</translation>
- </message>
- <message>
<location line="+2"/>
<source>Toggle Repeat</source>
<translation>Togli/aggiungi ripetizione</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Apri nell'editor &principale</translation>
- </message>
- <message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>Ri&etichetta...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>&Ripeti l'ultima quantizzazione</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>Allungamento o &restringimento...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>Imposta il &tempo d'inizio...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>Imposta la &durata...</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation>Crea &Anacrusi...</translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Unisci</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>Se¶</translation>
</message>
@@ -5657,26 +5190,26 @@
<translation>&Rimappa gli Strumenti...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>&Ridimensiona</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation>&Metti nel Registro</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>Mostra la barra &principale</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>Mostra Barra delle Tra&cce</translation>
</message>
@@ -5691,27 +5224,19 @@
<translation>Mostra la barra degli strumenti per l'i&ngrandimento</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>Mostra la barra di s&tato</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>Mostra Ba&rra di Posizione della Riproduzione</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Importa &X11 Rosegarden file...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Inserisci &X11 Rosegarden file...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>MIDI Mi&xer</translation>
@@ -5722,10 +5247,6 @@
<translation>Mostra Barra del rit&mo</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Esporta come &LilyPond file...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>Mostra Tra&sporto</translation>
@@ -5772,26 +5293,26 @@
<translation>Barra degli editor</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Riavvolgi fino all'inizio</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Avanti veloce fino alla fine</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>&Supportare Rosegarden</translation>
</message>
<message>
- <location line="+221"/>
+ <location line="-1791"/>
<source>Insert Tempo Change</source>
<translation>Inserisci cambio di ritmo</translation>
</message>
@@ -5831,7 +5352,7 @@
<translation>Apri l'editor di Tempo e di Misura</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>Modifica ogg&etto</translation>
</message>
@@ -5851,19 +5372,11 @@
<translation>&Preferenze</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>Incoll&a come nuovo segmento attivo</translation>
</message>
<message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">Il modo di incollare Ristretto richiede uno spazio vuoto sufficiente (contenente solo pause) nella posizione di incollaggio, per poter contenere tutti gli eventi da incollare.
-Non è stato trovato spazio sufficiente.
-Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall'opzione "Incolla..." nel menù "Modifica". Puoi anche cambiare l'azione di incollaggio predefinita, se vuoi.</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NoteFont.cpp" line="+58"/>
<source>No sizes listed for font "%1"</source>
<translation>Nessuna dimensione elencata per il carattere "%1"</translation>
@@ -7664,67 +7177,19 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation>Colpo di pistola</translation>
</message>
<message>
- <source>C</source>
- <translation type="obsolete">Do</translation>
+ <location filename="../AutoloadStrings.cpp" line="-24"/>
+ <source>General MIDI Device</source>
+ <translation></translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">Do#</translation>
+ <location line="+1"/>
+ <source>General MIDI</source>
+ <translation></translation>
</message>
<message>
- <source>D</source>
- <translation type="obsolete">Re</translation>
- </message>
- <message>
- <source>Eb</source>
- <translation type="obsolete">Mib</translation>
- </message>
- <message>
- <source>E</source>
- <translation type="obsolete">Mi</translation>
- </message>
- <message>
- <source>F</source>
- <translation type="obsolete">Fa</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">Fa#</translation>
- </message>
- <message>
- <source>G</source>
- <translation type="obsolete">Sol</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">Sol#</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">La</translation>
- </message>
- <message>
- <source>Bb</source>
- <translation type="obsolete">Sib</translation>
- </message>
- <message>
- <source>B</source>
- <translation type="obsolete">Si</translation>
- </message>
- <message>
- <location filename="../AutoloadStrings.cpp" line="-24"/>
- <source>General MIDI Device</source>
- <translation></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>General MIDI</source>
- <translation></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Acoustic Grand Piano</source>
- <translation>Pianoforte a coda</translation>
+ <location line="+1"/>
+ <source>Acoustic Grand Piano</source>
+ <translation>Pianoforte a coda</translation>
</message>
<message>
<location line="+1"/>
@@ -8898,16 +8363,16 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation><nessuno></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>Modulo del sintetizzatore</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>Audio</translation>
@@ -11048,20 +10513,15 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation>Sconosciuto</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -11076,10 +10536,10 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 Controller %2 %3</translation>
</message>
@@ -11094,7 +10554,7 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Benvenuti!</translation>
</message>
@@ -11202,7 +10662,7 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation><qt><p>Nessuna traccia è stata armata per registrare</p><p>Per favore arma almeno uno dei LED di incisione <img src=":pixmaps/tooltip/record-leds.png"> e tenta di nuovo</p></qt></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>Non posso cominciare a registrare l'audio.</p><p>Per favore metta un percorso di incisione valido in <b>Compositione -> Edit Proprietà del Documento... -> Audio</b></p></qt></translation>
</message>
@@ -11214,40 +10674,52 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation type="unfinished">Cattivo file sound </translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>Lunghezza sbagliata per dati lunghi nello stream del Midi</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>Lunghezza sbagliata per dati di int nello stream del Midi</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>Incontrata in lettura la fine del file MIDI</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation>Stai tentando di avere più bytes di quelli previsti sulla traccia</translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation>Stai tentando di leggere oltre la fine del file MIDI</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>Trovato codice non valido di evento</translation>
+ <translation type="obsolete">Trovato codice non valido di evento</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation>Usato stato corrente per il primo evento in traccia</translation>
</message>
@@ -11358,7 +10830,7 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation>Questo evento è legato ad un altro evento.</translation>
</message>
@@ -11437,6 +10909,58 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Lilypond non ammette spazi o barre rovesciate nei nomi dei file.
+
+Vuoi usare
+
+ %1
+
+ piuttosto?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Esportazione fallita. Il file non può essere aperto per la scrittura.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">attenzione: battuta troppo lunga troncata qui</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">attenzione: battuta troppo breve, riempita con silenzio</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11452,24 +10976,8 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="unfinished"><p>Copyright 2000-2012 the Rosegarden development team</p><p>Versione: %1 Versione Qt: %2<br>Build key: %3</p><p>Rosgarden è fornito alla comunità da un team di volontari in tutto il mondo. Per una lista dei collaboratori visita: <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Per maggiori informazioni su Rosegarden, visita <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licenza: GNU General Public License Versione 2 o successiva</p> {2000-2014 ?} {1 ?} {2<?} {3<?} {2 ?}</translation>
- </message>
- <message>
- <source><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="obsolete"><p>Copyright 2000-2012 the Rosegarden development team</p><p>Versione: %1 Versione Qt: %2<br>Build key: %3</p><p>Rosgarden è fornito alla comunità da un team di volontari in tutto il mondo. Per una lista dei collaboratori visita: <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Per maggiori informazioni su Rosegarden, visita <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licenza: GNU General Public License Versione 2 o successiva</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2011 il team di sviluppo di Rosegarden</p><p>Versione: %1 Versione Qt: %2<br>Build key: %3</p><p> Rosegarden è stato fatto da una squadra di volontari sparsi per il mondo. Per una lista dei contributi, visita <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Per maggiori informazini su Rosegarden, visita <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licenza: GNU General Public License Versione 2</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2010 il team di sviluppo di Rosegarden </p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden è stato fatto da una squadra di volontari sparsi per il mondo. Per una lista dei contributi, visita <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Per maggiori informazini su Rosegarden, visita<a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licenza: Licenza Pubblica Generica GNU Versione 2</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2009 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2009 il team di sviluppo di Rosegarden</p><p>Versione: %1 Versione Qt: %2<br>Build key: %3</p><p> Rosegarden è stato fatto da una squadra di volontari sparsi per il mondo. Per una lista dei contributi, visita <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Per maggiori informazini su Rosegarden, visita <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licenza: Licenza Pubblica Generica GNU Versione 2</p></translation>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <translation type="unfinished"><p>Copyright 2000-2012 the Rosegarden development team</p><p>Versione: %1 Versione Qt: %2<br>Build key: %3</p><p>Rosgarden è fornito alla comunità da un team di volontari in tutto il mondo. Per una lista dei collaboratori visita: <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Per maggiori informazioni su Rosegarden, visita <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licenza: GNU General Public License Versione 2 o successiva</p> {2000-2015 ?} {1 ?} {2<?} {3<?} {2 ?}</translation>
</message>
</context>
<context>
@@ -11530,12 +11038,12 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>Non posso aggiungere indicazioni identiche che si sovrappongano</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>Aggiungi &legatura</translation>
</message>
@@ -12030,14 +11538,6 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation>Conversione del file audio...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">Ricampionamento del file audio...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">Conversione e ricampionamento del file audio...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation>Importazione del file audio...</translation>
@@ -12051,24 +11551,24 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Clicca per rinominare questo strumento</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>Clicca il bottone per rinominare questo strumento</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><nessun sintetizzatore></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><nessun modulo></translation>
</message>
@@ -12121,10 +11621,6 @@ Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall&apo
<translation>File</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><nessun file audio></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Salva File Come</translation>
@@ -12250,10 +11746,6 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<translation>Inserisci una nuova etichetta</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Importazione di un file audio esterno</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>importando un file audio che deve essere convertito o ricampionato</translation>
@@ -12288,7 +11780,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Mixer Audio</translation>
</message>
@@ -12304,53 +11796,45 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Pan</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>Livello audio</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Mono o stereo</translation>
</message>
<message>
- <source>Mute</source>
- <translation type="obsolete">Muto</translation>
- </message>
- <message>
- <source>Solo</source>
- <translation type="obsolete">Solo</translation>
- </message>
- <message>
<location line="+8"/>
<source>Arm recording</source>
<translation>Arm recording</translation>
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><nessuno></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>Clicca per caricare un modulo audio</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>Clicca per rinominare questo strumento</translation>
</message>
@@ -12370,7 +11854,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<translation>Clicca il bottone per rinominare questo strumento</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Sub %1</translation>
</message>
@@ -12386,14 +11870,14 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<translation>Master</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><nessun modulo></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</translation>
</message>
@@ -12835,14 +12319,6 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<translation>Gestisci banchi MIDI e programmi</translation>
</message>
<message>
- <source>Apply</source>
- <translation type="obsolete">Apllica</translation>
- </message>
- <message>
- <source>Reset</source>
- <translation type="obsolete">Ripristina</translation>
- </message>
- <message>
<location line="+23"/>
<source>Device and Banks</source>
<translation>Dispositivi e Banchi</translation>
@@ -12960,7 +12436,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<translation><nuovo banco %1></translation>
</message>
<message>
- <location line="+508"/>
+ <location line="+514"/>
<source>Some internal error: no device selected</source>
<translation>Errore interno: nessun dispositivo selezionato</translation>
</message>
@@ -12976,11 +12452,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<translation>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</translation>
</message>
<message>
- <source>Close</source>
- <translation type="obsolete">Chiudi</translation>
- </message>
- <message>
- <location line="-774"/>
+ <location line="-780"/>
<source><new bank></source>
<translation><nuovo banco></translation>
</message>
@@ -13000,7 +12472,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<translation>Vuoi eliminare veramente questo banco?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>Vuoi eliminare veramente questa mappatura?</translation>
</message>
@@ -13059,10 +12531,6 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<source>The specified file exists. Overwrite?</source>
<translation>Il file specificato esiste. Sovrascrivere?</translation>
</message>
- <message>
- <source>Unsaved Changes</source>
- <translation type="obsolete">Cambiamenti non salvati</translation>
- </message>
</context>
<context>
<name>Rosegarden::BeamCommand</name>
@@ -13172,89 +12640,203 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
</message>
</context>
<context>
- <name>Rosegarden::ChordNameRuler</name>
+ <name>Rosegarden::CheckForParallelsDialog</name>
<message>
- <location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
- <source><qt><p>Chord name ruler. This ruler analyzes your harmonies and attempts to guess what chords your composition contains. These chords cannot be printed or manipulated, and this is only a reference for your information.</p><p>Turn it on and off with the <b>View -> Rulers</b> menu.</p></qt></source>
- <translation><qt><p>Barra dei nomi degli accordi. Questa barra analizza le tue armonie e prova a capire gli accordi della tua composizione. Questi accordi non possono essere stampati o manipolati, ti servono solo come informazione.</p><p>Attivali o disattivali dal menu <b>Vista -> Barre</b>.</p></qt></translation>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ClearTriggersCommand</name>
<message>
- <location filename="../../src/commands/edit/ClearTriggersCommand.h" line="+46"/>
- <source>&Clear Triggers</source>
- <translation>&Pulisci attivatori</translation>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ClefDialog</name>
<message>
- <location filename="../../src/gui/dialogs/ClefDialog.cpp" line="+54"/>
- <location line="+5"/>
- <location line="+66"/>
- <source>Clef</source>
- <translation>Chiave</translation>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Existing notes following clef change</source>
- <translation>Le note esistenti seguono il cambio di chiave</translation>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="-46"/>
- <source>Lower clef</source>
- <translation>Chiave più bassa</translation>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished">Azzera</translation>
</message>
<message>
- <location line="-12"/>
- <source>Up an Octave</source>
- <translation>Su di un'ottava</translation>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+42"/>
- <source>Down an Octave</source>
- <translation>Giù di un'ottava</translation>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="-11"/>
- <source>Higher clef</source>
- <translation>Chiave più alta</translation>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+33"/>
- <source>Maintain current pitches</source>
- <translation>Mantieni le altezze correnti</translation>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished">,</translation>
</message>
<message>
- <location line="+3"/>
- <source>Transpose into appropriate octave</source>
- <translation>Trasponi nell'ottava appropriata</translation>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+160"/>
- <source>%1 down an octave</source>
- <translation>%1 giù di un'ottava</translation>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>%1 down two octaves</source>
- <translation>%1 giù di due ottave</translation>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>%1 up an octave</source>
- <translation>%1 su di un'ottava</translation>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>%1 up two octaves</source>
- <translation>%1 su di due ottave</translation>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <source>Treble</source>
- <translation>Alti</translation>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChordNameRuler</name>
+ <message>
+ <location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
+ <source><qt><p>Chord name ruler. This ruler analyzes your harmonies and attempts to guess what chords your composition contains. These chords cannot be printed or manipulated, and this is only a reference for your information.</p><p>Turn it on and off with the <b>View -> Rulers</b> menu.</p></qt></source>
+ <translation><qt><p>Barra dei nomi degli accordi. Questa barra analizza le tue armonie e prova a capire gli accordi della tua composizione. Questi accordi non possono essere stampati o manipolati, ti servono solo come informazione.</p><p>Attivali o disattivali dal menu <b>Vista -> Barre</b>.</p></qt></translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ClearTriggersCommand</name>
+ <message>
+ <location filename="../../src/commands/edit/ClearTriggersCommand.h" line="+46"/>
+ <source>&Clear Triggers</source>
+ <translation>&Pulisci attivatori</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ClefDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/ClefDialog.cpp" line="+54"/>
+ <location line="+5"/>
+ <location line="+66"/>
+ <source>Clef</source>
+ <translation>Chiave</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Existing notes following clef change</source>
+ <translation>Le note esistenti seguono il cambio di chiave</translation>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>Lower clef</source>
+ <translation>Chiave più bassa</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Up an Octave</source>
+ <translation>Su di un'ottava</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Down an Octave</source>
+ <translation>Giù di un'ottava</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Higher clef</source>
+ <translation>Chiave più alta</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Maintain current pitches</source>
+ <translation>Mantieni le altezze correnti</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Transpose into appropriate octave</source>
+ <translation>Trasponi nell'ottava appropriata</translation>
+ </message>
+ <message>
+ <location line="+160"/>
+ <source>%1 down an octave</source>
+ <translation>%1 giù di un'ottava</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 down two octaves</source>
+ <translation>%1 giù di due ottave</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 up an octave</source>
+ <translation>%1 su di un'ottava</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 up two octaves</source>
+ <translation>%1 su di due ottave</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Treble</source>
+ <translation>Alti</translation>
</message>
<message>
<location line="+2"/>
@@ -13495,7 +13077,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13503,10 +13085,6 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::ConfigureDialog</name>
<message>
- <source>Configure Rosegarden</source>
- <translation type="obsolete">Configura Rosegarden</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/ConfigureDialog.cpp" line="+48"/>
<source>Rosegarden - Preferences</source>
<translation>Rosegarden - Preferenze</translation>
@@ -13519,10 +13097,6 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<source>Configure Rosegarden</source>
<translation>Configura Rosegarden</translation>
</message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:configureDialogBase-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:configureDialogBase-en</translation>
- </message>
</context>
<context>
<name>Rosegarden::ControlChangeCommand</name>
@@ -13728,7 +13302,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Velocity</translation>
</message>
@@ -13744,7 +13318,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Tipo di evento non supportato</translation>
</message>
@@ -13759,12 +13333,13 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<translation>Eventi del controller</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>Inserisci linea del controller</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>Numero eventi del controller</translation>
</message>
@@ -13772,7 +13347,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>&Copia</translation>
</message>
@@ -13782,7 +13357,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<translation>(brano)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(copiato)</translation>
</message>
@@ -13852,7 +13427,7 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>&Taglia</translation>
</message>
@@ -13892,10 +13467,6 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Comando Riunisci</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>Elimina ampiezza</translation>
@@ -13920,12 +13491,12 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation>[Porta assente]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -13940,34 +13511,6 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
<context>
<name>Rosegarden::DiatonicPitchChooser</name>
<message>
- <source>C</source>
- <translation type="obsolete">Do</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">Re</translation>
- </message>
- <message>
- <source>E</source>
- <translation type="obsolete">Mi</translation>
- </message>
- <message>
- <source>F</source>
- <translation type="obsolete">Fa</translation>
- </message>
- <message>
- <source>G</source>
- <translation type="obsolete">Sol</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">La</translation>
- </message>
- <message>
- <source>B</source>
- <translation type="obsolete">Si</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/DiatonicPitchChooser.cpp" line="+59"/>
<source>C</source>
<comment>note name</comment>
@@ -14243,137 +13786,6 @@ Scegli quelli che vuoi eliminare definitivamente dal disco fisso.
</message>
</context>
<context>
- <name>Rosegarden::EditView</name>
- <message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 Controller %2 %3</translation>
- </message>
- <message>
- <source>Pitch Bend</source>
- <translation type="obsolete">Curva dell'altezza</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Tipo di evento non supportato</translation>
- </message>
- <message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <source>VIII</source>
- <translation type="obsolete">VIII</translation>
- </message>
- <message>
- <source>%1 flat</source>
- <translation type="obsolete">%1 bemolle</translation>
- </message>
- <message>
- <source>%1 sharp</source>
- <translation type="obsolete">%1 diesis</translation>
- </message>
- <message>
- <source>&Insert Note</source>
- <translation type="obsolete">&Inserisci nota</translation>
- </message>
- <message>
- <source>&Upper Octave</source>
- <translation type="obsolete">Ottava più &alta</translation>
- </message>
- <message>
- <source>&Lower Octave</source>
- <translation type="obsolete">Ottava più &bassa</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Stima della misura del tempo mostrata</translation>
- </message>
- <message>
- <source>Halving durations...</source>
- <translation type="obsolete">Dimezzando le durate...</translation>
- </message>
- <message>
- <source>Doubling durations...</source>
- <translation type="obsolete">Raddoppiando le durate...</translation>
- </message>
- <message>
- <source>Rescaling...</source>
- <translation type="obsolete">Riscalamento in corso...</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Trasporto</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Per numero di semitoni: </translation>
- </message>
- <message>
- <source>Transposing...</source>
- <translation type="obsolete">Trasposizione in corso...</translation>
- </message>
- <message>
- <source>Transposing up one semitone...</source>
- <translation type="obsolete">Trasposizione in alto di un semitono...</translation>
- </message>
- <message>
- <source>Transposing up one octave...</source>
- <translation type="obsolete">Trasposizione in alto di un'ottava...</translation>
- </message>
- <message>
- <source>Transposing down one semitone...</source>
- <translation type="obsolete">Trasposizione in basso di un semitono...</translation>
- </message>
- <message>
- <source>Transposing down one octave...</source>
- <translation type="obsolete">Trasposizione in basso di un'ottava...</translation>
- </message>
- <message>
- <source>Inverting...</source>
- <translation type="obsolete">Invertendo...</translation>
- </message>
- <message>
- <source>Retrograding...</source>
- <translation type="obsolete">Retrocedendo...</translation>
- </message>
- <message>
- <source>Retrograde inverting...</source>
- <translation type="obsolete">Invertendo e retrocedendo...</translation>
- </message>
- <message>
- <source>Jogging left...</source>
- <translation type="obsolete">Andando a sinistra...</translation>
- </message>
- <message>
- <source>Jogging right...</source>
- <translation type="obsolete">Andando a destra...</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::EditViewBase</name>
<message>
<location filename="../../src/gui/general/EditViewBase.cpp" line="+222"/>
@@ -14712,46 +14124,10 @@ Questo può causare problemi se si sovrappone a un valore differente più avanti
<translation>Motivo</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Appiattisci - imposta %1 al valore</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Alternato - imposta %1 al max e min sugli eventi alternati</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo - imposta %1 crescendo da min a max</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo - imposta %1% calando da max a min</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Rintocco - imposta %1 alternando da max a min e sfumando a zero</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>Valore</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Primo valore</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Secondo valore</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Valore inferiore</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Valore superiore</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -15011,18 +14387,6 @@ Questo può causare problemi se si sovrappone a un valore differente più avanti
<source>http://rosegardenmusic.com/wiki/doc:eventView-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:eventView-en</translation>
</message>
- <message>
- <source>%1 - Triggered Segment: %2</source>
- <translation type="obsolete">%1 - Segmento attivato: %2</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - Event List</source>
- <translation type="obsolete">%1 - Traccia del segmento #%2 - Lista eventi</translation>
- </message>
- <message>
- <source>%1 - %2 Segments - Event List</source>
- <translation type="obsolete">%1 - %2 Segmenti - Lista eventi</translation>
- </message>
</context>
<context>
<name>Rosegarden::ExpandFigurationCommand</name>
@@ -15158,22 +14522,6 @@ Vuoi provare a cercarlo o saltarlo?</translation>
<translation>Scaricando %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Connessione al server FTP non riuscita</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Autenticazione non riuscita</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Non riesco ad accedere alle directory corretta</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">Scaricamento FTP interrotto</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Scaricamento cancellato</translation>
@@ -15437,10 +14785,6 @@ Vuoi provare a cercarlo o saltarlo?</translation>
<translation>Prestazioni grafiche</translation>
</message>
<message>
- <source>Normal</source>
- <translation type="obsolete">Normale</translation>
- </message>
- <message>
<location line="+6"/>
<source>Safe</source>
<translation>Sicuro</translation>
@@ -15451,10 +14795,6 @@ Vuoi provare a cercarlo o saltarlo?</translation>
<translation>Veloce</translation>
</message>
<message>
- <source><qt><p>Qt offers you the choice of three graphics systems. The normal (raster) graphics system offers the best tradeoff between performance and stability, but may cause problems for some users. If you experience frequent crashes, or distorted graphics, you should try the safe (native) graphics system instead. If you wish to experiment, the fast (OpenGL) graphics system delivers excellent performance for some users, but is generally less stable.</p></qt></source>
- <translation type="obsolete"><qt><p>Qt presenta la scelta di tre sistemi grafici. Quello normale offre il miglior compromesso tra prestazioni e stabilità , ma può provocare dei problemi per alcuni utenti. Se vi capita spesso che il sistema si interrompa o la grafica sia distorta, dovreste provare il sistema grafico sicuro (nativo). Se volete fare esperimenti, il sistema grafico veloce (OpenGL) offre prestazioni eccellenti per alcuni utenti, ma è generalmente meno stabile.</p></qt></translation>
- </message>
- <message>
<location line="+183"/>
<source>Always use US names (e.g. quarter, 8th)</source>
<translation>Usa sempre i nomi USA (per esempio quarter, 8th)</translation>
@@ -15475,10 +14815,6 @@ Vuoi provare a cercarlo o saltarlo?</translation>
<translation>Finestra principale</translation>
</message>
<message>
- <source>Matrix</source>
- <translation type="obsolete">Matrice</translation>
- </message>
- <message>
<location line="+4"/>
<source>Notation</source>
<translation>Notazione</translation>
@@ -15514,10 +14850,6 @@ Vuoi provare a cercarlo o saltarlo?</translation>
<translation>Adobe Acrobat Reader (non libero)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation>Usato per l'anteprima con LilyPond</translation>
@@ -15528,10 +14860,6 @@ Vuoi provare a cercarlo o saltarlo?</translation>
<translation>Programma per la stampa da linea di comando</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">KPrinter (KDE 3)</translation>
- </message>
- <message>
<location line="+5"/>
<source>Gtk-LP (GNOME)</source>
<translation>Gtk-LP (GNOME)</translation>
@@ -15589,13 +14917,6 @@ Vuoi provare a cercarlo o saltarlo?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Guitar::Fingering</name>
- <message>
- <source>couldn't parse fingering '%1' in '%2'</source>
- <translation type="obsolete">non posso analizzare la diteggiatura "%1" in "%2"</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::GuitarChordEditorDialog</name>
<message>
<location filename="../../src/gui/editors/guitar/GuitarChordEditorDialog.cpp" line="+40"/>
@@ -15819,23 +15140,6 @@ Vuoi provare a cercarlo o saltarlo?</translation>
<context>
<name>Rosegarden::IdentifyTextCodecDialog</name>
<message>
- <source>Choose Text Encoding</source>
- <translation type="obsolete">Scegli la codifica del testo</translation>
- </message>
- <message>
- <source>
-This file contains text in an unknown language encoding.
-
-Please select one of the following estimated text encodings
-for use with the text in this file:
-</source>
- <translation type="obsolete">
-Questo file contiene del testo in una codifica sconosciuta.
-
-Scegli tra le seguenti codifiche la più indicata da usare per il testo di questo file:
-</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/IdentifyTextCodecDialog.cpp" line="+69"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
@@ -16137,7 +15441,7 @@ Testo di esempio dal file:</translation>
<translation>Parametri dello strumento</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Traccia</translation>
</message>
@@ -16145,7 +15449,7 @@ Testo di esempio dal file:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation>nessuno</translation>
</message>
@@ -16535,48 +15839,8 @@ Testo di esempio dal file:</translation>
</message>
</context>
<context>
- <name>Rosegarden::LatencyConfigurationPage</name>
- <message>
- <source>Latency</source>
- <translation type="obsolete">Latenza</translation>
- </message>
- <message>
- <source>Sequencer Latency</source>
- <translation type="obsolete">Latenza del sequencer</translation>
- </message>
- <message>
- <source>JACK latency</source>
- <translation type="obsolete">Latenza di JACK</translation>
- </message>
- <message>
- <source>Use the "Fetch JACK latencies" button to discover the latency values set at
-the sequencer. It's recommended that you use the returned values but it's also
-possible to override them manually using the sliders. Note that if you change
-your JACK server parameters you should always fetch the latency values again.
-The latency values will be stored by Rosegarden for use next time.</source>
- <translation type="obsolete">Usa il pulsante "Trova le latenze di JACK" per scoprire i valori di latenza del sequencer. È bene usare i valori trovati, anche se è possibile impostarli manualmente muovendo gli slider. Se i parametri del server JACK vengono cambiati, devi sempre ritrovare i valori di latenza di nuovo. I valori di latenza verranno memorizzati da Rosegarden per gli utilizzi successivi.</translation>
- </message>
- <message>
- <source>JACK playback latency (in ms)</source>
- <translation type="obsolete">Latenza di riproduzione di JACK (in millisecondi)</translation>
- </message>
- <message>
- <source>JACK record latency (in ms)</source>
- <translation type="obsolete">Latenza di registrazione di JACK (in millisecondi)</translation>
- </message>
- <message>
- <source>Fetch JACK latencies</source>
- <translation type="obsolete">Rileva latenze di JACK</translation>
- </message>
- <message>
- <source>JACK Latency</source>
- <translation type="obsolete">Latenza di JACK</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -16584,7 +15848,7 @@ Would you like to use
%1
instead?</source>
- <translation>Lilypond non ammette spazi o barre rovesciate nei nomi dei file.
+ <translation type="obsolete">Lilypond non ammette spazi o barre rovesciate nei nomi dei file.
Vuoi usare
@@ -16593,39 +15857,16 @@ Vuoi usare
piuttosto?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">Esportazione fallita. Il file non può essere aperto per la scrittura.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Esportazione fallita. Il file non può essere aperto per la scrittura.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>attenzione: battuta troppo lunga troncata qui</translation>
+ <translation type="obsolete">attenzione: battuta troppo lunga troncata qui</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>attenzione: battuta troppo breve, riempita con silenzio</translation>
+ <translation type="obsolete">attenzione: battuta troppo breve, riempita con silenzio</translation>
</message>
</context>
<context>
@@ -16656,10 +15897,6 @@ Vuoi usare
<translation><qt>Scegli quali tracce o segmenti esportare</qt></translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Tracce selezionate</translation>
- </message>
- <message>
<location line="+16"/>
<source>Compatibility level</source>
<translation>Livello di compatibilità </translation>
@@ -17141,10 +16378,6 @@ Vuoi usare
<context>
<name>Rosegarden::LoopRuler</name>
<message>
- <source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Double-click to start playback.</p></qt></source>
- <translation type="obsolete"><qt><p>Clicca e trascina per muovere il puntatore di riproduzione.</p><p>Shift-clicca e trascina per selezionare un intervallo per l'elaborazione o la riproduzione ciclica.</p><p>Shift-clicca per deselezionare l'intervallo.</p><p>Doppio click per avviare la riproduzione.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/rulers/LoopRuler.cpp" line="+80"/>
<source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Ctrl-click and drag to move the playback pointer with snap to beat.</p><p>Double-click to start playback.</p></qt></source>
<translation><qt><p>Clicca e trascina per muovere il puntatore di riproduzione.</p><p>Shift-clicca e trascina per selezionare un intervallo per l'elaborazione o la riproduzione ciclica.</p><p>Shift-clicca per deselezionare l'intervallo.</p><p>Ctrl-clicca e trascina per spostare il puntatore di riproduzione con scatto al colpo.</p><p>Doppio click per avviare la riproduzione.</p></qt></translation>
@@ -17339,11 +16572,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <source><qt><p>Set the MIDI channel number.</p><p>Before changing this, consider switching to a different instrument instead. Instruments #1 through #16 match MIDI channels 1 through 16 by default. You may change this relationship using this control if you wish, but this can lead to confusion</p></qt></source>
- <translation type="obsolete"><qt><p>Seleziona il numero di canale MIDI.</p><p>Prima di cambiarlo, puoi provare a passare a un altro strumento. Gli strumenti da #1 a #16 sono per definizione collegati ai canali MIDI da 1 a 16. Puoi anche cambiare questa impostazione usando questo controllo, ma questo potrebbe generare confusione</p></qt></translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation><qt>Seleziona le variazioni sul programma, se è possibile farlo nello studio</qt></translation>
</message>
@@ -17353,14 +16582,6 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation><qt>Seleziona il banco MIDI da cui scegliere i programmi</qt></translation>
</message>
<message>
- <source>auto</source>
- <translation type="obsolete">auto</translation>
- </message>
- <message>
- <source>fixed</source>
- <translation type="obsolete">fisso</translation>
- </message>
- <message>
<location line="+26"/>
<source><qt>Set the MIDI program or "patch"</p></qt></source>
<translation><qt>Seleziona il programma MIDI o "patch"</p></qt></translation>
@@ -17391,10 +16612,6 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>Programma</translation>
</message>
<message>
- <source>Channel out</source>
- <translation type="obsolete">Channel out</translation>
- </message>
- <message>
<location line="-46"/>
<source>Percussion</source>
<translation>Percussioni</translation>
@@ -17440,12 +16657,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>Ricevi esterno</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Nessuna connessione</translation>
</message>
@@ -17583,10 +16795,6 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>Barre, battiti e sotti-battiti</translation>
</message>
<message>
- <source>Bars, beats, and divisions</source>
- <translation type="obsolete">Barre, battiti e divisioni</translation>
- </message>
- <message>
<location line="+4"/>
<source>Bar velocity</source>
<translation>Velocità della barra</translation>
@@ -17667,16 +16875,21 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>In registrazione</translation>
</message>
<message>
- <source>Synth plugin </source>
- <translation type="obsolete">Modulo del sintetizzatore</translation>
- </message>
- <message>
<location line="+124"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17882,12 +17095,12 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Tieni premuto Maiusc per evitare la divisione sulla griglia del ritmo</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Copia e sposta l'evento</translation>
</message>
@@ -18046,7 +17259,7 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<translation>Cambia le velocità </translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>Clicca e trascina per cambiare la velocity delle note selezionate</translation>
</message>
@@ -18059,80 +17272,12 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <source>Instrument Parameters</source>
- <translation type="obsolete">Parametri dello strumento</translation>
- </message>
- <message>
- <source>Couldn't apply piano roll layout</source>
- <translation type="obsolete">Non posso applicare la visualizzazione piano</translation>
- </message>
- <message>
- <source> No selection </source>
- <translation type="obsolete"> Nessuna selezione</translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">Quantizzazione in corso...</translation>
- </message>
- <message>
- <source>Collapsing notes...</source>
- <translation type="obsolete">Unione delle note in corso...</translation>
- </message>
- <message>
- <source>Making legato...</source>
- <translation type="obsolete">Costruzione del legato in corso...</translation>
- </message>
- <message>
- <source>Note: %1 (%2.%3s)</source>
- <translation type="obsolete">Nota: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>%1 (%2)</source>
- <translation type="obsolete">%1 (%2)</translation>
- </message>
- <message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Tempo: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">Incolla la selezione negli appunti...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">Copia in corso della selezione negli appunti...</translation>
- </message>
- <message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">Gli appunti sono vuoti</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">Inserimento del contenuto degli appunti in corso...</translation>
- </message>
- <message>
- <source>Couldn't paste at this point</source>
- <translation type="obsolete">Non è possibile incollare in questo punto</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">Eliminazione della selezione in corso...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation>Azione %1 di inserimento nota sconosciuta</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">Inserimento nota</translation>
- </message>
- <message>
- <source>Unquantizing...</source>
- <translation type="obsolete">Dequantizzazione in corso...</translation>
- </message>
- <message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation><senza titolo></translation>
</message>
@@ -18157,18 +17302,6 @@ Doppio click per aprire l'editor dei marcatori.</translation>
</translation>
</message>
<message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 Controller %2 %3</translation>
- </message>
- <message>
- <source>Pitch Bend</source>
- <translation type="obsolete">Curva dell'altezza</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">Tipo di evento non supportato</translation>
- </message>
- <message>
<location line="+254"/>
<source> Grid: </source>
<translation> Griglia: </translation>
@@ -18209,7 +17342,7 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<translation>Spento</translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:matrix-en</translation>
</message>
@@ -18225,8 +17358,7 @@ Doppio click per aprire l'editor dei marcatori.</translation>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -18236,15 +17368,7 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<translation>Tonalità stimata mostrata</translation>
</message>
<message>
- <source> Zoom: </source>
- <translation type="obsolete"> Ingrandimento: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation>Stima della misura del tempo mostrata</translation>
</message>
@@ -18259,22 +17383,6 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<translation>Per numero di semitoni: </translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">Aumento delle velocità ...</translation>
- </message>
- <message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">Diminuzione delle velocità ...</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Imposta velocity dell'evento</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Impostazione velocità ...</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation>Attiva il segmento</translation>
@@ -18285,36 +17393,15 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<translation>Rimuovi attivatori</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>Matrice</translation>
</message>
- <message>
- <source>Percussion</source>
- <translation type="obsolete">Percussioni</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - %3</source>
- <translation type="obsolete">%1 - Traccia del segmento #%2 - %3</translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">%1 - Tutti i segmenti - %2</translation>
- </message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Non posso inserire la nota. Nessuna durata di griglia selezionata</translation>
- </message>
- <message>
- <source> Chord </source>
- <translation type="obsolete"> Accordo</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Ingrandimento</translation>
</message>
@@ -18334,7 +17421,7 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<translation>Azzera lo zoom</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Girate la rotella per cambiare il segmento attivo</qt></translation>
</message>
@@ -18441,13 +17528,6 @@ Doppio click per aprire l'editor dei marcatori.</translation>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">Mappatura della tastiera</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="+53"/>
@@ -18464,7 +17544,7 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>Mixer MIDI</translation>
</message>
@@ -18479,7 +17559,7 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<translation>Strumento</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</translation>
</message>
@@ -18760,295 +17840,12 @@ Doppio click per aprire l'editor dei marcatori.</translation>
<context>
<name>Rosegarden::NameSetEditor</name>
<message>
- <source>Librarian</source>
- <translation type="obsolete">Bibliotecario</translation>
- </message>
- <message>
- <source>Name</source>
- <translation type="obsolete">Nome</translation>
- </message>
- <message>
- <source>Email</source>
- <translation type="obsolete">Posta elettronica</translation>
- </message>
- <message>
- <source>The librarian maintains the Rosegarden device data for this device.
-If you've made modifications to suit your own device, it might be worth
-liaising with the librarian in order to publish your information for the benefit
-of others.</source>
- <translation type="obsolete">Il bibliotecario mantiene i dati di questo dispositivo.
-Se hai fatto delle modifiche per adeguarli al tuo dispositivo,
- potrebbe essere utile contattare il bibliotecario per condividerle,
-a beneficio di altri.</translation>
- </message>
- <message>
<location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
<source>Provided by</source>
<translation>Fornito da</translation>
</message>
</context>
<context>
- <name>Rosegarden::NewMatrixView</name>
- <message>
- <source>Matrix</source>
- <translation type="obsolete">Matrice</translation>
- </message>
- <message>
- <source><untitled></source>
- <translation type="obsolete"><senza titolo></translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">%1 - Tutti i segmenti - %2</translation>
- </message>
- <message>
- <source> Grid: </source>
- <translation type="obsolete"> Griglia: </translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Nessuno</translation>
- </message>
- <message>
- <source>Unit</source>
- <translation type="obsolete">Unità </translation>
- </message>
- <message>
- <source>Beat</source>
- <translation type="obsolete">Ritmo</translation>
- </message>
- <message>
- <source>Bar</source>
- <translation type="obsolete">Battuta</translation>
- </message>
- <message>
- <source> Velocity: </source>
- <translation type="obsolete"> Velocità :</translation>
- </message>
- <message>
- <source> Quantize: </source>
- <translation type="obsolete"> Quantizza:</translation>
- </message>
- <message>
- <source> Zoom: </source>
- <translation type="obsolete"> Ingrandimento: </translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Imposta velocità dell'evento</translation>
- </message>
- <message>
- <source>Trigger Segment</source>
- <translation type="obsolete">Attiva il segmento</translation>
- </message>
- <message>
- <source>Remove Triggers</source>
- <translation type="obsolete">Rimuovi attivatori</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Stima della misura del tempo mostrata</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Trasporto</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Per numero di semitoni: </translation>
- </message>
- <message>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="obsolete">Non posso inserire la nota. Nessuna durata di griglia selezionata</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewNotationView</name>
- <message>
- <source>Note &Font</source>
- <translation type="obsolete">&Font delle note</translation>
- </message>
- <message>
- <source>Si&ze</source>
- <translation type="obsolete">Dimen&sione</translation>
- </message>
- <message>
- <source>S&pacing</source>
- <translation type="obsolete">S&paziatura</translation>
- </message>
- <message>
- <source> Font: </source>
- <translation type="obsolete"> Font: </translation>
- </message>
- <message>
- <source>Unknown font "%1", using default</source>
- <translation type="obsolete">Font "%1" sconosciuto, uso quello predefinito</translation>
- </message>
- <message>
- <source> Size: </source>
- <translation type="obsolete"> Dimensione: </translation>
- </message>
- <message>
- <source> Spacing: </source>
- <translation type="obsolete"> Spaziatura: </translation>
- </message>
- <message>
- <source>LilyPond Preview Options</source>
- <translation type="obsolete">Opzioni dell'Anteprima Lilypond</translation>
- </message>
- <message>
- <source>LilyPond preview options</source>
- <translation type="obsolete">Opzioni dell'anteprima Lilypond</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Esportazione fallita. Il file non può essere aperto per la scrittura.</translation>
- </message>
- <message>
- <source>Unknown font action %1</source>
- <translation type="obsolete">Azione %1 sul carattere sconosciuta</translation>
- </message>
- <message>
- <source>Unknown font size action %1</source>
- <translation type="obsolete">Azione %1 sulla dimensione dei caratteri sconosciuta</translation>
- </message>
- <message>
- <source>Unknown spacing action %1</source>
- <translation type="obsolete">Azione %1 sulla spaziatura sconosciuta</translation>
- </message>
- <message>
- <source>Can't paste multiple Segments into one</source>
- <translation type="obsolete">Non è possibile incollare segmenti multipli in uno solo</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
- <message>
- <source>Couldn't paste at this point.</source>
- <translation type="obsolete">Non è possibile incollare in questo punto.</translation>
- </message>
- <message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">Il modo di incollare Ristretto richiede uno spazio vuoto sufficiente (contenente solo pause) nella posizione di incollaggio, per poter contenere tutti gli eventi da incollare.
-Non è stato trovato spazio sufficiente.
-Se vuoi incollare comunque, prova ad usare un altro tipo di incollaggio dall'opzione "Incolla..." nel menù "Modifica". Puoi anche cambiare l'azione di incollaggio predefinita, se vuoi.</translation>
- </message>
- <message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">Gli appunti sono vuoti</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">Inserimento del contenuto degli appunti in corso...</translation>
- </message>
- <message>
- <source>Raising velocities...</source>
- <translation type="obsolete">Aumento delle velocità ...</translation>
- </message>
- <message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">Diminuzione delle velocità ...</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Imposta velocità dell'evento</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Impostazione velocità ...</translation>
- </message>
- <message>
- <source>Unknown note insert action %1</source>
- <translation type="obsolete">Azione %1 di inserimento nota sconosciuta</translation>
- </message>
- <message>
- <source>Inserting note</source>
- <translation type="obsolete">Inserimento nota</translation>
- </message>
- <message>
- <source>Ornament track %1 bar %2</source>
- <translation type="obsolete">Ornamento traccia %1 battuta %2</translation>
- </message>
- <message>
- <source>Ornament bar %1</source>
- <translation type="obsolete">Ornamento battuta %1</translation>
- </message>
- <message>
- <source>Make Ornament</source>
- <translation type="obsolete">Fai ornamento</translation>
- </message>
- <message>
- <source>Use Ornament</source>
- <translation type="obsolete">Usa ornamento</translation>
- </message>
- <message>
- <source>Remove Ornaments</source>
- <translation type="obsolete">Rimuovi gli ornamenti</translation>
- </message>
- <message>
- <source>Estimated key signature shown</source>
- <translation type="obsolete">Tonalità stimata</translation>
- </message>
- <message>
- <source>Sustain</source>
- <translation type="obsolete">Sustain</translation>
- </message>
- <message>
- <source>There is no sustain controller defined for this device.
-Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
- <translation type="obsolete">Non c'è un controllo del sustain per questo dispositivo.
-Accertati che il dispositivo sia correttamente configurato alla voce
-'Gestisci dispositivi MIDI' nella finestra principale.</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">Stima della misura del tempo mostrata</translation>
- </message>
- <message>
- <source>Can't insert note: No note duration selected</source>
- <translation type="obsolete">Non posso inserire la nota. Nessuna durata di nota selezionata</translation>
- </message>
- <message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">Tempo: %1 (%2.%3s)</translation>
- </message>
- <message>
- <source>%1 - Segment Track #%2 - Notation</source>
- <translation type="obsolete">%1 - Traccia segmento #%2 - Notazione</translation>
- </message>
- <message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">%1 - Tutti i segmenti - Notazione</translation>
- </message>
- <message>
- <source>Triplet</source>
- <translation type="obsolete">Terzina</translation>
- </message>
- <message>
- <source>Chord</source>
- <translation type="obsolete">Accordo</translation>
- </message>
- <message>
- <source>Grace</source>
- <translation type="obsolete">Abbellimento</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">Trasporto</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">Per numero di semitoni: </translation>
- </message>
-</context>
-<context>
<name>Rosegarden::NormalizeRestsCommand</name>
<message>
<location filename="../../src/commands/notation/NormalizeRestsCommand.h" line="+49"/>
@@ -19059,13 +17856,13 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Notazione</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Modalità di visualizzazione predefinita</translation>
</message>
@@ -19095,18 +17892,6 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>%1 % (normale)</translation>
</message>
<message>
- <source>Default duration factor</source>
- <translation type="obsolete">Fattore predefinito di durata</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Nessuno</translation>
- </message>
- <message>
- <source>Full</source>
- <translation type="obsolete">Pieno</translation>
- </message>
- <message>
<location line="+12"/>
<source>Show track headers (linear layout only)</source>
<translation>Mostra le intestazioni della traccia (solo per la visualizzazione lineare)</translation>
@@ -19319,10 +18104,6 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Dimensione dei caratteri per la vista a più pentagrammi</translation>
</message>
<message>
- <source>Font size for printing (pt)</source>
- <translation type="obsolete">Dimensione dei caratteri per la stampa (punti)</translation>
- </message>
- <message>
<location line="+18"/>
<source>Text font</source>
<translation>Font del testo</translation>
@@ -19633,18 +18414,6 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<context>
<name>Rosegarden::NotationView</name>
<message>
- <source>Close track headers</source>
- <translation type="obsolete">Chiudi le intestazioni di traccia</translation>
- </message>
- <message>
- <source>Starting...</source>
- <translation type="obsolete">Avvio in corso...</translation>
- </message>
- <message>
- <source>Preparing to print...</source>
- <translation type="obsolete">Preparazione alla stampa...</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NotationView.cpp" line="+121"/>
<source>Note &Font</source>
<translation>&Font delle note</translation>
@@ -19659,89 +18428,41 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<source>S&pacing</source>
<translation>S&paziatura</translation>
</message>
- <message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">Fattore di du&rata</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">Nessuno</translation>
- </message>
<message numerus="yes">
<location line="-8"/>
- <source>%n pixel(s)</source>
- <translation>
- <numerusform>%n pixel </numerusform>
- <numerusform>%n pixel </numerusform>
- </translation>
- </message>
- <message>
- <location line="+150"/>
- <source> Font: </source>
- <translation> Font: </translation>
- </message>
- <message>
- <location line="+35"/>
- <source>Unknown font "%1", using default</source>
- <translation>Font "%1" sconosciuto, uso quello predefinito</translation>
- </message>
- <message>
- <location line="+8"/>
- <source> Size: </source>
- <translation> Dimensione: </translation>
- </message>
- <message>
- <location line="+24"/>
- <source> Spacing: </source>
- <translation> Spaziatura: </translation>
- </message>
- <message>
- <source> Ready.</source>
- <translation type="obsolete"> Pronto.</translation>
- </message>
- <message>
- <source>Laying out score...</source>
- <translation type="obsolete">Impaginazione della partitura in corso...</translation>
- </message>
- <message>
- <source>Laying out staff %1...</source>
- <translation type="obsolete">Impaginazione del rigo %1...</translation>
- </message>
- <message>
- <source>Reconciling staffs...</source>
- <translation type="obsolete">Riallineando i pentagrammi...</translation>
- </message>
- <message>
- <location line="-115"/>
- <source> No selection </source>
- <translation> Nessuna selezione</translation>
- </message>
- <message>
- <source>Sizing and allocating canvas...</source>
- <translation type="obsolete">Dimensionando e posizionando i tracciati...</translation>
+ <source>%n pixel(s)</source>
+ <translation>
+ <numerusform>%n pixel </numerusform>
+ <numerusform>%n pixel </numerusform>
+ </translation>
</message>
<message>
- <source>note</source>
- <translation type="obsolete">nota</translation>
+ <location line="+152"/>
+ <source> Font: </source>
+ <translation> Font: </translation>
</message>
<message>
- <source>rest</source>
- <translation type="obsolete">pausa</translation>
+ <location line="+35"/>
+ <source>Unknown font "%1", using default</source>
+ <translation>Font "%1" sconosciuto, uso quello predefinito</translation>
</message>
<message>
- <source>%1 - Segment Track #%2 - Notation</source>
- <translation type="obsolete">%1 - Traccia segmento #%2 - Notazione</translation>
+ <location line="+8"/>
+ <source> Size: </source>
+ <translation> Dimensione: </translation>
</message>
<message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">%1 - Tutti i segmenti - Notazione</translation>
+ <location line="+24"/>
+ <source> Spacing: </source>
+ <translation> Spaziatura: </translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Terzina</translation>
+ <location line="-117"/>
+ <source> No selection </source>
+ <translation> Nessuna selezione</translation>
</message>
<message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation>Accordo</translation>
</message>
@@ -19758,57 +18479,21 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<translation>%1 %2</translation>
</message>
<message>
- <source>Hidden annotations</source>
- <translation type="obsolete">Annotazioni nascoste</translation>
- </message>
- <message>
- <source>Hidden LilyPond directives</source>
- <translation type="obsolete">LilyPond nascosto</translation>
- </message>
- <message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation>Azione %1 sulla spaziatura sconosciuta</translation>
</message>
<message>
- <source>Unknown proportion action %1</source>
- <translation type="obsolete">Azione %1 di proporzione sconosciuta</translation>
- </message>
- <message>
<location line="-51"/>
<source>Unknown font action %1</source>
<translation>Azione %1 sul carattere sconosciuta</translation>
</message>
<message>
- <source>Unknown font size %1</source>
- <translation type="obsolete">Dimensione %1 del carattere sconosciuta</translation>
- </message>
- <message>
<location line="+26"/>
<source>Unknown font size action %1</source>
<translation>Azione %1 sulla dimensione dei caratteri sconosciuta</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">Stampa in corso...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Anteprime in corso...</translation>
- </message>
- <message>
- <source>Printing LilyPond file...</source>
- <translation type="obsolete">Stampa del file Lilypond...</translation>
- </message>
- <message>
- <source>Failed to open a temporary file for LilyPond export.</source>
- <translation type="obsolete">Apertura non riuscita di un file temporaneo per l'esportazione Lilypond.</translation>
- </message>
- <message>
- <source>Previewing LilyPond file...</source>
- <translation type="obsolete">Anteprima del file Lilypond...</translation>
- </message>
- <message>
<location line="-147"/>
<source>LilyPond Preview Options</source>
<translation>Opzioni dell'Anteprima Lilypond</translation>
@@ -19819,37 +18504,17 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<translation>Opzioni dell'anteprima Lilypond</translation>
</message>
<message>
- <source>Exporting LilyPond file...</source>
- <translation type="obsolete">Esportazione del file Lilypond...</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Esportazione fallita. Il file non può essere aperto per la scrittura.</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">Incolla la selezione negli appunti...</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">Eliminazione della selezione in corso...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">Copia in corso della selezione negli appunti...</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Gli appunti sono vuoti</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>Non è possibile incollare segmenti multipli in uno solo</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -19864,23 +18529,22 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+88"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>Stampando con LilyPond...</translation>
</message>
@@ -19895,29 +18559,29 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<translation><qt><p>Non riesco ad aprire un file temporaneo per l'esportazione a LilyPond.</p><p>Questo probabilmente significa che hai finito lo spazio disco su <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation><qt><p>Il modo di incollare Ristretto richiede uno spazio vuoto sufficiente (contenente solo pause) nella posizione di incollamento, per poter contenere tutti gli eventi da incollare.</p><p>Non è stato trovato spazio sufficiente.</p><p>Se volete incollare comunque, provate ad usare un altro modo di incollare dall'opzione <b>Incolla...</b> nel menù Modifica. Volendo, potete anche cambiare il modo di incollare predefinito.</p></qt></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>Inserimento del contenuto degli appunti in corso...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>Non è possibile incollare in questo punto.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation>Muovi eventi sul rigo sopra</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>Aumento delle velocità ...</translation>
</message>
@@ -19927,15 +18591,7 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<translation>Diminuzione delle velocità ...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Imposta velocità dell'evento</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Impostazione velocità ...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation>Modifica gli Eventi del Testo</translation>
</message>
@@ -19950,11 +18606,7 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<translation>Unendo le note...</translation>
</message>
<message>
- <source>No note duration selected</source>
- <translation type="obsolete">Nessuna durata nota selezionata</translation>
- </message>
- <message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation>Azione %1 di inserimento nota sconosciuta</translation>
</message>
@@ -19964,29 +18616,13 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<translation>Inserimento nota</translation>
</message>
<message>
- <source>No rest duration selected</source>
- <translation type="obsolete">Nessuna durata di pausa selezionata</translation>
- </message>
- <message>
- <source>No note or rest duration selected</source>
- <translation type="obsolete">Nessuna durata di nota o di pausa selezionata</translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">Quantizzazione in corso...</translation>
- </message>
- <message>
- <source>Interpreting selection...</source>
- <translation type="obsolete">Interpretazione della selezione...</translation>
- </message>
- <message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation>Aggiunta di un punto...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation>Ornamento traccia %1 battuta %2</translation>
</message>
@@ -19996,10 +18632,6 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<translation>Ornamento battuta %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Fai ornamento</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>Usa ornamento</translation>
@@ -20035,7 +18667,7 @@ Questo è un baco (il programma avrebbe dovuto interrompersi...)</translation>
<translation>Sustain</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>Non c'è un controllo del sustain per questo dispositivo.
@@ -20048,7 +18680,7 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Stima della misura del tempo mostrata</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - Traccia del Segmento #%3 - Notazione</translation>
</message>
@@ -20081,7 +18713,7 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Per numero di semitoni: </translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>Tempo: %1 (%2.%3s)</translation>
</message>
@@ -20130,16 +18762,11 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<source>Cycling slashes...</source>
<translation>Cambiando gli slash...</translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>Non posso inserire la nota. Nessuna durata di nota selezionata</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Ingrandimento</translation>
</message>
@@ -20164,7 +18791,7 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Chiudi le intestazioni di traccia</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Girate la rotella per cambiare il segmento attivo</qt></translation>
@@ -20386,10 +19013,6 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">Sequenza di curva dell'altezza</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>Preset</translation>
@@ -20400,10 +19023,6 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Preset:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">Utente</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -20631,14 +19250,6 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Pre-Curva</translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Valore (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Durata (%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation>Durata della rampa (%):</translation>
@@ -20659,31 +19270,11 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Valore della fine (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">Ampiezza dell'inizio del vibrato (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">Ampiezza della fine del vibrato (%):</translation>
- </message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation>Sequenza della curva</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Lunghezza d'onda del vbrato:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">RIsoluzione:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Tempo finale non valido. Avete selezionato almeno un evento?</translation>
@@ -20867,14 +19458,6 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Sposta in basso</translation>
</message>
<message>
- <source>Delete</source>
- <translation type="obsolete">Cancella</translation>
- </message>
- <message>
- <source>Clear</source>
- <translation type="obsolete">Azzera</translation>
- </message>
- <message>
<location line="+1"/>
<source>Remove</source>
<translation>Rimuovi</translation>
@@ -21022,18 +19605,10 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<context>
<name>Rosegarden::ProgressDialog</name>
<message>
- <source>Processing...</source>
- <translation type="obsolete">Elaborazione in corso...</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/ProgressDialog.cpp" line="+65"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
- <message>
- <source><qt><h3>Processing...</h3></qt></source>
- <translation type="obsolete"><qt><h3>Elaborazione in corso...</h3></qt></translation>
- </message>
</context>
<context>
<name>Rosegarden::ProjectPackager</name>
@@ -21226,23 +19801,12 @@ Accertati che il dispositivo sia correttamente configurato alla voce
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1 controller</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
<source>Quantize</source>
<translation>Quantizza</translation>
</message>
- <message>
- <source>Advanced</source>
- <translation type="obsolete">Avanzato</translation>
- </message>
</context>
<context>
<name>Rosegarden::QuantizeParameters</name>
@@ -21324,12 +19888,12 @@ Accertati che il dispositivo sia correttamente configurato alla voce
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Nessuno</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>2 nel tempo di 3</translation>
</message>
@@ -21374,10 +19938,6 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Dopo la quantizzazione</translation>
</message>
<message>
- <source>Show advanced options</source>
- <translation type="obsolete">Mostra le opzioni avanzate</translation>
- </message>
- <message>
<location line="+6"/>
<source>Re-beam</source>
<translation>Ri-collega</translation>
@@ -21398,18 +19958,10 @@ Accertati che il dispositivo sia correttamente configurato alla voce
<translation>Dividi-e-lega gli accordi sovrapposti</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Quantizzazione piena</translation>
</message>
- <message>
- <source>Show Advanced Options</source>
- <translation type="obsolete">Mostra le Opzioni Avanzate</translation>
- </message>
- <message>
- <source>Hide Advanced Options</source>
- <translation type="obsolete">Nascondi le Opzioni Avanzate</translation>
- </message>
</context>
<context>
<name>Rosegarden::RawNoteRuler</name>
@@ -21707,10 +20259,6 @@ Potrebbero esserci alcune incompatibilità di formato.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <source>Open Directory</source>
- <translation type="obsolete">Apri la directory</translation>
- </message>
- <message>
<location line="+1335"/>
<source>Loading plugins...</source>
<translation>Caricando i moduli...</translation>
@@ -21727,12 +20275,6 @@ Potrebbero esserci alcune incompatibilità di formato.</translation>
<context>
<name>Rosegarden::RosegardenDocument</name>
<message>
- <source>The current file has been modified.
-Do you want to save it?</source>
- <translation type="obsolete">Il file corrente è stato modificato.
-Vuoi salvarlo?</translation>
- </message>
- <message>
<location filename="../../src/document/RosegardenDocument.cpp" line="+345"/>
<source>Rosegarden - Warning</source>
<translation>Rosegarden - Attenzione</translation>
@@ -21756,8 +20298,8 @@ Vuoi salvarlo?</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -21769,7 +20311,7 @@ Vuoi salvarlo?</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>Non riesco a salvare il documento in %1</translation>
</message>
@@ -21851,7 +20393,12 @@ Scegli quelli che vuoi cancellare definitivamente dal disco fisso.
<translation>Inserisci</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>Non riesco a creare un file temporaneo nella directory di.'%1': %2</translation>
</message>
@@ -21866,7 +20413,7 @@ Scegli quelli che vuoi cancellare definitivamente dal disco fisso.
<translation>Non riesco a rinominare il file temporaneo di uscita '%1' nel file desiderato '%2'</translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation>Attenzione</translation>
</message>
@@ -21880,11 +20427,7 @@ Prova a impostare il percorso del file audio su una directory valida nelle Propr
Vuoi impostarlo adesso?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Salvataggio file in corso...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation>Errore durante la scrittura su '%1'</translation>
</message>
@@ -21944,10 +20487,6 @@ Raccomandiamo di risalvare questo file in questa versione di Rosegarden,
affinché sia ancora leggibile nelle prossime versioni.</translation>
</message>
<message>
- <source><qt><h2>Channels were remapped</h2><p>Beginning with version 10.02, Rosegarden no longer provides controls for changing the channel associated with each MIDI instrument. Instead, each instrument uses the same channel as its instrument number. For example, "MIDI Input System Device #12" always uses channel 12.</p><p>The file you just loaded contained instruments whose channels differed from the instrument numbers. These channels have been reassigned so that instrument #1 will always use channel 1, regardless of what channel it might have used previously. In most cases, you will experience no difference, but you may have to make some small changes to this file in order for it to play as intended. We recommend that you save this file in order to avoid seeing this warning in the future.</p><p>We apologize for any inconvenience.</p></qt></source>
- <translation type="obsolete"><qt><h2>I canali sono stati rimappati</h2><p>A partire dalla versione 10.02 Rosegarden non offre più i controlli per cambiare il canale associato ad ogni strumento Midi.</p><p>Il file che hai appena aperto contiene strumenti i cui canali differiscono dai numeri di strumento. Questi canali sono stati riassegnati in modo che il primo strumento userà sempre il primo canale, senza tener conto del canale che utilizzava precedentemente. Nella maggior parte dei casi, non avvertirai differenza, ma potresti dover effettuare alcuni piccoli cambiamenti affinché esso suoni come previsto. Suggeriamo di salvarlo per evitare di ricevere nuovamente questo avviso.</p><p>Ci scusiamo per eventuali inconvenienti.</p></qt></translation>
- </message>
- <message>
<location line="+650"/>
<source>Insert Recorded MIDI</source>
<translation>Inserisci un file MIDI registrato</translation>
@@ -21967,11 +20506,7 @@ affinché sia ancora leggibile nelle prossime versioni.</translation>
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <source>No non-audio segments in composition</source>
- <translation type="obsolete">Non ci sono segmenti non-audio nella composizione</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>La selezione deve contenere solo segmenti audio o non-audio</translation>
</message>
@@ -21982,7 +20517,7 @@ affinché sia ancora leggibile nelle prossime versioni.</translation>
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -21991,7 +20526,7 @@ affinché sia ancora leggibile nelle prossime versioni.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -22000,12 +20535,6 @@ affinché sia ancora leggibile nelle prossime versioni.</translation>
<translation>Nessun segmento non-audio selezionato</translation>
</message>
<message>
- <source>You've not yet defined an audio editor for Rosegarden to use.
-See Settings -> Configure Rosegarden -> Audio.</source>
- <translation type="obsolete">Non hai ancora definito un editor audio per Rosegarden.
-Guarda Impostazioni -> Configura Rosegarden -> Audio.</translation>
- </message>
- <message>
<location line="+78"/>
<source>You've not yet defined an audio editor for Rosegarden to use.
See Edit -> Preferences -> Audio.</source>
@@ -22013,16 +20542,12 @@ See Edit -> Preferences -> Audio.</source>
Guarda Impostazioni -> Configura Rosegarden -> Audio.</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Importazione di un file audio esterno</translation>
- </message>
- <message>
<location line="-439"/>
<source>Pitch Tracker can only contain 1 segment.</source>
<translation>L'editor dellìaltezza può contenere solo 1 segmento.</translation>
</message>
<message>
- <location line="+1203"/>
+ <location line="+1196"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation>Impossibile aggiungere file eliminato. JACK audio server non è disponibile.</translation>
</message>
@@ -22091,14 +20616,14 @@ Guarda Impostazioni -> Configura Rosegarden -> Audio.</translation>
<translation>Avvio in corso...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> Ingrandimento: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -22127,12 +20652,12 @@ Vuoi aprire questo?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Senza Titolo</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -22172,12 +20697,12 @@ L'errore è: %2</translation>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Tutti i file supportati</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -22197,33 +20722,33 @@ L'errore è: %2</translation>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Tutti i file</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Apri file</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -22233,24 +20758,20 @@ L'errore è: %2</translation>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>Impossibile aprire il file '%1'</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>Salvataggio file in corso...</translation>
</message>
<message>
- <source>Save File</source>
- <translation type="obsolete">Salva File</translation>
- </message>
- <message>
<location line="+111"/>
<source><qt>Sorry.<br>"%1" is not a valid filename.</qt></source>
<translation><qt>Mi spiace.<br>"%1" non è un nome di file valido.</qt></translation>
@@ -22286,14 +20807,6 @@ L'errore è: %2</translation>
<translation>Chiusura file in corso...</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">Stampa in corso...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">Anteprime in corso...</translation>
- </message>
- <message>
<location line="+13"/>
<source>Exiting...</source>
<translation>Uscita in corso...</translation>
@@ -22351,12 +20864,12 @@ L'errore è: %2</translation>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Allarme</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -22415,12 +20928,12 @@ Vuoi impostarla adesso?</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Imposta il ritmo globale</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>Mostra/Nascondi la barra...</translation>
</message>
@@ -22488,12 +21001,12 @@ Vuoi impostarla adesso?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>File di progetto di Rosegarden</translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation><qt><p>Dovete scegliere un nome per la composizione prima di registrare dell'audio.</p><p>I file audio verranno salvati in <b>%1</b> come <b>rg-[<i>nome file</i>]-[<i>strumento</i>]-<i>data</i>_<i>ora</i>-<i>n</i>.wav</b>. Se volete, potete rinominare anche gli sturmeni audio prima di registrare. Per maggiori informazioni, consultate il <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Wiki di Rosegarden</a>.</p></qt></translation>
</message>
@@ -22503,13 +21016,13 @@ Vuoi impostarla adesso?</translation>
<translation>Ingresso</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-en</translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -22533,8 +21046,8 @@ Vuoi impostarla adesso?</translation>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -22544,7 +21057,7 @@ Vuoi impostarla adesso?</translation>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -22562,8 +21075,8 @@ Vuoi impostarla adesso?</translation>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -22572,146 +21085,74 @@ Vuoi impostarla adesso?</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
- <translation>http://rosegardenmusic.com/tutorials/</translation>
- </message>
- <message>
- <location line="+504"/>
- <source><h3>Newer version available</h3></source>
- <translation><h3>Nuova versione disponibile</h3></translation>
- </message>
- <message>
- <location line="+1"/>
- <source><p>You are using version %1. Version %2 is now available.</p><p>Please consult the <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Rosegarden website</a> for more information.</p></source>
- <translation><p>State usando la versione %1. Ora è disponibile la versione %2.</p><p>Visitate il <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">sito di Rosegarden</a> per maggiori informazioni.</p></translation>
- </message>
- <message>
- <location line="-4587"/>
- <source>Open MIDI File</source>
- <translation>Apri file MIDI</translation>
- </message>
- <message>
- <location line="+36"/>
- <source>Merge MIDI File</source>
- <translation>Inserisci file MIDI</translation>
- </message>
- <message>
- <location line="+127"/>
- <source>Importing MIDI file...</source>
- <translation>Importazione in corso del file MIDI...</translation>
- </message>
- <message>
- <location line="+39"/>
- <source>Calculating notation...</source>
- <translation>Calcolando la notazione...</translation>
- </message>
- <message>
- <location line="+53"/>
- <source>Calculate Notation</source>
- <translation>Calcola la notazione</translation>
- </message>
- <message>
- <location line="+49"/>
- <location line="+36"/>
- <source>Open X11 Rosegarden File</source>
- <translation>Apri un file di Rosegrden X11</translation>
- </message>
- <message>
- <location line="-35"/>
- <location line="+36"/>
- <source>X11 Rosegarden files</source>
- <translation>File di Rosegrden X11</translation>
- </message>
- <message>
- <location line="+33"/>
- <source>Importing X11 Rosegarden file...</source>
- <translation>Importazione del file di Rosegarden X11...</translation>
- </message>
- <message>
- <location line="+21"/>
- <source>Can't load X11 Rosegarden file. It appears to be corrupted.</source>
- <translation>Non riesco a caricare il file di Rosegarden X11. Sembra danneggiato.</translation>
- </message>
- <message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Apri un file Hydrogen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Importazione in corso del file Hydrogen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Non posso caricare il file di Hydrogen. Sembra danneggiato.</translation>
- </message>
- <message>
- <source>Export and import of Rosegarden Project files</source>
- <translation type="obsolete">Esporta e importa i file di progetto di Rosegarden</translation>
- </message>
- <message>
- <source>The Rosegarden Project Packager helper script</source>
- <translation type="obsolete">Script di aiuto per il Rosegarden Project Packager</translation>
- </message>
- <message>
- <source>%1 - for project file support</source>
- <translation type="obsolete">%1 - per supporto ai file di progetto</translation>
- </message>
- <message>
- <source>Notation previews through LilyPond</source>
- <translation type="obsolete">Anteprima di notazione con Lilypond</translation>
+ <translation>http://rosegardenmusic.com/tutorials/</translation>
</message>
<message>
- <source>The Rosegarden LilyPondView helper script</source>
- <translation type="obsolete">Script di aiuto per il visualizzatore LilyPond di Rosegarden</translation>
+ <location line="+484"/>
+ <source><h3>Newer version available</h3></source>
+ <translation><h3>Nuova versione disponibile</h3></translation>
</message>
<message>
- <source>%1 - for LilyPond preview support</source>
- <translation type="obsolete">%1 - per il supporto all'anteprima di LilyPond</translation>
+ <location line="+1"/>
+ <source><p>You are using version %1. Version %2 is now available.</p><p>Please consult the <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Rosegarden website</a> for more information.</p></source>
+ <translation><p>State usando la versione %1. Ora è disponibile la versione %2.</p><p>Visitate il <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">sito di Rosegarden</a> per maggiori informazioni.</p></translation>
</message>
<message>
- <source>General audio file import and conversion</source>
- <translation type="obsolete">Importazione e conversione di file audio generali</translation>
+ <location line="-4533"/>
+ <source>Open MIDI File</source>
+ <translation>Apri file MIDI</translation>
</message>
<message>
- <source>The Rosegarden Audio File Importer helper script</source>
- <translation type="obsolete">Script di aiuto per l'importazione di file audio in Rosegarden</translation>
+ <location line="+36"/>
+ <source>Merge MIDI File</source>
+ <translation>Inserisci file MIDI</translation>
</message>
<message>
- <source>%1 - for audio file import</source>
- <translation type="obsolete">%1 - per l'importazione di file audio</translation>
+ <location line="+124"/>
+ <source>Importing MIDI file...</source>
+ <translation>Importazione in corso del file MIDI...</translation>
</message>
<message>
- <source><h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features. The following features will not be available:</p></source>
- <translation type="obsolete"><h3>Programmi di aiuto non trovati</h3><p>Rosegarden non trova uno o più programmi di aiuto di cui ha bisogno. Le seguenti caratteristiche non saranno disponibili:<p></translation>
+ <location line="+36"/>
+ <source>Calculating notation...</source>
+ <translation>Calcolando la notazione...</translation>
</message>
<message>
- <source><ul></source>
- <translation type="obsolete"><ul></translation>
+ <location line="+53"/>
+ <source>Calculate Notation</source>
+ <translation>Calcola la notazione</translation>
</message>
<message>
- <source><li>%1</li></source>
- <translation type="obsolete"><li>%1</li></translation>
+ <location line="+49"/>
+ <location line="+36"/>
+ <source>Open X11 Rosegarden File</source>
+ <translation>Apri un file di Rosegrden X11</translation>
</message>
<message>
- <source></ul></source>
- <translation type="obsolete"></ul></translation>
+ <location line="-35"/>
+ <location line="+36"/>
+ <source>X11 Rosegarden files</source>
+ <translation>File di Rosegrden X11</translation>
</message>
<message>
- <source><p>To fix this, you should install the following additional programs:</p></source>
- <translation type="obsolete"><p>Per sistemare questo, dovresti installare i seguenti programmi:</p></translation>
+ <location line="+33"/>
+ <source>Importing X11 Rosegarden file...</source>
+ <translation>Importazione del file di Rosegarden X11...</translation>
</message>
<message>
- <source>Helper programs not found</source>
- <translation type="obsolete">Programmi di aiuto non trovati</translation>
+ <location line="+21"/>
+ <source>Can't load X11 Rosegarden file. It appears to be corrupted.</source>
+ <translation>Non riesco a caricare il file di Rosegarden X11. Sembra danneggiato.</translation>
</message>
<message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>Non riesco ad aprire un file temporaneo per l'esportazione a LilyPond.</p><p>Questo probabilmente significa che hai finito lo spazio disco su <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>Il processo del sequencer di Rosegarden è terminato inaspettatamente.
@@ -22719,12 +21160,12 @@ In questa sessione non sarà possibile suonare e registrare.
Prova a chiudere e riavviare Rosegarden per ripristinare il suono.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>Avvio sequencer...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>Salvando file%1con un nuovo nome...</translation>
@@ -22772,7 +21213,7 @@ Nessun segmento sarà spezzato.</translation>
<translation>Rimuovere Tempo Iniziale e Segno di Metro</translation>
</message>
<message>
- <location line="+1394"/>
+ <location line="+1388"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation>Apri file MusicXML</translation>
@@ -22803,7 +21244,7 @@ Per assistenza sulla corretta configurazione audio e MIDI vai su http://rosegard
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -22811,7 +21252,7 @@ Per assistenza sulla corretta configurazione audio e MIDI vai su http://rosegard
<translation>Esporta come...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Fallito il salvataggio del file di Rosegarden al pacchetto: %1</translation>
</message>
@@ -22827,7 +21268,7 @@ Per assistenza sulla corretta configurazione audio e MIDI vai su http://rosegard
<translation>File MIDI standard</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -22894,9 +21335,9 @@ Per assistenza sulla corretta configurazione audio e MIDI vai su http://rosegard
<translation>Esportazione in corso del file MusicXML...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>File XML</translation>
</message>
@@ -22991,21 +21432,17 @@ Vuoi impostarlo adesso?</translation>
<translation>Inserisci una nuova etichetta</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Riproduci la lista</translation>
</message>
<message>
- <source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
- <translation type="obsolete">http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</translation>
- </message>
- <message>
<location line="+51"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>Accodando gli eventi di panico MIDI per la trasmissione...</translation>
</message>
@@ -23085,7 +21522,7 @@ L'errore è: %2</translation>
<translation><qt><p>Clicca e trascina su e giù o a destra e sinistra per modificare.</p><p>Doppio click per immettere direttamente il valore.</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Scegli un nuovo valore</translation>
</message>
@@ -23137,7 +21574,7 @@ L'errore è: %2</translation>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Cambia il colore del segmento...</translation>
</message>
@@ -23180,7 +21617,7 @@ L'errore è: %2</translation>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Clicca su un segmento per cancellarlo</translation>
</message>
@@ -23213,7 +21650,7 @@ L'errore è: %2</translation>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">&Unisci</translation>
</message>
@@ -23221,7 +21658,7 @@ L'errore è: %2</translation>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>Rie&tichettatura...</translation>
</message>
@@ -23258,22 +21695,22 @@ L'errore è: %2</translation>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>Sposta il segmento</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>Sposta i segmenti</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Tieni premuto Maiusc per evitare la divisione sulla griglia del ritmo</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>Clicca e trascina per muovere un segmento</translation>
</message>
@@ -23469,12 +21906,12 @@ prima della nuova trasposizione per essere applicata.</translation>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>Tieni premuto Maiusc per evitare di dividere alle battute</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>Registra o lascia qui l'audio</translation>
</message>
@@ -23550,7 +21987,7 @@ prima della nuova trasposizione per essere applicata.</translation>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Allarme</translation>
</message>
@@ -23575,17 +22012,17 @@ Vuoi impostarlo adesso?</translation>
<translation>Generazione anteprima audio...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Ridimensiona segmento</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Tieni premuto Maiusc per evitare la divisione sulla griglia del ritmo</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>Tieni premuto Maiusc per evitare di seguire la griglia del ritmo; tieni premuto anche Control per risclalare i contenuti</translation>
</message>
@@ -23595,7 +22032,7 @@ Vuoi impostarlo adesso?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>Clicca e trascina per ridimensionare un segmento; tieni premuto Control per riscalare anche il contenuto</translation>
</message>
@@ -23608,25 +22045,25 @@ Vuoi impostarlo adesso?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Clicca e trascina per selezionare i segmenti</translation>
</message>
<message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Sposta il segmento</numerusform>
- <numerusform>Sposta i %n segmenti</numerusform>
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+154"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Tieni premuto Maiusc per evitare la divisione sulla griglia del ritmo</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>Clicca e trascina per selezionare i segmenti; tasto centrale e trascina per disegnare un segmento vuoto</translation>
</message>
@@ -23651,19 +22088,11 @@ Vuoi impostarlo adesso?</translation>
<translation>Fare clic e trascinare per spostare i segmenti; tenere premuto Ctrl e copiarli; Ctrl + Alt per le copie legate; doppio-click per editare</translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">Clicca e trascina per muovere i segmenti; tieni premuto Control per copiarli</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation>Clicca e trascina per copiare i segmenti</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">Clicca e trascina per muovere il segmento; tieni premuto Control per copiarlo; doppio click per modificarlo</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation>Clicca e trascina per copiare il segmento</translation>
@@ -23734,24 +22163,12 @@ Vuoi impostarlo adesso?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Dividi in due il segmento</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Clicca su un segmento per dividerlo in due; tieni premuto Maiusc per evitare la divisione sulla griglia del ritmo</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>Clicca su un segmento per dividerlo in due</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -24583,54 +23000,6 @@ Fermare altre applicazioni attive può migliorare le prestazioni di Rosegarden.<
<translation>Rosegarden</translation>
</message>
<message>
- <source>C</source>
- <translation type="obsolete">Do</translation>
- </message>
- <message>
- <source>C#</source>
- <translation type="obsolete">Do#</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">Re</translation>
- </message>
- <message>
- <source>Eb</source>
- <translation type="obsolete">Mib</translation>
- </message>
- <message>
- <source>E</source>
- <translation type="obsolete">Mi</translation>
- </message>
- <message>
- <source>F</source>
- <translation type="obsolete">Fa</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">Fa#</translation>
- </message>
- <message>
- <source>G</source>
- <translation type="obsolete">Sol</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">Sol#</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">La</translation>
- </message>
- <message>
- <source>Bb</source>
- <translation type="obsolete">Sib</translation>
- </message>
- <message>
- <source>B</source>
- <translation type="obsolete">Si</translation>
- </message>
- <message>
<location line="-276"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
@@ -24642,17 +23011,6 @@ Fermare altre applicazioni attive può migliorare le prestazioni di Rosegarden.<
</message>
</context>
<context>
- <name>Rosegarden::Studio</name>
- <message>
- <source>Audio</source>
- <translation type="obsolete">Audio</translation>
- </message>
- <message>
- <source>Synth plugin</source>
- <translation type="obsolete">Modulo del sintetizzatore</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SustainInsertionCommand</name>
<message>
<location filename="../../src/commands/notation/SustainInsertionCommand.h" line="+51"/>
@@ -25526,7 +23884,7 @@ Fermare altre applicazioni attive può migliorare le prestazioni di Rosegarden.<
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><nesssuno strumento></translation>
</message>
@@ -25541,20 +23899,7 @@ Fermare altre applicazioni attive può migliorare le prestazioni di Rosegarden.<
<translation><senza titolo></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Allarme</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Il percorso del file audio non esiste o non è scrivibile.
-Prova a impostare il percorso del file audio su una directory valida nelle
-Proprietà del documento prima di cominciare a registrare l'audio.
-Vuoi impostarlo adesso?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Zittisci la traccia</translation>
</message>
@@ -25567,25 +23912,17 @@ Vuoi impostarlo adesso?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Trasforma il segmento ripetuto in copie</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Trasforma i segmenti ripetuti in copie</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform>Trasformare %n Segmento ripetizione in copia reale</numerusform>
@@ -25593,7 +23930,7 @@ Vuoi impostarlo adesso?</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform>Trasformare %n Segmento collegato in copia reale</numerusform>
@@ -25601,7 +23938,7 @@ Vuoi impostarlo adesso?</translation>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -25610,18 +23947,10 @@ Vuoi impostarlo adesso?</translation>
<source>Rosegarden cannot accept dropped files of this type.</source>
<translation>Rosegarden non può accettare i files caduti di questo tipo.</translation>
</message>
- <message>
- <source>You can't drop files into Rosegarden from this client. Try using Konqueror instead.</source>
- <translation type="obsolete">Non puoi aprire i file in Rosegarden con questo client. Prova ad usare Konqueror piuttosto.</translation>
- </message>
</context>
<context>
<name>Rosegarden::TrackLabel</name>
<message>
- <source><qt>Click and hold with either mouse button to assign this track to an instrument.</qt></source>
- <translation type="obsolete"><qt>Clicca e tieni premuto con l'uno o con l'altro tasto del mouse per assegnare questa traccia ad uno strumento.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/editors/segment/TrackLabel.cpp" line="+61"/>
<source><qt><p>Click to select all the segments on this track.</p><p>Shift+click to add to or to remove from the selection all the segments on this track.</p><p>Click and hold with either mouse button to assign this track to an instrument.</p></qt></source>
<translation><qt><p>Clicca per selezionare tutti i segmenti su questa traccia.</p><p>Shift+click per aggiungere o rimuovere dalla selezione tutti i segmenti su questa traccia.</p><p>Clicca e tieni con entrambi i bottoni del mouse per assegnare questa traccia ad un strumento.</p><p></translation>
@@ -25655,7 +23984,7 @@ Vuoi impostarlo adesso?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Traccia</translation>
</message>
@@ -25666,12 +23995,12 @@ Vuoi impostarlo adesso?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><senza titolo></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Parametri della riproduzione</translation>
</message>
@@ -25812,7 +24141,103 @@ Vuoi impostarlo adesso?</translation>
<translation><qt><p>I nuovi segmenti saranno generati con questa chiave inserita all'inizio</p></qt></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+2"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">alto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">basso</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">cimbali</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">xilofono</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">chitarra</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">contrabbasso</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">celesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">celesta antica</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">francese</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">soprano</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">mezzosoprano</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">alto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">tenore</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">baritono</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">varbaritone</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">sottobasso</translation>
+ </message>
+ <message>
+ <location line="+39"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation><qt><p>Scegli la nota riproducibile più bassa suggerita, per mezzo di un rigo</p></qt></translation>
</message>
@@ -25842,87 +24267,71 @@ Vuoi impostarlo adesso?</translation>
<translation><qt><p>Carica i parametri del segmento prestabiliti dal nostro database completo degli strumenti reali.</p><p>Quando generate nuovi segmenti, avranno questi parametri al momento della creazione. Per usare questi parametri sugli attuali segmenti (per esempio convertire una parte esistente in passo di concerto per playback su una tromba in SIb) usa <b>Segmento-> Converti notazione per</b> nell' editor della notazione.</p></qt></translation>
</message>
<message>
- <location line="+13"/>
<source>treble</source>
- <translation>alto</translation>
+ <translation type="obsolete">alto</translation>
</message>
<message>
- <location line="+1"/>
<source>bass</source>
- <translation>basso</translation>
+ <translation type="obsolete">basso</translation>
</message>
<message>
- <location line="+1"/>
<source>crotales</source>
- <translation>cimbali</translation>
+ <translation type="obsolete">cimbali</translation>
</message>
<message>
- <location line="+1"/>
<source>xylophone</source>
- <translation>xilofono</translation>
+ <translation type="obsolete">xilofono</translation>
</message>
<message>
- <location line="+1"/>
<source>guitar</source>
- <translation>chitarra</translation>
+ <translation type="obsolete">chitarra</translation>
</message>
<message>
- <location line="+1"/>
<source>contrabass</source>
- <translation>contrabbasso</translation>
+ <translation type="obsolete">contrabbasso</translation>
</message>
<message>
- <location line="+1"/>
<source>celesta</source>
- <translation>celesta</translation>
+ <translation type="obsolete">celesta</translation>
</message>
<message>
- <location line="+1"/>
<source>old celesta</source>
- <translation>celesta antica</translation>
+ <translation type="obsolete">celesta antica</translation>
</message>
<message>
- <location line="+1"/>
<source>french</source>
- <translation>francese</translation>
+ <translation type="obsolete">francese</translation>
</message>
<message>
- <location line="+1"/>
<source>soprano</source>
- <translation>soprano</translation>
+ <translation type="obsolete">soprano</translation>
</message>
<message>
- <location line="+1"/>
<source>mezzosoprano</source>
- <translation>mezzosoprano</translation>
+ <translation type="obsolete">mezzosoprano</translation>
</message>
<message>
- <location line="+1"/>
<source>alto</source>
- <translation>alto</translation>
+ <translation type="obsolete">alto</translation>
</message>
<message>
- <location line="+1"/>
<source>tenor</source>
- <translation>tenore</translation>
+ <translation type="obsolete">tenore</translation>
</message>
<message>
- <location line="+1"/>
<source>baritone</source>
- <translation>baritono</translation>
+ <translation type="obsolete">baritono</translation>
</message>
<message>
- <location line="+1"/>
<source>varbaritone</source>
- <translation>varbaritone</translation>
+ <translation type="obsolete">varbaritone</translation>
</message>
<message>
- <location line="+1"/>
<source>subbass</source>
- <translation>sottobasso</translation>
+ <translation type="obsolete">sottobasso</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+36"/>
<source>Transpose</source>
<translation>Trasporto</translation>
</message>
@@ -25963,7 +24372,7 @@ Vuoi impostarlo adesso?</translation>
<translation><qt><p>I nuovi segmenti saranno generati usando questo colore</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Audio</translation>
@@ -26363,13 +24772,6 @@ Vuoi impostarlo adesso?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Ui</name>
- <message>
- <source>[ No port ]</source>
- <translation type="obsolete">[Porta assente]</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::UnGraceCommand</name>
<message>
<location filename="../../src/commands/notation/UnGraceCommand.h" line="+43"/>
@@ -26606,28 +25008,6 @@ Vuoi impostarlo adesso?</translation>
</message>
</context>
<context>
- <name>RosegardenApplication</name>
- <message>
- <source>Rosegarden - A sequencer and musical notation editor</source>
- <translation type="obsolete">Rosegarden - Un sequencer e editor di partiture musicali</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">Rosegarden</translation>
- </message>
- <message>
- <source>Welcome!</source>
- <translation type="obsolete">Benvenuti!</translation>
- </message>
-</context>
-<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">(registrato)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/ja.ts b/data/locale/ja.ts
index 22e0e6c..785d14a 100644
--- a/data/locale/ja.ts
+++ b/data/locale/ja.ts
@@ -331,23 +331,23 @@
<translation>フォントマッピングファイル %1 ãŒé–‹ã‘ãªã„</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>ファイル(&F)</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>オーディオファイルã®è¿½åŠ (&A)...</translation>
</message>
@@ -357,37 +357,37 @@
<translation>オーディオファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ(&E)...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>é–‰ã˜ã‚‹(&C)</translation>
</message>
<message>
- <location line="-4676"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>編集(&E)</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>オーディオファイルをアンãƒãƒ¼ãƒ‰(&U)</translation>
</message>
@@ -412,155 +412,151 @@
<translation>å†ç”Ÿãƒ—レビュー</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>ヘルプ(&H)</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">&Rosegardenãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«</translation>
- </message>
- <message>
- <location line="-3206"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3121"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>ãƒã‚°å ±å‘Šã‚¬ã‚¤ãƒ‰ãƒ©ã‚¤ãƒ³(&B)</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>Rosegardenã«ã¤ã„ã¦(&A)</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>汎用ツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>アンドゥã§ãã¾ã›ã‚“(&N)</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2636"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>リドゥã§ãã¾ã›ã‚“(&o)</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2530"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>コピー(&C)</translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>貼り付ã‘(&P)</translation>
</message>
<message>
- <location line="-4369"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2802"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>é¸æŠžãƒ„ールã«åˆ‡ã‚Šæ›¿ãˆ</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>ノートã®æŒ¿å…¥ã«åˆ‡ã‚Šæ›¿ãˆ</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>消去ツールã«åˆ‡ã‚Šæ›¿ãˆ</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>ä¿å˜(&S)</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="-1382"/>
<source>&Insert Event</source>
<translation>イベントã®æŒ¿å…¥(&I)</translation>
</message>
@@ -580,33 +576,33 @@
<translation>高度ãªã‚¤ãƒ™ãƒ³ãƒˆã‚¨ãƒ‡ã‚£ã‚¿(&A)</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>カット(&t)</translation>
</message>
<message>
- <location line="-4206"/>
+ <location line="-1366"/>
<source>&Select All</source>
<translation>ã™ã¹ã¦ã‚’é¸æŠž(&S)</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+281"/>
+ <location line="-1114"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>é¸æŠžã‚’解除(&l)</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1363"/>
+ <location line="-1114"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>フィルタã®é¸æŠž(&F)</translation>
</message>
<message>
- <location line="-1644"/>
+ <location line="-1435"/>
<source>Set Se&gment Start Time...</source>
<translation>セグメント開始時間をè¨å®š(&g)...</translation>
</message>
@@ -616,82 +612,82 @@
<translation>セグメントã®ãƒ‡ãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¨å®š(&m)...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>表示(&V)</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>ミュージカルタイム(&M)</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>実時間(&R)</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>絶対時間(&w)</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>セグメント(&g)</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>エディタ(&W)</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>マトリクスエディタã§é–‹ã(&x)</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>èœé¢ã‚¨ãƒ‡ã‚£ã‚¿ã§é–‹ã(&N)</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>Qtã«ã¤ã„ã¦(&Q)</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>セーニョ記å·ã‚’è¿½åŠ (&S)</translation>
</message>
@@ -721,7 +717,7 @@
<translation>符点二分音符(&l)</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>音符ã«åˆ‡ã‚Šæ›¿ãˆ(&N)</translation>
</message>
@@ -741,12 +737,12 @@
<translation>符点をOFF(&g)</translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>シンボルツールãƒãƒ¼ã‚’表示(&S)</translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>デュレーションツールãƒãƒ¼</translation>
</message>
@@ -756,41 +752,41 @@
<translation>シンボルツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+2059"/>
+ <location line="-2438"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>リターン</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="-353"/>
+ <location line="+29"/>
<source>Ctrl+Shift+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+T</translation>
@@ -802,11 +798,6 @@
<translation>Ctrl+D</translation>
</message>
<message>
- <source>Enter, Media Play, Ctrl+Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Enter, Media Play, Ctrl+Return</translation>
- </message>
- <message>
<location line="+132"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
@@ -854,7 +845,7 @@
<translation>End</translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>ツールãƒãƒ¼ã‚’表示(&T)</translation>
</message>
@@ -864,205 +855,205 @@
<translation>ステータスãƒãƒ¼ã‚’éš ã™(&a)</translation>
</message>
<message>
- <location line="-4660"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-81"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="-4666"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-2620"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation>F1</translation>
</message>
<message>
- <location line="-4686"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-4368"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2595"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4365"/>
+ <location line="-2765"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4392"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-2671"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>ド</translation>
</message>
<message>
- <location line="-4420"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="-2823"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation>削除</translation>
</message>
<message>
- <location line="-4270"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-2728"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4428"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-3873"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4206"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-2674"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4401"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-2725"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4120"/>
- <location line="+1363"/>
+ <location line="-2540"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1627"/>
+ <location line="-2732"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>アクションツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>時間ツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>トランスãƒãƒ¼ãƒˆãƒ„ールãƒãƒ¼</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>ズームツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,7 +1103,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>マーカã®æŒ¿å…¥</translation>
</message>
@@ -1132,125 +1123,117 @@
<translation>マーカーを編集</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation>F2</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>移動ツールã«åˆ‡ã‚Šæ›¿ãˆ</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation>F5</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>ドãƒãƒ¼ãƒ„ールã«åˆ‡ã‚Šæ›¿ãˆ</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation>F3</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>リサイズツールã«åˆ‡ã‚Šæ›¿ãˆ</translation>
- </message>
- <message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ </message>
+ <message>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation>F4</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">アンドゥã§ãã¾ã›ã‚“(&n)</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">リドゥã§ãã¾ã›ã‚“(&r)</translation>
- </message>
- <message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>削除(&D)</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Delete, Ctrl+D</translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation>グリッド(&G)</translation>
</message>
@@ -1266,13 +1249,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation>0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation>&1/48å˜ä½ã«ã‚¹ãƒŠãƒƒãƒ—(&1)</translation>
</message>
@@ -1283,13 +1266,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation>1/&24å˜ä½ã«ã‚¹ãƒŠãƒƒãƒ—(&2)</translation>
</message>
@@ -1300,13 +1283,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation>1/12å˜ä½ã«ã‚¹ãƒŠãƒƒãƒ—(&o)</translation>
</message>
@@ -1317,13 +1300,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation>3/16å˜ä½ã«ã‚¹ãƒŠãƒƒãƒ—(&3)</translation>
</message>
@@ -1334,13 +1317,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation>3/8å˜ä½ã«ã‚¹ãƒŠãƒƒãƒ—</translation>
</message>
@@ -1351,167 +1334,167 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation>æ‹ã«ã‚¹ãƒŠãƒƒãƒ—(&t)</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation>å°ç¯€ã«ã‚¹ãƒŠãƒƒãƒ—(&b)</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2185"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-3381"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>コンãƒã‚¸ã‚·ãƒ§ãƒ³(&C)</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>テンãƒå¤‰æ›´ã®è¿½åŠ (&m)...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>æ‹åå¤‰æ›´ã‚’è¿½åŠ (&g)...</translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>イベントリストエディタを開ã(&E)</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation>=</translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation>+</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation>-</translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Left</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Right</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Up</translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Down</translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation>Up</translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation>Down</translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Up</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Down</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Alt+I</translation>
@@ -1524,669 +1507,653 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation>コントãƒãƒ¼ãƒ©(&n)</translation>
</message>
<message>
- <source>Cut controller events (&X)</source>
- <translation type="obsolete">コントãƒãƒ¼ãƒ©ã‚¤ãƒ™ãƒ³ãƒˆã‚’カット (&X)</translation>
- </message>
- <message>
- <source>&Copy controller events</source>
- <translation type="obsolete">コントãƒãƒ¼ãƒ©ã‚¤ãƒ™ãƒ³ãƒˆã‚’コピー (&C)</translation>
- </message>
- <message>
- <source>Paste events (&V)</source>
- <translation type="obsolete">イベントを貼り付㑠(&V)</translation>
- </message>
- <message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation>コントãƒãƒ¼ãƒ©ã®å€¤ã‚’è¨å®š (&S)</translation>
</message>
<message>
- <source>&Place a controller for each note</source>
- <translation type="obsolete">å„ノートã«ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ©ã‚’é…ç½® (&P)</translation>
- </message>
- <message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation>コントãƒãƒ¼ãƒ©ã‚·ãƒ¼ã‚±ãƒ³ã‚¹ã‚’挿入 (&o)</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Left</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Right</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+;</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgUp</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgDown</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation>Left</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation>Right</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Left</translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Right</translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation>Pause</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation>F7</translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I/ド</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>I/ドã®â™¯</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II/レã®â™</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II/レ</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation>S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II/レã®â™¯</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III/ミã®â™</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III/ミ</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV/ファ</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV/ファã®â™¯</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V/ソã®â™</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V/ソ</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V/ソã®â™¯</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI/ラã®â™</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI/ラ</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI/ラã®â™¯</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII/ã‚·ã®â™</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII/ã‚·</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation>L</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+E</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation>R</translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Shift+R</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation>U</translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+I</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+I</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation>O</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation>Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+X</translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation>X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Shift+X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation>ソ</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Shift+V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation>N</translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+M</translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation>M</translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation>H</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2516"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -2211,7 +2178,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+929"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Shift+X</translation>
@@ -2243,18 +2210,14 @@
<translation>å°ç¯€ãƒ‡ãƒ¼ã‚¿ãƒžãƒƒãƒ—ã®ãƒ€ãƒ³ãƒ—(デãƒãƒƒã‚°)</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation>ピッãƒãƒˆãƒ©ãƒƒã‚«ãƒ¼ã§é–‹ã(&P)</translation>
</message>
<message>
- <source>Add Clef Change in this link only...</source>
- <translation type="obsolete">ã“ã®ãƒªãƒ³ã‚¯ã®ã¿ä¸ã§éŸ³ç¬¦è¨˜å·ã‚’è¿½åŠ ...</translation>
- </message>
- <message>
- <location line="-2402"/>
+ <location line="+60"/>
<source>Alt+0</source>
<comment>keyboard shortcut</comment>
<translation>Alt+0</translation>
@@ -2320,14 +2283,14 @@
<translation>Ctrl+U</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+R</translation>
@@ -2345,8 +2308,8 @@
<translation>Ctrl+)</translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation>~</translation>
@@ -2364,27 +2327,27 @@
<translation>></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>調整(&j)</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>クォンタイズ(&Q)</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>クオンタイズ(&Q)...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>ç›´å‰ã®ã‚¯ã‚©ãƒ³ã‚¿ã‚¤ã‚ºã‚’ç¹°ã‚Šè¿”ã™(&R)</translation>
</message>
@@ -2395,36 +2358,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>åŒã˜éŸ³ç¨‹ã®éŸ³ç¬¦ã‚’ã¤ãªã’ã‚‹ (&E)</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>å·¦ã«ãšã‚‰ã™(&L)</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>å³ã«ãšã‚‰ã™(&J)</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>ベãƒã‚·ãƒ†ã‚£ã®å¢—åŠ (&I)</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>ベãƒã‚·ãƒ†ã‚£ã®æ¸›å°‘(&R)</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation>ç¾åœ¨ã®ãƒ™ãƒã‚·ãƒ†ã‚£ã«è¨å®š(&S)</translation>
</message>
@@ -2440,315 +2403,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>デュレーションをåŠåˆ†ã«ã™ã‚‹(&H)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>デュレーションをå€ã«ã™ã‚‹(&D)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>ストレッãƒ/スカッシュ(&q)...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>移調(&p)</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>åŠéŸ³ä¸Šã’ã‚‹(&U)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>åŠéŸ³ä¸‹ã’ã‚‹(&D)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>オクターブ上ã’ã‚‹(&O)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>オクターブ下ã’ã‚‹(&v)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>åŠéŸ³å˜ä½ã§ç§»èª¿(&T)...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>音程を指定ã—ã¦ç§»èª¿(&I)...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>変æ›(&C)</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>å転(&I)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>逆行(&R)</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>逆行ã—ã¦å転(&t)</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>セグメントã®ãƒˆãƒªã‚¬(&g)</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>ツール(&T)</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>é¸æŠžã¨ç·¨é›†(&S)</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>æç”»(&D)</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>消去(&E)</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>移動(&M)</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>リサイズ(&z)</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>分割(&p)</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>ベãƒã‚·ãƒ†ã‚£(&V)</translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation>カーソル後進ã¨é¸æŠž(&l)</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>カーソルå‰é€²ã¨é¸æŠž(&S)</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>セレクションã«ãƒ«ãƒ¼ãƒ—をセット(&t)</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>ループã®ã‚¯ãƒªã‚¢(&o)</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>トランスãƒãƒ¼ãƒˆ(&r)</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>å†ç”Ÿ(&P)</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>åœæ¢(&S)</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>å·»ã戻ã—(&w)</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>æ—©é€ã‚Š(&F)</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>最åˆã«æˆ»ã™(&B)</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>最後ã«é€²ã‚€(&E)</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>ソãƒ(&o)</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>å†ç”Ÿä¸ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹(&l)</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>パニック(&a)</translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>1オクターブ上ã’ã‚‹(&U)</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>コード挿入モード(&h)</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>ステップ録音(&p)</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>ツールãƒãƒ¼(&T)</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>ルーラ(&R)</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>コードåルーラー表示(&o)</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>テンãƒãƒ«ãƒ¼ãƒ©ãƒ¼ã®è¡¨ç¤º(&T)</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>é“具ツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>録音(&R)</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>è¨å®š(&S)</translation>
</message>
@@ -2833,7 +2796,7 @@
<translation>割り当ã¦ã¦ã„ãªã„フェーダーを表示(&U)</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>挿入ツールã«åˆ‡ã‚Šæ›¿ãˆ</translation>
</message>
@@ -2843,13 +2806,13 @@
<translation>消去ã®å¾Œã§ä¼‘符を分割</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>å°åˆ·(&P)...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>å°åˆ·ãƒ—レビュー(&r)...</translation>
</message>
@@ -2944,26 +2907,26 @@
<translation>トラックヘッダã®è¡¨ç¤º(&T)</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>パーカッションマトリクスエディタã§é–‹ã(&P) </translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>音部記å·ã®è¿½åŠ (&f)...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>ã‚ーãƒã‚§ãƒ³ã‚¸ã®è¿½åŠ (&K)...</translation>
</message>
<message>
- <location line="-1493"/>
+ <location line="-2689"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -2974,51 +2937,51 @@
</message>
<message>
<location line="+355"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1030"/>
- <location line="+1936"/>
+ <location line="-2226"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2526"/>
+ <location line="+105"/>
<source>&Guess Beats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -3033,13 +2996,13 @@
<translation>ãƒšãƒ€ãƒ«ãƒªãƒªãƒ¼ã‚¹è¿½åŠ (&P)</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>å³è¨˜ã«éŸ³ç¬¦ã‚’変æ›(&C)...</translation>
</message>
<message>
- <location line="-2184"/>
+ <location line="-74"/>
<source>Search and Selec&t</source>
<translation type="unfinished"></translation>
</message>
@@ -3049,7 +3012,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+42"/>
<source>Unadopt an Adopted Segment</source>
<translation type="unfinished"></translation>
</message>
@@ -3366,8 +3329,8 @@
<translation>符幹ã®å¾©å¸°(&R)</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>フレーズ(&P)</translation>
</message>
@@ -3437,14 +3400,14 @@
<translation>下ã«ã‚¹ãƒ©ãƒ¼(&B)</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>タイ(&i)</translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>タイを解除(&U)</translation>
</message>
@@ -3524,14 +3487,14 @@
<translation>休符ã®æ£è¦åŒ–(&N)</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+N</translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation>休符をã¤ãªã’ã‚‹(&C)</translation>
</message>
@@ -3541,8 +3504,8 @@
<translation>音符(&N)</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+=</translation>
@@ -3628,13 +3591,13 @@
<translation>音符ä½ç½®å¾®èª¿æ•´(&m)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>å³ã«ãšã‚‰ã™(&R)</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>表示方法(&V)</translation>
</message>
@@ -3691,26 +3654,26 @@
<translation>下ã®äº”ç·šã«ç§»å‹•(&D)</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>å‰ã®ã‚»ã‚°ãƒ¡ãƒ³ãƒˆ(&v)</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>次ã®ã‚»ã‚°ãƒ¡ãƒ³ãƒˆ(&x)</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>ステップå˜ä½ã§æˆ»ã™(&B)</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>ステップå˜ä½ã§å‰é€²(&F)</translation>
</message>
@@ -3855,14 +3818,14 @@
<translation>ギターコード(&G)</translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>音符ã®æŒ¿å…¥(&I)</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>1オクターブ下ã’ã‚‹(&L)</translation>
</message>
@@ -3882,13 +3845,13 @@
<translation>装飾音符挿入モード(&M)</translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>ツールã®ãƒ„ールãƒãƒ¼ã‚’表示(&o)</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>臨時記å·ãƒ„ールãƒãƒ¼ã‚’表示(&A)</translation>
</message>
@@ -3908,18 +3871,18 @@
<translation>グループツールãƒãƒ¼ã‚’表示(&G)</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>トランスãƒãƒ¼ãƒˆãƒ„ールãƒãƒ¼ã‚’表示(&p)</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>レイアウトツールãƒãƒ¼ã‚’表示(&L)</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+O</translation>
@@ -3932,13 +3895,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Ins</translation>
@@ -3949,7 +3912,7 @@
<translation>コードåルーラーã®è¡¨ç¤º(&r)</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+767"/>
<source>Show &Annotations</source>
<translation>注釈を表示(&A)</translation>
</message>
@@ -3959,7 +3922,7 @@
<translation>LilyPondディレクティブã®è¡¨ç¤º(&P)</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>音部記å·ãƒ„ールãƒãƒ¼</translation>
</message>
@@ -3979,7 +3942,7 @@
<translation>マークツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation>ã™ã¹ã¦ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚’é¸æŠž(&A)</translation>
</message>
@@ -4000,48 +3963,48 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>Rosegardenマニュアル(&M)</translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>è¨å®š...</translation>
</message>
<message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>ベãƒã‚·ãƒ†ã‚£ãƒ«ãƒ¼ãƒ©ã®è¡¨ç¤º(&V)</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>ピッãƒãƒ™ãƒ³ãƒ‰ãƒ«ãƒ¼ãƒ©ã®è¡¨ç¤º(&B)</translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation>カーソルを後進ã•ã›ã¦ã€é¸æŠž(&l)</translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>ルーラツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>è¨å®š(&P)...</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation>ルーラツールãƒãƒ¼ã®è¡¨ç¤º(&R)</translation>
</message>
@@ -4051,8 +4014,8 @@
<translation>生ã®éŸ³ç¬¦ãƒ«ãƒ¼ãƒ©ã‚’表示(&w)</translation>
</message>
<message>
- <location line="-1014"/>
- <location line="+1754"/>
+ <location line="-2209"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>ステップå˜ä½ã§æˆ»ã‚‹(â†)</translation>
</message>
@@ -4062,13 +4025,13 @@
<translation>å†ç”Ÿ</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>ステップå˜ä½ã§é€²ã‚€(→)</translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation>動作(&A)</translation>
</message>
@@ -4088,50 +4051,50 @@
<translation>ヘルプ</translation>
</message>
<message>
- <location line="+809"/>
- <location line="+1724"/>
+ <location line="-1214"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>ピッãƒãƒ™ãƒ³ãƒ‰ã‚·ãƒ¼ã‚±ãƒ³ã‚¹ã‚’挿入(&B)...</translation>
</message>
<message>
- <location line="-1918"/>
- <location line="+1302"/>
+ <location line="-3114"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>コントãƒãƒ¼ãƒ«ãƒ«ãƒ¼ãƒ©ã‚’è¿½åŠ (&C)</translation>
</message>
<message>
- <location line="-1087"/>
- <location line="+1724"/>
+ <location line="-2282"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>カーソルを1å°ç¯€æˆ»ã—é¸æŠž(&B)</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Left</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>カーソルを1å°ç¯€é€²ã‚é¸æŠž(&w)</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Right</translation>
</message>
<message>
- <location line="-664"/>
+ <location line="-665"/>
<source>Show La&yer Toolbar</source>
<translation>レイヤツールãƒãƒ¼ã‚’表示(&y)</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+36"/>
<source>Add &Layer</source>
<translation>ãƒ¬ã‚¤ãƒ¤ã‚’è¿½åŠ (&L)</translation>
</message>
@@ -4147,7 +4110,7 @@
<translation></translation>
</message>
<message>
- <location line="-1448"/>
+ <location line="-2644"/>
<source>Show A&ctions Toolbar</source>
<translation>動作ツールãƒãƒ¼ã‚’表示(&c)</translation>
</message>
@@ -4158,18 +4121,23 @@
</message>
<message>
<location line="+25"/>
- <location line="+1550"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-275"/>
+ <location line="-276"/>
<source>Show &Duration Toolbar</source>
<translation>デュレーションツールãƒãƒ¼ã‚’表示(&D)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+18"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+23"/>
<source>Ctrl+Alt++</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Alt++</translation>
@@ -4465,21 +4433,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation>P</translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation>三連符入力モード(&d)</translation>
</message>
@@ -4650,7 +4618,7 @@
<translation>レイヤツールãƒãƒ¼</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>挿入ツールã«åˆ‡ã‚Šæ›¿ãˆ</translation>
</message>
@@ -4705,7 +4673,7 @@
<translation>å¯è¦–ã«ã™ã‚‹</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>é©åˆ‡ã«è‡ªå‹•é€£æ¡</translation>
</message>
@@ -4745,7 +4713,7 @@
<translation>ダブルフラット</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>æ–°è¦(&N)</translation>
</message>
@@ -4755,23 +4723,11 @@
<translation>インãƒãƒ¼ãƒˆ(&I)</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Rosegardenプãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã‚¤ãƒ³ãƒãƒ¼ãƒˆ(&P)...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">&MIDIファイルをインãƒãƒ¼ãƒˆ...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>&Hydrogenファイルã‹ã‚‰ã‚¤ãƒ³ãƒãƒ¼ãƒˆ...</translation>
</message>
<message>
- <source>Import MusicXM&L file...</source>
- <translation type="obsolete">MusicXMLファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆï¼ˆ&L)...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Merge</source>
<translation>マージ(&M)</translation>
@@ -4782,44 +4738,16 @@
<translation>ファイルã®ãƒžãƒ¼ã‚¸(&F)...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">&MIDIファイルã®ãƒžãƒ¼ã‚¸...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>&Hydrogenファイルã®ãƒžãƒ¼ã‚¸...</translation>
</message>
<message>
- <source>Merge MusicXM&L file...</source>
- <translation type="obsolete">ミュージックXMLãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½µåˆ (&L)</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Export</source>
<translation>エクスãƒãƒ¼ãƒˆ(&M)</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Rosegardenプãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã‚’エクスãƒãƒ¼ãƒˆ(&P)...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">&MIDIファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">&Csound楽èœãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">M&upファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">MusicXMLファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ(&X)...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>é–‹ã(&O)...</translation>
@@ -4830,10 +4758,6 @@
<translation>最近ã®ã‚‚ã®ã‚’é–‹ã(&R)</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">åå‰ã‚’付ã‘ã¦ä¿å˜(&A)...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>テンプレートã¨ã—ã¦ä¿å˜(&T)...</translation>
@@ -4950,13 +4874,13 @@
<translation>å†ç”Ÿä½ç½®ã«ã‚¯ã‚¤ãƒƒã‚¯ãƒžãƒ¼ã‚«ã‚’è¨å®š(&S)</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>クイックマーカã«ã‚¸ãƒ£ãƒ³ãƒ—(&J)</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation>スタジオ(&S)</translation>
</message>
@@ -5016,53 +4940,49 @@
<translation>リピートをトグル</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">既定ã®ã‚¨ãƒ‡ã‚£ã‚¿ã§ã‚ªãƒ¼ãƒ—ン(&D)</translation>
- </message>
- <message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>å†ãƒ©ãƒ™ãƒ«(&e)...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>最後ã®ã‚¯ã‚©ãƒ³ã‚¿ã‚¤ã‚ºã‚’ç¹°ã‚Šè¿”ã™(&a)</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>ストレッãƒ/スカッシュ(&o)...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>開始時間をè¨å®š(&T)...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>デュレーションをè¨å®š(&D)...</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation>å¼±æ‹ï¼ˆä¸Šæ‹ï¼‰ã‚’作æˆ(&A)...</translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>çµåˆ</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>分割(&S)</translation>
</message>
@@ -5177,31 +5097,26 @@
<translation>インストゥルメントã®å†å‰²ã‚Šå½“ã¦(&R)...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>リサイズ(&R)</translation>
</message>
<message>
- <source>Ctrl+Enter, Enter, Media Play, Ctrl+Return, Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Ctrl+Enter, Enter, メディアå†ç”Ÿ, Ctrl+Return, Return</translation>
- </message>
- <message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation>パンãƒã‚¤ãƒ³éŒ²éŸ³(&u)</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>メインツールãƒãƒ¼ã‚’表示(&T)</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>トラックツールãƒãƒ¼ã‚’表示(&k)</translation>
</message>
@@ -5216,27 +5131,19 @@
<translation>ズームツールãƒãƒ¼ã‚’表示(&Z)</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>ステータスãƒãƒ¼ã‚’表示(&a)</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>å†ç”Ÿä½ç½®ãƒ«ãƒ¼ãƒ©ãƒ¼ã®è¡¨ç¤º(&u)</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">&X11 Rosegardenファイルã‹ã‚‰ã‚¤ãƒ³ãƒãƒ¼ãƒˆ...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">&X11 Rosegardenファイルã‹ã‚‰ãƒžãƒ¼ã‚¸...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>MIDIミã‚サ(&x)</translation>
@@ -5247,10 +5154,6 @@
<translation>テンãƒãƒ«ãƒ¼ãƒ©ãƒ¼ã®è¡¨ç¤º(&m)</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">LilyPondファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ(&L)...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>トランスãƒãƒ¼ãƒˆã®è¡¨ç¤º(&n)</translation>
@@ -5297,26 +5200,26 @@
<translation>編集ツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>最åˆã«å·»ã戻ã—</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>最後ã¾ã§æ—©é€ã‚Š</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>Rosegardenã®ã‚µãƒãƒ¼ãƒˆ(&S)</translation>
</message>
<message>
- <location line="-620"/>
+ <location line="-2483"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -5391,13 +5294,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
- <location line="+371"/>
+ <location line="-570"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-257"/>
+ <location line="+114"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -5408,7 +5311,7 @@
<translation type="unfinished">Ctrl+Enter, Enter, メディアå†ç”Ÿ, Ctrl+Return, Return</translation>
</message>
<message>
- <location line="+300"/>
+ <location line="+151"/>
<source>Insert Tempo Change</source>
<translation>テンãƒãƒã‚§ãƒ³ã‚¸ã‚’挿入</translation>
</message>
@@ -5448,7 +5351,7 @@
<translation>テンãƒ/æ‹åエディタを開ã</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>アイテムã®ç·¨é›†(&E)</translation>
</message>
@@ -5468,7 +5371,7 @@
<translation>è¨å®š(&P)</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>æ–°ã—ã„トリガーセグメントã§è²¼ã‚Šä»˜ã‘(&s)</translation>
</message>
@@ -8452,16 +8355,16 @@
<translation><ãªã—></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>シンセサイザープラグイン</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>オーディオ</translation>
@@ -10602,20 +10505,15 @@
<translation>ä¸æ˜Ž</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10630,10 +10528,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 コントãƒãƒ¼ãƒ© %2 %3</translation>
</message>
@@ -10648,7 +10546,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>よã†ã“ã!</translation>
</message>
@@ -10756,7 +10654,7 @@
<translation><qt><p>ã©ã®ã¨ãƒ©ãƒƒã‚¯ã‚‚録音ã®ãŸã‚ã«æœ‰åŠ¹åŒ–ã•ã‚Œã¦ã„ã¾ã›ã‚“。</p><p>録音LEDã®ã©ã‚Œã‹ã‚’å°‘ãªãã¨ã‚‚有効ã«ã—ã¦<img src=":pixmaps/tooltip/record-leds.png"> å†åº¦å®Ÿè¡Œã—ã¦ãã ã•ã„。</p></qt></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>オーディオã®éŒ²éŸ³ãŒé–‹å§‹ã§ãã¾ã›ã‚“。</p><p>Please set a valid recording path in <b>コンãƒã‚¸ã‚·ãƒ§ãƒ³ -> ドã‚ュメントプãƒãƒ‘ティã®ç·¨é›†... -> オーディオ</b>ä¸ã§æœ‰åŠ¹ãªéŒ²éŸ³ãƒ‘スをè¨å®šã—ã¦ãã ã•ã„。</p></qt></translation>
</message>
@@ -10768,40 +10666,52 @@
<translation>ä¸æ£ãªã‚µã‚¦ãƒ³ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>MIDIストリームä¸ã®é•·ã„データã«å¯¾ã™ã‚‹é–“é•ã£ãŸé•·ã•</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>MIDIストリームä¸ã®å†…部データã«å¯¾ã™ã‚‹é–“é•ã£ãŸé•·ã•</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>èªã¿å–ã‚Šä¸ã«MIDIファイルã®çµ‚端ã«ãã¾ã—ãŸ</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation>トラック上ã§æœŸå¾…ã—ã¦ã„ãŸã‚ˆã‚Šå¤šãã®ãƒã‚¤ãƒˆã‚’得よã†ã¨ã—ã¦ã„ã¾ã™</translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
- <source>Attempt to read past MIDI file end</source>
- <translation>MIDIファイルã®çµ‚端より先をèªã‚‚ã†ã¨ã—ã¦ã„ã¾ã™</translation>
+ <location line="+15"/>
+ <source>Attempt to read past MIDI file end</source>
+ <translation>MIDIファイルã®çµ‚端より先をèªã‚‚ã†ã¨ã—ã¦ã„ã¾ã™</translation>
+ </message>
+ <message>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
<source>Invalid event code found</source>
- <translation>ä¸æ£ãªã‚¤ãƒ™ãƒ³ãƒˆã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ</translation>
+ <translation type="obsolete">ä¸æ£ãªã‚¤ãƒ™ãƒ³ãƒˆã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation>トラックä¸ã®æœ€åˆã®ã‚¤ãƒ™ãƒ³ãƒˆã®ãŸã‚ã«ä½¿ã‚ã‚Œã¦ã„る動作ステータス</translation>
</message>
@@ -10912,7 +10822,7 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation>ã“ã®ã‚¤ãƒ™ãƒ³ãƒˆã¯ä»–ã®ã‚¤ãƒ™ãƒ³ãƒˆã«ã‚¿ã‚¤ã§ã¤ãªãŒã‚Šã¾ã™ã€‚</translation>
</message>
@@ -10949,10 +10859,6 @@
<translation>サウンドドライãƒãŒã‚ã‚Šã¾ã›ã‚“: アプリケーションãŒã‚µã‚¦ãƒ³ãƒ‰ã‚µãƒãƒ¼ãƒˆãªã—ã§ã‚³ãƒ³ãƒ‘イルã•ã‚Œã¦ã„ã‚‹?</translation>
</message>
<message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
<location filename="../../src/base/figuration/SegmentFigData.cpp" line="+53"/>
<source>Replace segment contents</source>
<translation type="unfinished"></translation>
@@ -10997,6 +10903,58 @@
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Lilypondã®ãƒ•ã‚¡ã‚¤ãƒ«åã«ã¯ç©ºç™½ã‚„ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã¯ä½¿ãˆã¾ã›ã‚“。
+
+代ã‚ã‚Šã«
+
+ %1
+
+を使ã„ã¾ã™ã‹?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">エクスãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚書ãè¾¼ã¿ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished">エクスãƒãƒ¼ãƒˆã«æˆåŠŸã—ã¾ã—ãŸãŒã€ã‚³ãƒ³ãƒã‚¸ã‚·ãƒ§ãƒ³ã¯ç©ºã§ã—ãŸã€‚</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished">ミュートã•ã‚Œã¦ã„ãªã„トラックã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ ミュートã•ã‚Œã¦ã„ãªã„トラックã‹ã‚»ã‚°ãƒ¡ãƒ³ãƒˆãŒã‚ã‚Šã¾ã›ã‚“。</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished">é¸æŠžã•ã‚ŒãŸã¨ãƒ©ãƒƒã‚¯ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ é¸æŠžã•ã‚ŒãŸãƒˆãƒ©ãƒƒã‚¯ã«ã¯ã‚»ã‚°ãƒ¡ãƒ³ãƒˆãŒã‚ã‚Šã¾ã›ã‚“。</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished">é¸æŠžã•ã‚ŒãŸã‚»ã‚°ãƒ¡ãƒ³ãƒˆã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ セグメントãŒï¼‘ã¤ã‚‚é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">è¦å‘Š:é•·ã™ãŽã‚‹å°ç¯€ç·šã¯ã“ã“ã§æ‰“ã¡åˆ‡ã‚‰ã‚Œã¾ã—ãŸ</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">è¦å‘Š: 音符ãŒè¶³ã‚Šãªã„ã®ã§ä¼‘符ã§åŸ‹ã‚ã¾ã™</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11012,20 +10970,8 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="unfinished"><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="obsolete"><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2011 the Rosegarden development team</p><p>ãƒãƒ¼ã‚¸ãƒ§ãƒ³: %1 Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³: %2<br>ビルドã‚ー: %3</p><p>Rosegardenã¯ä¸–ç•Œä¸ã‹ã‚‰å‚åŠ ã—ãŸãƒœãƒ©ãƒ³ãƒ†ã‚£ã‚¢ã®ãƒãƒ¼ãƒ ã«ã‚ˆã£ã¦é–‹ç™ºã•ã‚Œã¾ã—ãŸã€‚貢献者ã®ä¸€è¦§ã¯<a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。<br>Rosegardenã«ã¤ã„ã¦ã®ã‚ˆã‚Šè©³ç´°ãªæƒ…å ±ã¯ã€<a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</p><p>License: GNU General Public License Version 2</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2010 the Rosegarden development team</p><p>ãƒãƒ¼ã‚¸ãƒ§ãƒ³: %1 Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³: %2<br>ビルドã‚ー: %3</p><p>Rosegardenã¯ä¸–ç•Œä¸ã‹ã‚‰å‚åŠ ã—ãŸãƒœãƒ©ãƒ³ãƒ†ã‚£ã‚¢ã®ãƒãƒ¼ãƒ ã«ã‚ˆã£ã¦é–‹ç™ºã•ã‚Œã¾ã—ãŸã€‚貢献者ã®ä¸€è¦§ã¯<a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。<br>Rosegardenã«ã¤ã„ã¦ã®ã‚ˆã‚Šè©³ç´°ãªæƒ…å ±ã¯ã€<a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</p><p>License: GNU General Public License Version 2</p></translation>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <translation type="unfinished"><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p> {2000-2015 ?} {1 ?} {2<?} {3<?} {2 ?}</translation>
</message>
</context>
<context>
@@ -11086,12 +11032,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>åŒä¸€ã®æŒ‡æ¨™ã®è¿½åŠ ã¯ã§ãã¾ã›ã‚“</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>ã‚¹ãƒ©ãƒ¼ã‚’è¿½åŠ (&l)</translation>
</message>
@@ -11599,24 +11545,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>クリックã—ã¦ã“ã®ã‚¤ãƒ³ã‚¹ãƒˆã‚¥ãƒ«ãƒ¡ãƒ³ãƒˆã‚’改å</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>ã“ã®ã‚¤ãƒ³ã‚¹ãƒˆã‚¥ãƒ«ãƒ¡ãƒ³ãƒˆã‚’改åã™ã‚‹ãŸã‚ã«ã€æœ€ä¸‹éƒ¨ã®ä¸Šã‚’クリック</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><シンセサイザー無ã—></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><プラグイン無ã—></translation>
</message>
@@ -11669,10 +11615,6 @@
<translation>ファイル</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><オーディオファイルãªã—></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>åå‰ã‚’ã¤ã‘ã¦ä¿å˜</translation>
@@ -11831,7 +11773,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>オーディオミã‚サ</translation>
</message>
@@ -11847,20 +11789,20 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>パン</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>オーディオレベル</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>モノ/ステレオ切替</translation>
</message>
@@ -11871,21 +11813,21 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><ãªã—></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>オーディオプラグインをãƒãƒ¼ãƒ‰ã™ã‚‹ãŸã‚ã«ã‚¯ãƒªãƒƒã‚¯</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>ã“ã®ã‚¤ãƒ³ã‚¹ãƒˆã‚¥ãƒ«ãƒ¡ãƒ³ãƒˆã‚’改åã™ã‚‹ãŸã‚ã«ã‚¯ãƒªãƒƒã‚¯</translation>
</message>
@@ -11905,7 +11847,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>ã“ã®ã‚¤ãƒ³ã‚¹ãƒˆã‚¥ãƒ«ãƒ¡ãƒ³ãƒˆã‚’改åã™ã‚‹ãŸã‚ã«ã€æœ€ä¸‹éƒ¨ã®ä¸Šã‚’クリック</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>副 %1</translation>
</message>
@@ -11921,14 +11863,14 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>マスタ</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><プラグイン無ã—></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-ja</translation>
</message>
@@ -12487,7 +12429,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation><æ–°ã—ã„ãƒãƒ³ã‚¯ %1></translation>
</message>
<message>
- <location line="+731"/>
+ <location line="+737"/>
<location line="+4"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
@@ -12498,7 +12440,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-ja</translation>
</message>
<message>
- <location line="-774"/>
+ <location line="-780"/>
<source><new bank></source>
<translation><æ–°ã—ã„ãƒãƒ³ã‚¯></translation>
</message>
@@ -12518,7 +12460,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>ãƒãƒ³ã‚¯ã‚’削除ã—ã¾ã™ãŒã„ã„ã§ã™ã‹?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>ã‚ーマッピングを削除ã—ã¾ã™ãŒã‚ˆã‚ã—ã„ã§ã™ã‹?</translation>
</message>
@@ -12691,6 +12633,120 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"> </translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -13014,7 +13070,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13239,7 +13295,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>ベãƒã‚·ãƒ†ã‚£(Velocity)</translation>
</message>
@@ -13255,7 +13311,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>未サãƒãƒ¼ãƒˆã®ã‚¤ãƒ™ãƒ³ãƒˆã‚¿ã‚¤ãƒ—</translation>
</message>
@@ -13270,12 +13326,13 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>コントãƒãƒ¼ãƒ©ã‚¤ãƒ™ãƒ³ãƒˆ</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>コントãƒãƒ¼ãƒ©ã®ãƒ©ã‚¤ãƒ³ã‚’挿入</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>コントãƒãƒ¼ãƒ©ã‚¤ãƒ™ãƒ³ãƒˆç•ªå·</translation>
</message>
@@ -13283,7 +13340,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>コピー(&C)</translation>
</message>
@@ -13293,7 +13350,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>(例外)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(コピーã—ãŸ)</translation>
</message>
@@ -13363,7 +13420,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>カット(&t)</translation>
</message>
@@ -13403,10 +13460,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">å†çµåˆã‚³ãƒžãƒ³ãƒ‰</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>レンジを削除</translation>
@@ -13431,12 +13484,12 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation>[ãƒãƒ¼ãƒˆãªã—]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -14063,46 +14116,10 @@ This could cause problems if it overrides a different computed value later on.</
<translation>パターン</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">å‡ä¸€ - %1 ã‚’å‡ä¸€ã«è¨å®š</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">交互 - %1 ã‚’ãµãŸã¤ã®å€¤ã§äº¤äº’ã«è¨å®š</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">クレッシェンド - %1 を最å°å€¤ã‹ã‚‰æœ€å¤§å€¤ã¸å³ä¸ŠãŒã‚Šã§è¨å®š</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">ディミニエンド - %1 を最大値ã‹ã‚‰æœ€å°å€¤ãƒ˜å³ä¸‹ã‚Šã§è¨å®š</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">リンギング効果 - %1 を最大ã‹ã‚‰æœ€å°å€¤ã¸ã€æœ€å°å€¤ã‹ã‚‰ã‚¼ãƒã¸ã®ä¸¡æ–¹ã‚’交互ã«è¨å®š</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>数値</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">最åˆã®å€¤</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">次ã®å€¤</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">下é™</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">上é™</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14497,10 +14514,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>%1 をダウンãƒãƒ¼ãƒ‰ä¸...</translation>
</message>
<message>
- <source>FTP download aborted</source>
- <translation type="obsolete">FTPダウンãƒãƒ¼ãƒ‰ãŒä¸æ–ã—ãŸ</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>ダウンãƒãƒ¼ãƒ‰ãŒã‚ャンセルã•ã‚ŒãŸ</translation>
@@ -14828,10 +14841,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>Adobe Acrobat Reader (自由ã§ã¯ãªã„)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation>生æˆã•ã‚ŒãŸLilyPond出力をプレビューã™ã‚‹ã®ã«ä½¿ç”¨</translation>
@@ -14842,10 +14851,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>コマンドラインファイルå°åˆ·ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">KPrinter (KDE 3)</translation>
- </message>
- <message>
<location line="+5"/>
<source>Gtk-LP (GNOME)</source>
<translation>Gtk-LP (GNOME)</translation>
@@ -15427,7 +15432,7 @@ Example text from file:</source>
<translation>インストゥルメントパラメータ</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>トラック</translation>
</message>
@@ -15435,7 +15440,7 @@ Example text from file:</source>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation>ãªã—</translation>
</message>
@@ -15816,7 +15821,6 @@ Example text from file:</source>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15824,7 +15828,7 @@ Would you like to use
%1
instead?</source>
- <translation>Lilypondã®ãƒ•ã‚¡ã‚¤ãƒ«åã«ã¯ç©ºç™½ã‚„ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã¯ä½¿ãˆã¾ã›ã‚“。
+ <translation type="obsolete">Lilypondã®ãƒ•ã‚¡ã‚¤ãƒ«åã«ã¯ç©ºç™½ã‚„ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã¯ä½¿ãˆã¾ã›ã‚“。
代ã‚ã‚Šã«
@@ -15833,39 +15837,32 @@ Would you like to use
を使ã„ã¾ã™ã‹?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation>エクスãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚書ãè¾¼ã¿ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
+ <translation type="obsolete">エクスãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚書ãè¾¼ã¿ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
</message>
<message>
- <location line="+169"/>
<source>Export succeeded, but the composition was empty.</source>
- <translation>エクスãƒãƒ¼ãƒˆã«æˆåŠŸã—ã¾ã—ãŸãŒã€ã‚³ãƒ³ãƒã‚¸ã‚·ãƒ§ãƒ³ã¯ç©ºã§ã—ãŸã€‚</translation>
+ <translation type="obsolete">エクスãƒãƒ¼ãƒˆã«æˆåŠŸã—ã¾ã—ãŸãŒã€ã‚³ãƒ³ãƒã‚¸ã‚·ãƒ§ãƒ³ã¯ç©ºã§ã—ãŸã€‚</translation>
</message>
<message>
- <location line="+42"/>
<source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation>ミュートã•ã‚Œã¦ã„ãªã„トラックã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ ミュートã•ã‚Œã¦ã„ãªã„トラックã‹ã‚»ã‚°ãƒ¡ãƒ³ãƒˆãŒã‚ã‚Šã¾ã›ã‚“。</translation>
+ <translation type="obsolete">ミュートã•ã‚Œã¦ã„ãªã„トラックã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ ミュートã•ã‚Œã¦ã„ãªã„トラックã‹ã‚»ã‚°ãƒ¡ãƒ³ãƒˆãŒã‚ã‚Šã¾ã›ã‚“。</translation>
</message>
<message>
- <location line="+6"/>
<source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation>é¸æŠžã•ã‚ŒãŸã¨ãƒ©ãƒƒã‚¯ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ é¸æŠžã•ã‚ŒãŸãƒˆãƒ©ãƒƒã‚¯ã«ã¯ã‚»ã‚°ãƒ¡ãƒ³ãƒˆãŒã‚ã‚Šã¾ã›ã‚“。</translation>
+ <translation type="obsolete">é¸æŠžã•ã‚ŒãŸã¨ãƒ©ãƒƒã‚¯ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ é¸æŠžã•ã‚ŒãŸãƒˆãƒ©ãƒƒã‚¯ã«ã¯ã‚»ã‚°ãƒ¡ãƒ³ãƒˆãŒã‚ã‚Šã¾ã›ã‚“。</translation>
</message>
<message>
- <location line="+5"/>
<source>Export of selected segments failed. No segments are selected.</source>
- <translation>é¸æŠžã•ã‚ŒãŸã‚»ã‚°ãƒ¡ãƒ³ãƒˆã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ セグメントãŒï¼‘ã¤ã‚‚é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation>
+ <translation type="obsolete">é¸æŠžã•ã‚ŒãŸã‚»ã‚°ãƒ¡ãƒ³ãƒˆã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ セグメントãŒï¼‘ã¤ã‚‚é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>è¦å‘Š:é•·ã™ãŽã‚‹å°ç¯€ç·šã¯ã“ã“ã§æ‰“ã¡åˆ‡ã‚‰ã‚Œã¾ã—ãŸ</translation>
+ <translation type="obsolete">è¦å‘Š:é•·ã™ãŽã‚‹å°ç¯€ç·šã¯ã“ã“ã§æ‰“ã¡åˆ‡ã‚‰ã‚Œã¾ã—ãŸ</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>è¦å‘Š: 音符ãŒè¶³ã‚Šãªã„ã®ã§ä¼‘符ã§åŸ‹ã‚ã¾ã™</translation>
+ <translation type="obsolete">è¦å‘Š: 音符ãŒè¶³ã‚Šãªã„ã®ã§ä¼‘符ã§åŸ‹ã‚ã¾ã™</translation>
</message>
</context>
<context>
@@ -15896,10 +15893,6 @@ Would you like to use
<translation><qt>エクスãƒãƒ¼ãƒˆã™ã‚‹ãƒˆãƒ©ãƒƒã‚¯ã‹ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã‚’é¸æŠž</qt></translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">é¸æŠžã•ã‚ŒãŸãƒˆãƒ©ãƒƒã‚¯</translation>
- </message>
- <message>
<location line="+16"/>
<source>Compatibility level</source>
<translation>互æ›ãƒ¬ãƒ™ãƒ«</translation>
@@ -15999,10 +15992,6 @@ Would you like to use
<translation type="unfinished">楽器ã®çŸç¸®åã‚’å°åˆ·</translation>
</message>
<message>
- <source><qt>Useful for large, complex scores, this prints the short name every time there is a line break in the score, making it easier to follow which line belongs to which instrument across pages</qt></source>
- <translation type="obsolete"><qt>大è¦æ¨¡ã§è¤‡é›‘ãªã‚¹ã‚³ã‚¢ã«ä¾¿åˆ©ã§ã™ã€‚ã“ã‚Œã¯èœé¢ã®è¡Œã‚’壊ã™ã“ã¨ãŒã‚る時ã¯æ¯Žå›žçŸç¸®åã‚’å°åˆ·ã—ã€ãƒšãƒ¼ã‚¸ã‚’ã¾ãŸãŒã£ã¦è¡Œã«å±žã™ã‚‹æ¥½å™¨ã‚’追ã†ã®ã‚’より容易ã«ã—ã¾ã™ã€‚</qt></translation>
- </message>
- <message>
<location line="+42"/>
<source>Notation language</source>
<translation>楽èœã®è¨€èªž</translation>
@@ -16385,10 +16374,6 @@ Would you like to use
<context>
<name>Rosegarden::LoopRuler</name>
<message>
- <source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Double-click to start playback.</p></qt></source>
- <translation type="obsolete"><qt><p>å†ç”Ÿãƒã‚¤ãƒ³ã‚¿ã‚’移動ã™ã‚‹ãŸã‚ã«ã¯ã‚¯ãƒªãƒƒã‚¯ã‚¢ãƒ³ãƒ‰ãƒ‰ãƒ©ãƒƒã‚°ã€‚</p><p>ループã‹ç·¨é›†ã®ãŸã‚ã®ãƒ¬ãƒ³ã‚¸ã®è¨å®šã®ãŸã‚ã«ã¯ã‚·ãƒ•ãƒˆã—ãªãŒã‚‰ã‚¯ãƒªãƒƒã‚¯ã‚¢ãƒ³ãƒ‰ãƒ‰ãƒ©ãƒƒã‚°ã€‚</p><p>ループã‹ãƒ¬ãƒ³ã‚¸ã‚’解除ã™ã‚‹ãŸã‚ã«ã¯,シフトã—ãªãŒã‚‰ã‚¯ãƒªãƒƒã‚¯ã€‚</p><p>å†ç”Ÿé–‹å§‹ã¯ãƒ€ãƒ–ルクリック。</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/rulers/LoopRuler.cpp" line="+80"/>
<source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Ctrl-click and drag to move the playback pointer with snap to beat.</p><p>Double-click to start playback.</p></qt></source>
<translation><qt><p>クリックã¨ãƒ‰ãƒ©ãƒƒã‚°ã§å†ç”Ÿãƒã‚¤ãƒ³ã‚¿ã‚’移動。</p><p>シフトã—ãªãŒã‚‰ã‚¯ãƒªãƒƒã‚¯ã¨ãƒ‰ãƒ©ãƒƒã‚°ã§ãƒ«ãƒ¼ãƒ—ã¾ãŸã¯ç·¨é›†é ˜åŸŸã‚’è¨å®šã€‚</p><p>シフトã—ãªãŒã‚‰ã‚¯ãƒªãƒƒã‚¯ã§ãƒ«ãƒ¼ãƒ—ã¾ãŸã¯ç·¨é›†é ˜åŸŸã‚’クリヤ。</p><p>コントãƒãƒ¼ãƒ«ã‚’押ã—ãªãŒã‚‰ã‚¯ãƒªãƒƒã‚¯ã¨ãƒ‰ãƒ©ãƒƒã‚°ã§æ‹åã«åˆã‚ã›ã¦å†ç”Ÿãƒã‚¤ãƒ³ã‚¿ã‚’移動。</p><p>ダブルクリックã§å†ç”Ÿã‚’開始。</p></qt></translation>
@@ -16585,7 +16570,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation><qt>スタジオä¸ã§æœ‰åŠ¹ãªã‚‰ã°ã€ä¸Šè¨˜ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã‹ã‚‰ãƒãƒªã‚¨ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¨å®š</qt></translation>
</message>
@@ -16595,14 +16580,6 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation><qt>é¸æŠžã•ã‚ŒãŸãƒ—ãƒã‚°ãƒ©ãƒ ã‹ã‚‰MIDIãƒãƒ³ã‚¯ã‚’è¨å®š</qt></translation>
</message>
<message>
- <source>auto</source>
- <translation type="obsolete">自動</translation>
- </message>
- <message>
- <source>fixed</source>
- <translation type="obsolete">固定</translation>
- </message>
- <message>
<location line="+26"/>
<source><qt>Set the MIDI program or "patch"</p></qt></source>
<translation><qt>MIDIプãƒã‚°ãƒ©ãƒ ã‹ "patch"</p>ã‚’è¨å®š</qt></translation>
@@ -16678,12 +16655,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>外部ã‹ã‚‰å—ä¿¡</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>接続無ã—</translation>
</message>
@@ -16907,6 +16879,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17112,12 +17093,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>SHIFTã‚ーを押ã—ãªãŒã‚‰ã§æ‹ã‚°ãƒªãƒƒãƒ‰ã«ã‚¹ãƒŠãƒƒãƒ—を無効ã«ã§ãã¾ã™</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>イベントã®ã‚³ãƒ”ーã¨ç§»å‹•</translation>
</message>
@@ -17276,7 +17257,7 @@ Double-click to open the marker editor.</source>
<translation>ベãƒã‚·ãƒ†ã‚£å¤‰æ›´</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>クリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§é¸æŠžã—ãŸéŸ³ç¬¦ã®ãƒ™ãƒã‚·ãƒ†ã‚£ã®ã‚¹ã‚±ãƒ¼ãƒ«æ“作</translation>
</message>
@@ -17289,12 +17270,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation>ä¸æ˜ŽãªéŸ³ç¬¦ã®æŒ¿å…¥å‹•ä½œ %1</translation>
</message>
<message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation>< 無題 ></translation>
</message>
@@ -17356,7 +17337,7 @@ Double-click to open the marker editor.</source>
<translation>Off</translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:matrix-en</translation>
</message>
@@ -17372,8 +17353,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -17383,7 +17363,7 @@ Double-click to open the marker editor.</source>
<translation>ãŠãŠã‚ˆãã®èª¿å·ã®è¡¨ç¤º</translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation>ãŠãŠã‚ˆãã®æ‹åを表示</translation>
</message>
@@ -17394,12 +17374,8 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+1"/>
- <source>By number of semitones: </source>
- <translation>åŠéŸ³ã®æ•°ã§: </translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">イベントベãƒã‚·ãƒ†ã‚£ã®è¨å®š</translation>
+ <source>By number of semitones: </source>
+ <translation>åŠéŸ³ã®æ•°ã§: </translation>
</message>
<message>
<location line="-320"/>
@@ -17412,20 +17388,15 @@ Double-click to open the marker editor.</source>
<translation>トリガã®å‰Šé™¤</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>マトリクス</translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>音符ãŒæŒ¿å…¥ã§ããªã„;グリッドデュレーションãŒ1ã¤ã‚‚é¸æŠžã•ã‚Œã¦ã„ãªã„</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>ズーム</translation>
</message>
@@ -17445,7 +17416,7 @@ Double-click to open the marker editor.</source>
<translation>ズームをリセット</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>アクティブãªã‚»ã‚°ãƒ¡ãƒ³ãƒˆã‚’変更ã™ã‚‹ãŸã‚ã«ãƒ›ã‚¤ãƒ¼ãƒ«ã‚’回転</qt></translation>
</message>
@@ -17568,7 +17539,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>MIDIミã‚サ</translation>
</message>
@@ -17583,7 +17554,7 @@ Double-click to open the marker editor.</source>
<translation>楽器</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</translation>
</message>
@@ -17880,13 +17851,13 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>èœé¢</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>デフォルトレイアウトモード</translation>
</message>
@@ -18459,7 +18430,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> フォント: </translation>
</message>
@@ -18479,16 +18450,12 @@ This is a bug (the program would previously have crashed by now)</source>
<translation> é–“éš”: </translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-117"/>
<source> No selection </source>
<translation> é¸æŠžãªã— </translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">三連符</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation>コード</translation>
</message>
@@ -18505,7 +18472,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>%1 %2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation>ä¸æ˜Žãªé–“éš”æ“作 %1</translation>
</message>
@@ -18530,21 +18497,17 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>Lilypondプレビューオプション</translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">エクスãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚書ãè¾¼ã¿ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>クリップボードã¯ç©ºã§ã™</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>一ã‹æ‰€ã«è¤‡æ•°ã®ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã¯è²¼ã‚Šä»˜ã‘ã§ãã¾ã›ã‚“</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -18556,23 +18519,22 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+88"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>LilyPondã§å°åˆ·ä¸...</translation>
</message>
@@ -18587,29 +18549,29 @@ This is a bug (the program would previously have crashed by now)</source>
<translation><qt><p>LilyPondエクスãƒãƒ¼ãƒˆã®ãŸã‚ã®ä¸€æ™‚ファイルをオープンã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p><p>ã“ã‚Œã¯ãŠãらã<pre>%1</pre>上ã®ãƒ‡ã‚£ã‚¹ã‚¯ã‚¹ãƒšãƒ¼ã‚¹ãŒãªã„ã“ã¨ã‚’æ„味ã—ã¦ã„ã¾ã™ã€‚</p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>クリップボードã®å†…容を挿入...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>ã“ã®ä½ç½®ã§è²¼ã‚Šä»˜ã‘ã§ãã¾ã›ã‚“。</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation>イベントを上ã®äº”ç·šã«ç§»å‹•</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>ベãƒã‚·ãƒ†ã‚£ã®å¢—åŠ ä¸...</translation>
</message>
@@ -18619,15 +18581,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>ベãƒã‚·ãƒ†ã‚£ã®ä½Žæ¸›ä¸...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">イベントベãƒã‚·ãƒ†ã‚£ã®è¨å®š</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">ベãƒã‚·ãƒ†ã‚£ã®è¨å®š...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation>テã‚ストイベントを編集</translation>
</message>
@@ -18642,7 +18596,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>音符をã¤ãªã’ã‚‹...</translation>
</message>
<message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation>ä¸æ˜ŽãªéŸ³ç¬¦ã®æŒ¿å…¥å‹•ä½œ %1</translation>
</message>
@@ -18652,13 +18606,13 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>音符ã®æŒ¿å…¥</translation>
</message>
<message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation>ç¬¦ç‚¹ã‚’è¿½åŠ ...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation>オルナメントトラック %1 bar %2</translation>
</message>
@@ -18668,10 +18622,6 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>オルナメント å°ç¯€ %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">オルナメントã®ä½œæˆ</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>オルナメントã®ä½¿ç”¨</translation>
@@ -18707,7 +18657,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>サステイン</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>ã“ã®ãƒ‡ãƒã‚¤ã‚¹ã«å¯¾ã—ã¦ã‚µã‚¹ãƒ†ã‚¤ãƒ³ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ©ãŒ1ã¤ã‚‚定義ã•ã‚Œã¦ã„ã¾ã›ã‚“。
@@ -18719,7 +18669,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>ãŠãŠã‚ˆãã®æ‹åを表示</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - セグメント トラック #%3 - èœé¢</translation>
</message>
@@ -18751,7 +18701,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>åŠéŸ³ã®æ•°ã§: </translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>時間: %1 (%2.%3秒)</translation>
</message>
@@ -18800,16 +18750,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Cycling slashes...</source>
<translation>スラッシュã®åˆ‡ã‚Šæ›¿ãˆ...</translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>音符を挿入ã§ãã¾ã›ã‚“: é¸æŠžã—ãŸãƒ‡ãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã«éŸ³ç¬¦ã¯ã‚ã‚Šã¾ã›ã‚“</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>ズーム</translation>
</message>
@@ -18834,7 +18779,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>トラックヘッダã®ã‚¯ãƒãƒ¼ã‚º</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>アクティブãªã‚»ã‚°ãƒ¡ãƒ³ãƒˆã‚’変更ã™ã‚‹ãŸã‚ã«ãƒ›ã‚¤ãƒ¼ãƒ«ã‚’回転</qt></translation>
@@ -19056,10 +19001,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">ピッãƒãƒ™ãƒ³ãƒ‰ã‚·ãƒ¼ã‚±ãƒ³ã‚¹</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>プリセット</translation>
@@ -19070,10 +19011,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>プリセット:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">ユーザ</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -19296,23 +19233,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <source>User %1</source>
- <translation type="obsolete">ユーザ %1</translation>
- </message>
- <message>
<location line="-901"/>
<source>Pre Bend</source>
<translation>プリベンド</translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">値(%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">デュレーション(%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation type="unfinished">デュレーションã®ç«‹ã¡ã‚ãŒã‚Š(%):</translation>
@@ -19333,23 +19258,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>終了値(%):</translation>
</message>
<message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-ja</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation>ベンドシーケンス</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">ビブラートã®æ³¢ã®é•·ã•:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">解åƒåº¦:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>ä¸æ£ãªçµ‚了時間。ãªã‚“らã‹ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚’é¸æŠžã—ã¦ã„ã¾ã›ã‚“ã‹?</translation>
@@ -19876,13 +19789,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1コントãƒãƒ¼ãƒ©</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -19970,12 +19876,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>ãªã—</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation type="unfinished"></translation>
</message>
@@ -20040,7 +19946,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>和音上ã®éŸ³ç¬¦ã‚’分割ã—ã¦ã‚¿ã‚¤ã§ã¤ãªã</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>完全クォンタイズ</translation>
</message>
@@ -20380,8 +20286,8 @@ There may be some incompatibilities with the file format.</source>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20393,7 +20299,7 @@ There may be some incompatibilities with the file format.</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>ドã‚ュメントを %1 ã«ä¿å˜ã§ãã¾ã›ã‚“</translation>
</message>
@@ -20468,7 +20374,12 @@ Please select any you wish to delete permanently from the hard disk.
<translation>マージ</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>ディレクトリ %1 ä¸ã«ä¸€æ™‚ファイル %2 を作æˆã§ãã¾ã›ã‚“</translation>
</message>
@@ -20483,7 +20394,7 @@ Please select any you wish to delete permanently from the hard disk.
<translation>一時出力ファイル '%1' を目的ã®ãƒ•ã‚¡ã‚¤ãƒ« '%2' ã«æ”¹åã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ</translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation>è¦å‘Š</translation>
</message>
@@ -20497,11 +20408,7 @@ Would you like to set it now?</source>
今ãれをè¨å®šã—ã¾ã™ã‹?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">ファイルã«ã‚»ãƒ¼ãƒ–...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation>'%1'ã«æ›¸ãè¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼</translation>
</message>
@@ -20579,7 +20486,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>オーディオã¾ãŸã¯éžã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚»ã‚°ãƒ¡ãƒ³ãƒˆã®ã¿é¸æŠžã—ã¦ãã ã•ã„</translation>
</message>
@@ -20590,7 +20497,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20599,7 +20506,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20620,7 +20527,7 @@ See Edit -> Preferences -> Audio.</source>
編集 -> è¨å®š -> オーディオをå‚ç…§ã—ã¦ãã ã•ã„。</translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation>ドãƒãƒƒãƒ—ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã¤ã„ã‹å‡ºæ¥ãªã„。 JACKオーディオサーãƒã¯ç„¡åŠ¹ã€‚</translation>
</message>
@@ -20689,14 +20596,14 @@ See Edit -> Preferences -> Audio.</source>
<translation>èµ·å‹•...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> ズーム:</translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -20725,12 +20632,12 @@ Do you want to open it instead ?</source>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>未タイトル</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20770,12 +20677,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>ã™ã¹ã¦ã®ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„るファイル</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20795,33 +20702,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>ファイルã®ã‚ªãƒ¼ãƒ—ン</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -20831,16 +20738,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>%1ãŒã‚ªãƒ¼ãƒ—ンã§ããªã„</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>ファイルã«ã‚»ãƒ¼ãƒ–...</translation>
</message>
@@ -20937,12 +20844,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>è¦å‘Š</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -20997,12 +20904,12 @@ Would you like to set it now?</source>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>全体ã®ãƒ†ãƒ³ãƒã‚’è¨å®š</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>ツールãƒãƒ¼ã‚’ON/OFF...</translation>
</message>
@@ -21070,23 +20977,23 @@ Would you like to set it now?</source>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Rosegardenプãƒã‚¸ã‚§ã‚¯ãƒˆãƒ•ã‚¡ã‚¤ãƒ«</translation>
</message>
<message>
- <location line="+1713"/>
+ <location line="+1708"/>
<source>Input</source>
<translation>入力</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-ja</translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21110,8 +21017,8 @@ Would you like to set it now?</source>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21121,7 +21028,7 @@ Would you like to set it now?</source>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21139,8 +21046,8 @@ Would you like to set it now?</source>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21149,12 +21056,12 @@ Would you like to set it now?</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation>http://rosegardenmusic.com/tutorials/</translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation><h3>より新ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚ã‚Šã¾ã™</h3></translation>
</message>
@@ -21164,7 +21071,7 @@ Would you like to set it now?</source>
<translation><p>%1.ã¨ã„ã†ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’使用ã—ã¦ã„ã¾ã™ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %2 ãŒæ–°ãŸã«å…¬é–‹ã•ã‚Œã¦ã„ã¾ã™ã€‚</p><p><a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Rosegarden webサイト</a>ã«ã‚ˆã‚Šè©³ç´°ãªæƒ…å ±ãŒã‚ã‚Šã¾ã™ã®ã§ãã¡ã‚‰ã‚’見ã¦ãã ã•ã„。</p></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>MIDIファイルã®ã‚ªãƒ¼ãƒ—ン</translation>
</message>
@@ -21174,12 +21081,12 @@ Would you like to set it now?</source>
<translation>MIDIファイルã®ãƒžãƒ¼ã‚¸</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>MIDIファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆ...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>音符ã®è¨ˆç®—....</translation>
</message>
@@ -21211,36 +21118,24 @@ Would you like to set it now?</source>
<translation>ファイルãŒå£Šã‚Œã¦ã„ã‚‹ã®ã§X11 Rosegardenファイルã¯ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Hydrogenファイルã®ã‚ªãƒ¼ãƒ—ン</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Hydrogenファイルをインãƒãƒ¼ãƒˆ...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">ファイルãŒå£Šã‚Œã¦ã„ã‚‹ã®ã§Hydrogenファイルã¯ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>LilyPondエクスãƒãƒ¼ãƒˆã®ãŸã‚ã®ä¸€æ™‚ファイルをオープンã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p><p>ã“ã‚Œã¯ãŠãらã<pre>%1</pre>上ã®ãƒ‡ã‚£ã‚¹ã‚¯ã‚¹ãƒšãƒ¼ã‚¹ãŒãªã„ã“ã¨ã‚’æ„味ã—ã¦ã„ã¾ã™ã€‚</p></qt></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>Rosegardenã®ãƒ—ãƒã‚»ã‚¹ã¯ç•°å¸¸çµ‚了ã—ã¾ã—ãŸã€‚セッションã®ã‚µã‚¦ãƒ³ãƒ‰ã‚„録音ã—ãŸã‚‚ã®ã¯ä½¿ã†ã“ã¨ãŒã§ãã¾ã›ã‚“。
Rosegardenã‚’å†èµ·å‹•ã—ã¦ã‚µã‚¦ãƒ³ãƒ‰æ©Ÿèƒ½ã‚’有効ã«ã—ã¦ãã ã•ã„。</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>シーケンサを起動ä¸...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>æ–°ã—ã„ファイルå%1 ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜...</translation>
@@ -21287,7 +21182,7 @@ No segment will be split.</source>
<translation>オリジナルã®ãƒ†ãƒ³ãƒã¨ã‚¿ã‚¤ãƒ ã‚·ã‚°ãƒãƒãƒ£ã‚’削除</translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation>Rosegardenã®ã‚·ãƒ¼ã‚±ãƒ³ã‚µã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚セッションã®ã‚µã‚¦ãƒ³ãƒ‰ã‚„録音ã—ãŸã‚‚ã®ã¯ä½¿ã†ã“ã¨ãŒã§ãã¾ã›ã‚“。
@@ -21301,7 +21196,7 @@ http://rosegardenmusic.com ã‚’å‚ç…§ã—ã¦ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã¨MIDIã®è¨å®šã‚’ä¿®
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21309,7 +21204,7 @@ http://rosegardenmusic.com ã‚’å‚ç…§ã—ã¦ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã¨MIDIã®è¨å®šã‚’ä¿®
<translation>ファイルåを指定ã—ã¦ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Rosegardenファイルをパッケージã«ä¿å˜ã™ã‚‹ã®ã«å¤±æ•—: %1</translation>
</message>
@@ -21325,7 +21220,7 @@ http://rosegardenmusic.com ã‚’å‚ç…§ã—ã¦ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã¨MIDIã®è¨å®šã‚’ä¿®
<translation>標準MIDIファイル</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21392,14 +21287,14 @@ http://rosegardenmusic.com ã‚’å‚ç…§ã—ã¦ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã¨MIDIã®è¨å®šã‚’ä¿®
<translation>MusicXMLファイルをエクスãƒãƒ¼ãƒˆ...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>XMLファイル</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-936"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation>MusicXMLファイルã®ã‚ªãƒ¼ãƒ—ン</translation>
@@ -21417,7 +21312,7 @@ http://rosegardenmusic.com ã‚’å‚ç…§ã—ã¦ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã¨MIDIã®è¨å®šã‚’ä¿®
</translation>
</message>
<message>
- <location line="+1008"/>
+ <location line="+1003"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -21510,7 +21405,7 @@ Would you like to set it now?</source>
<translation>æ–°ã—ã„ラベルを入力</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>プレイリスト</translation>
</message>
@@ -21520,7 +21415,7 @@ Would you like to set it now?</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>転é€ã®ãŸã‚ã«MIDIパニックイベントをã‚ューイング...</translation>
</message>
@@ -21600,7 +21495,7 @@ Error was : %2</source>
<translation><qt><p>クリックã—ã€ä¸Šä¸‹ã¾ãŸã¯å·¦å³ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚</p><p>ダブルクリックã§å€¤ã‚’直接編集ã—ã¾ã™ã€‚</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>数値ã®å…¥åŠ›</translation>
</message>
@@ -21652,7 +21547,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>セグメントカラーã®å¤‰æ›´...</translation>
</message>
@@ -21695,7 +21590,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>セグメントã®ä¸Šã§ã‚¯ãƒªãƒƒã‚¯ã§å‰Šé™¤</translation>
</message>
@@ -21728,7 +21623,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation>çµåˆ(&J)</translation>
</message>
@@ -21736,7 +21631,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>ラベルã®å¤‰æ›´(&l)...</translation>
</message>
@@ -21773,22 +21668,22 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>セグメントã®ç§»å‹•</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>セグメントã®ç§»å‹•</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>SHIFTã‚ーを押ã—ãªãŒã‚‰ã§æ‹ã‚°ãƒªãƒƒãƒ‰ã«ã‚¹ãƒŠãƒƒãƒ—を無効ã«ã§ãã¾ã™</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>クリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã®ç§»å‹•</translation>
</message>
@@ -21983,12 +21878,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>シフトã‚ーを押ã—ãªãŒã‚‰å‹•ã‹ã™ã¨å°ç¯€ç·šã®ã‚¹ãƒŠãƒƒãƒ—を無効ã«ã§ãã¾ã™</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>オーディオã®éŒ²éŸ³åˆã¯ãƒ‰ãƒãƒƒãƒ—ã¯ã“ã“</translation>
</message>
@@ -22064,7 +21959,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>è¦å‘Š</translation>
</message>
@@ -22088,17 +21983,17 @@ Would you like to set it now?</source>
<translation>オーディオプレビューã®ç”Ÿæˆ...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">セグメントã®ãƒªã‚µã‚¤ã‚º</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>SHIFTã‚ーを押ã—ãªãŒã‚‰ã§æ‹ã‚°ãƒªãƒƒãƒ‰ã«ã‚¹ãƒŠãƒƒãƒ—を無効ã«ã§ãã¾ã™</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>SHIFTã‚ーを押ã—ãªãŒã‚‰ã§æ‹ã‚°ãƒªãƒƒãƒ‰ã®ã‚¹ãƒŠãƒƒãƒ—を無効; Ctrlã‚ーを押ã—ãªãŒã‚‰ã§ç¸®å°º</translation>
</message>
@@ -22108,7 +22003,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>クリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã®é•·ã•å¤‰æ›´; Ctrlã‚ーを押ã—ãªãŒã‚‰ã§ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®é•·ã•å¤‰æ›´</translation>
</message>
@@ -22121,24 +22016,24 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>クリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§ã‚»ãƒ³ã‚°ãƒ¡ãƒ³ãƒˆé¸æŠž</translation>
</message>
<message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>セグメントã®ç§»å‹•</numerusform>
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+154"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>SHIFTã‚ーを押ã—ãªãŒã‚‰ã§æ‹ã‚°ãƒªãƒƒãƒ‰ã«ã‚¹ãƒŠãƒƒãƒ—を無効ã«ã§ãã¾ã™</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>クリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§ã‚»ã‚°ãƒ¡ãƒ³ãƒˆé¸æŠžl ä¸ãƒœã‚¿ãƒ³ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§ç©ºç™½ã‚’æç”»</translation>
</message>
@@ -22163,19 +22058,11 @@ Would you like to set it now?</source>
<translation>クリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã‚’移動;Ctrlã‚ーを押ã—ãªãŒã‚‰ã§ã¯ã‚³ãƒ”ー;Ctrl+Altã§ã¯ãƒªãƒ³ã‚¯ã•ã‚ŒãŸã‚³ãƒ”ー；ダブルクリックã§ç·¨é›†</translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">クリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã®ç§»å‹•; Ctrlã‚ーを押ã—ã¤ã¥ã‘ãªãŒã‚‰ã§ã‚³ãƒ”ー</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation>クリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã®ã‚³ãƒ”ー</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">クリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã§ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã®ç§»å‹•; Ctrlã‚ーを押ã—ã¤ã¥ã‘ãªãŒã‚‰ã§ã‚³ãƒ”ー; ダブルクリックã§ç·¨é›†</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation>セグメントã®ã‚³ãƒ”ーã®ãŸã‚ã«ã‚¯ãƒªãƒƒã‚¯ã¨ãƒ‰ãƒ©ãƒƒã‚°</translation>
@@ -22246,24 +22133,12 @@ Would you like to set it now?</source>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">セグメントを2分割</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>ï¼’ã¤ã«åˆ†å‰²ã™ã‚‹ãŸã‚ã«ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã‚’クリックã—ã€æ‹åグリッドã«ã‚¹ãƒŠãƒƒãƒ—ã—ãªã„よã†ã«ã‚·ãƒ•ãƒˆã‚’押ã—ãŸã¾ã¾ã«ã™ã‚‹</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>ï¼’ã¤ã«åˆ†å‰²ã™ã‚‹ãŸã‚ã«ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã‚’クリック</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23978,7 +23853,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><楽器無ã—></translation>
</message>
@@ -23993,19 +23868,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation>< 無題 ></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">è¦å‘Š</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">オーディオファイルã®ãƒ‘スãŒå˜åœ¨ã—ãªã„ã‹ã€æ›¸ãè¾¼ã¿ã§ãã¾ã›ã‚“。
-オーディオを録音ã™ã‚‹å‰ã«ãƒ‰ã‚ュメントプãƒãƒ‘ティä¸ã§ã€ã‚ªãƒ¼ãƒ‡ã‚£ã‚ª パスã®ãŸã‚ã®æœ‰åŠ¹ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’指定ã—ã¾ã™ã€‚
-今ãれをè¨å®šã—ã¾ã™ã‹?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>トラックをミュート</translation>
</message>
@@ -24018,31 +23881,31 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24088,7 +23951,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>トラック</translation>
</message>
@@ -24099,12 +23962,12 @@ Would you like to set it now?</source>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation>< 無題 ></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>å†ç”Ÿãƒ‘ラメータ</translation>
</message>
@@ -24245,7 +24108,103 @@ Would you like to set it now?</source>
<translation><qt><p>æ–°ã—ã„セグメントã¯ã€é–‹å§‹æ™‚点ã‹ã‚‰ã“ã®éŸ³éƒ¨è¨˜å·ã§ä½œæˆã•ã‚Œã¾ã™</p></qt></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+2"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">高音</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">低音</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">アンティークシンãƒãƒ«</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">木ç´</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">ギター</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">コントラãƒã‚¹</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">ãƒã‚§ãƒ¬ã‚¹ã‚¿</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">å¤ã„ãƒã‚§ãƒ¬ã‚¹ã‚¿</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">フレンãƒ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">ソプラノ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">メゾソプラノ記å·</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">アルト</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">テノール</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">ãƒãƒªãƒˆãƒ³</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">varbaritone記å·</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">サブãƒã‚¹</translation>
+ </message>
+ <message>
+ <location line="+39"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation><qt><p>五線を使ã£ã¦,ã‚‚ã£ã¨ã‚‚低ã„ã€æ¼”å¥å¯èƒ½ãªéŸ³ã‚’指定</p></qt></translation>
</message>
@@ -24275,87 +24234,71 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>treble</source>
- <translation>高音</translation>
+ <translation type="obsolete">高音</translation>
</message>
<message>
- <location line="+1"/>
<source>bass</source>
- <translation>低音</translation>
+ <translation type="obsolete">低音</translation>
</message>
<message>
- <location line="+1"/>
<source>crotales</source>
- <translation>アンティークシンãƒãƒ«</translation>
+ <translation type="obsolete">アンティークシンãƒãƒ«</translation>
</message>
<message>
- <location line="+1"/>
<source>xylophone</source>
- <translation>木ç´</translation>
+ <translation type="obsolete">木ç´</translation>
</message>
<message>
- <location line="+1"/>
<source>guitar</source>
- <translation>ギター</translation>
+ <translation type="obsolete">ギター</translation>
</message>
<message>
- <location line="+1"/>
<source>contrabass</source>
- <translation>コントラãƒã‚¹</translation>
+ <translation type="obsolete">コントラãƒã‚¹</translation>
</message>
<message>
- <location line="+1"/>
<source>celesta</source>
- <translation>ãƒã‚§ãƒ¬ã‚¹ã‚¿</translation>
+ <translation type="obsolete">ãƒã‚§ãƒ¬ã‚¹ã‚¿</translation>
</message>
<message>
- <location line="+1"/>
<source>old celesta</source>
- <translation>å¤ã„ãƒã‚§ãƒ¬ã‚¹ã‚¿</translation>
+ <translation type="obsolete">å¤ã„ãƒã‚§ãƒ¬ã‚¹ã‚¿</translation>
</message>
<message>
- <location line="+1"/>
<source>french</source>
- <translation>フレンãƒ</translation>
+ <translation type="obsolete">フレンãƒ</translation>
</message>
<message>
- <location line="+1"/>
<source>soprano</source>
- <translation>ソプラノ</translation>
+ <translation type="obsolete">ソプラノ</translation>
</message>
<message>
- <location line="+1"/>
<source>mezzosoprano</source>
- <translation>メゾソプラノ記å·</translation>
+ <translation type="obsolete">メゾソプラノ記å·</translation>
</message>
<message>
- <location line="+1"/>
<source>alto</source>
- <translation>アルト</translation>
+ <translation type="obsolete">アルト</translation>
</message>
<message>
- <location line="+1"/>
<source>tenor</source>
- <translation>テノール</translation>
+ <translation type="obsolete">テノール</translation>
</message>
<message>
- <location line="+1"/>
<source>baritone</source>
- <translation>ãƒãƒªãƒˆãƒ³</translation>
+ <translation type="obsolete">ãƒãƒªãƒˆãƒ³</translation>
</message>
<message>
- <location line="+1"/>
<source>varbaritone</source>
- <translation>varbaritone記å·</translation>
+ <translation type="obsolete">varbaritone記å·</translation>
</message>
<message>
- <location line="+1"/>
<source>subbass</source>
- <translation>サブãƒã‚¹</translation>
+ <translation type="obsolete">サブãƒã‚¹</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+36"/>
<source>Transpose</source>
<translation>トランスãƒãƒ¼ã‚º</translation>
</message>
@@ -24396,7 +24339,7 @@ Would you like to set it now?</source>
<translation><qt><p>æ–°ã—ã„セグメントã¯ã“ã®è‰²ã§ä½œæˆã•ã‚Œã¾ã™</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>オーディオ</translation>
diff --git a/data/locale/nl.ts b/data/locale/nl.ts
index edb73e6..000953e 100644
--- a/data/locale/nl.ts
+++ b/data/locale/nl.ts
@@ -331,23 +331,23 @@
<translation>Kan font mapping bestand %1 niet openen</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&Bestand</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>Voeg &audiobestand toe...</translation>
</message>
@@ -357,54 +357,54 @@
<translation>&Exporteer audiobestand...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>&Sluiten</translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Bewerk</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>&Vergeet audiobestand</translation>
</message>
@@ -429,350 +429,346 @@
<translation>Afspelen voorbeeld</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>&Help</translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation>F1</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">&Rosegarden handboek</translation>
- </message>
- <message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>Richtlijnen &bugs rapporteren</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>Over Roseg&arden</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Algemene werkbalk</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>&Niets om ongedaan te maken</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>Niets &om te herhalen</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>&Kopieer</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>&Plakken</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Wissel naar Selecteren</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Wissel naar Invoegen Noten</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Wissel naar gum</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>&Opslaan</translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation>Gebeurtenis &invoegen</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation>Gebeurtenis &verwijderen</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation>Delete</translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation>Gebeurtenis &bewerken</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation>&Geavanceerde gebeurtenis-editor</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>&Knippen</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation>Alles &Selecteren</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>Verwijderen se&lectie</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>&Filter Selectie</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation>Starttijd se&gment instellen...</translation>
</message>
@@ -782,82 +778,82 @@
<translation>Se&gmentduur instellen...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Bekijk</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>&Muzikale tijden</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>&Werkelijke tijden</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>&Ruwe tijden</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Se&gment</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Bewerk &Met</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Open in matri&xeditor</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Open in ¬atie-editor</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>Over &Qt</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>Voeg &Segno</translation>
</message>
@@ -887,7 +883,7 @@
<translation>Ha&lve noot met punt</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>Wissel naar ¬en</translation>
</message>
@@ -907,12 +903,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>Duurwerkbalk</translation>
</message>
@@ -922,7 +918,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+73"/>
+ <location line="-2670"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -997,47 +993,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2050"/>
- <location line="+2059"/>
+ <location line="+9"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="+3"/>
- <location line="+371"/>
+ <location line="-620"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-364"/>
- <location line="+371"/>
+ <location line="-616"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-372"/>
+ <location line="+10"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -1107,7 +1103,7 @@
<translation></translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>&Toon werkbalk</translation>
</message>
@@ -1117,39 +1113,39 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Actiewerkbalk</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Maatsoort-werkbalk</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Toon transportwerkbalk</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Zoom-werkbalk</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1199,7 +1195,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Voeg accent in</translation>
</message>
@@ -1219,125 +1215,117 @@
<translation>Bewerk marker</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Wissel naar verplaats-gereedschap</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Wissel naar tekengereedschap</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Wissel naar resize-gereedschap</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">&Niets om ongedaan te maken</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Niets om te he&rhalen</translation>
- </message>
- <message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>Ve&rwijderen</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation>&Grid</translation>
</message>
@@ -1353,13 +1341,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation>0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation>Spring naar &1/48</translation>
</message>
@@ -1370,13 +1358,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation>Spring naar 1/&24</translation>
</message>
@@ -1387,13 +1375,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation>Spring n&aar 1/12</translation>
</message>
@@ -1404,13 +1392,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation>Spring naar &3/16</translation>
</message>
@@ -1421,13 +1409,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation>Spring naar 3/8</translation>
</message>
@@ -1438,37 +1426,37 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation>Spring naar &tel</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation>Spring naar &maat</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1479,149 +1467,149 @@
</message>
<message>
<location line="+7"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1284"/>
- <location line="+1550"/>
+ <location line="-2479"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2744"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&Compositie</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Voeg te&mpoverandering toe...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>Voeg maatsoortveranderin&g toe...</translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Open in &gebeurtenissenlijst-editor</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -1634,679 +1622,679 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>Cursor &Vooruit en Selecteren</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>I/do kruis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II/re mol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II/re kruis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III/mi mol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV/fa kruis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V/sol mol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V/sol kruis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI/la mol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI/la kruis</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII/ti mol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation></translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation>V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2516"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -2331,7 +2319,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+929"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2383,14 +2371,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="+4"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-1269"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2445"/>
+ <location line="+17"/>
<source>Ctrl+Alt++</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2477,14 +2470,14 @@
<translation></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2502,8 +2495,8 @@
<translation></translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -2521,27 +2514,27 @@
<translation></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>&Aanpassen</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Quantiseren</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>&Quantiseer...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation type="unfinished"></translation>
</message>
@@ -2552,36 +2545,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>Voeg &Gelijke-Toonhoogte Noten Samen</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>Tikje naar &links</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>Tik&je naar rechts</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>&Verhoog snelheid</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>&Reduceer snelheid</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -2597,315 +2590,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>&Halveer lengte</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>&Dubbele lengte</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>&Oprekken of samenpersen...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>&Transponeren</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>Halve toon Om&hoog</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>Halve toon Om&laag</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>Een &Octaaf Omhoog</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>Een Octaa&f Omlaag</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>&Transponeren per halve secunde...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Transponeren per &interval...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>&Converteren</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>&Inversie</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>&Retrograde</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>Re&trograde inversie</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>Trigger Se&gment...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>&Selecteer en bewerk</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>&Teken</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>&Wissen</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Verplaats</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>Verander &Grootte</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>O&psplitsen</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>&Snelheid</translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>Cursor Vooruit en &Selecteren</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>L&us wissen</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>T&ransport</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>&Afspelen</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&Stoppen</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>&Terugspoelen</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Snel &vooruitspoelen</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Terugspoelen tot het &begin</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Vooruitspoelen tot het &eind</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>S&olo</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>Scro&llen om afspelen te volgen</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>Octaaf Om&hoog</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>A&kkoord Invoegen Modus</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>&Stap Opnemen</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>&Werkbalken</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>&Linealen</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>Toon akk&oordnaam-liniaal</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>Toon &tempo-liniaal</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Hulpmiddelenwerkbalk</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>&Opnemen</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>&Instellingen</translation>
</message>
@@ -2990,7 +2983,7 @@
<translation>Toon niet-&toegekende faders</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Wissel naar Invoegen</translation>
</message>
@@ -3000,13 +2993,13 @@
<translation>Verwijder rusten na wissen</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>&Afdrukken...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation type="unfinished"></translation>
</message>
@@ -3101,27 +3094,27 @@
<translation>&Toon spoorheaders</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Open in &slagwerk-matrixeditor</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>Voeg sleutel&verandering toe...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Voeg voorte&kens aan de sleutel toe...</translation>
</message>
<message>
- <location line="-1125"/>
- <location line="+1724"/>
+ <location line="-2321"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation type="unfinished"></translation>
</message>
@@ -3136,13 +3129,13 @@
<translation>Toevoegen: pedaal &omhoog</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>Notatie &converteren voor...</translation>
</message>
<message>
- <location line="-2110"/>
+ <location line="+1"/>
<source>Add &Layer</source>
<translation type="unfinished"></translation>
</message>
@@ -3158,7 +3151,7 @@
<translation>N&oot</translation>
</message>
<message>
- <location line="-1510"/>
+ <location line="-2706"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -3169,51 +3162,51 @@
</message>
<message>
<location line="+355"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1030"/>
- <location line="+1936"/>
+ <location line="-2226"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2526"/>
+ <location line="+105"/>
<source>&Guess Beats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -3525,8 +3518,8 @@
<translation>He&rstel stokken</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>&Frase</translation>
</message>
@@ -3602,14 +3595,14 @@
<translation>&Boog onderlangs</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>&Noten losmaken</translation>
</message>
@@ -3689,14 +3682,14 @@
<translation>&Normaliseer Rusten</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation>&Klap Rusten In</translation>
</message>
@@ -3706,8 +3699,8 @@
<translation>&Noten</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -3793,13 +3786,13 @@
<translation>&Precisie-timing</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>Tikje naar &rechts</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>&Zichtbaarheid</translation>
</message>
@@ -3856,26 +3849,26 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>&Vorig segment</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation type="unfinished"></translation>
</message>
@@ -4020,14 +4013,14 @@
<translation>&Gitaarakkoord</translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>&Voeg Noot In</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>Octaaf Om&laag</translation>
</message>
@@ -4047,13 +4040,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>Toon &hulpmiddelen-werkbalk</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>Toon &voortekens-werkbalk</translation>
</message>
@@ -4073,18 +4066,18 @@
<translation>Toon &groepenwerkbalk</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>Toon trans&portwerkbalk</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>Toon &layoutwerkbalk</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4097,13 +4090,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation></translation>
@@ -4114,7 +4107,7 @@
<translation>Toon akkoo&rdnaam-liniaal</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation>Toon Ru&we noten-liniaal</translation>
</message>
@@ -4129,7 +4122,7 @@
<translation>Toon Lily&Pond-directieven</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>Sleutelwerkbalk</translation>
</message>
@@ -4149,7 +4142,7 @@
<translation>Accentenwerkbalk</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation type="unfinished"></translation>
</message>
@@ -4170,54 +4163,54 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation type="unfinished"></translation>
</message>
@@ -4227,13 +4220,13 @@
<translation>Afspelen</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation type="unfinished"></translation>
</message>
@@ -4253,7 +4246,7 @@
<translation>Help</translation>
</message>
<message>
- <location line="+2213"/>
+ <location line="+1386"/>
<source>&Figuration</source>
<translation type="unfinished"></translation>
</message>
@@ -4526,21 +4519,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
@@ -4711,7 +4704,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Wissel naar Invoegen</translation>
</message>
@@ -4766,7 +4759,7 @@
<translation>Maak Zichtbaar</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Auto-groeperen waar gepast</translation>
</message>
@@ -4806,7 +4799,7 @@
<translation>Dubbelmol</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>&Nieuw</translation>
</message>
@@ -4816,14 +4809,6 @@
<translation>&Importeren</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Importeer &Rosegarden project-bestand...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Importeer &MIDI-bestand...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>Importeer &Hydrogen-bestand...</translation>
@@ -4839,10 +4824,6 @@
<translation>&Bestand samenvoegen...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">&MIDI-bestand samenvoegen...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>&Hydrogen-bestand samenvoegen...</translation>
@@ -4853,26 +4834,6 @@
<translation>&Exporteren</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Exporteer &Rosegarden project-bestand...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Exporteer &MIDI-bestand...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Exporteer &Csound score-bestand...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Exporteer M&up-bestand...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Exporteer Music&XML-bestand...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>&Open...</translation>
@@ -4883,10 +4844,6 @@
<translation>Open &Recent</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Opslaan &als...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation type="unfinished"></translation>
@@ -5003,13 +4960,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation>&Studio</translation>
</message>
@@ -5069,49 +5026,49 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>H&erbenoem...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>&Oprekken of samenpersen...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>S&tarttijd instellen...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>&Duur instellen...</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Samenvoegen</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>&Opsplitsen</translation>
</message>
@@ -5226,26 +5183,26 @@
<translation>He&rmap Instrumenten...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>&Herschaal</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>Toon &sporenwerkbalk</translation>
</message>
@@ -5260,23 +5217,19 @@
<translation>Toon &zoom-werkbalk</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>Toon &afspeelpositie-liniaal</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Importeer &X11 Rosegarden bestand...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>MIDI-mi&xer</translation>
@@ -5287,10 +5240,6 @@
<translation>Toon te&mpo-liniaal</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Exporteren &LilyPond-bestand...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>Toon &transport</translation>
@@ -5337,26 +5286,26 @@
<translation>Editors-werkbalk</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Terugspoelen naar begin</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Doorspoelen naar het einde</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+221"/>
+ <location line="-1791"/>
<source>Insert Tempo Change</source>
<translation>Voeg tempoverandering in</translation>
</message>
@@ -5396,7 +5345,7 @@
<translation>Open tempo- en maatsoort-editor</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>&Bewerk item</translation>
</message>
@@ -5416,7 +5365,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>&Plak als nieuw getriggerd segment</translation>
</message>
@@ -5441,7 +5390,7 @@
<translation>Bassleutel</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2626"/>
+ <location filename="../QMenuStrings.cpp" line="+345"/>
<location filename="../InstrumentStrings.cpp" line="-74"/>
<source>Triangle</source>
<translation>Driehoek</translation>
@@ -8406,16 +8355,16 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>Synth-plugin</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>Audio</translation>
@@ -10556,20 +10505,15 @@
<translation>Onbekend</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10584,10 +10528,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 Controller %2 %3</translation>
</message>
@@ -10602,7 +10546,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Welkom!</translation>
</message>
@@ -10710,45 +10654,53 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation type="unfinished"></translation>
</message>
@@ -10848,7 +10800,7 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
@@ -10901,10 +10853,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
<location filename="../../src/base/figuration/SegmentFigData.cpp" line="+53"/>
<source>Replace segment contents</source>
<translation type="unfinished"></translation>
@@ -10949,6 +10897,52 @@
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Lilypond staat geen spaties of backslashes toe in bestandsnamen.<br><br> Wilt u<br> <br>%1<br><br>in plaats van de opgegeven bestandsnaam gebruiken?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Exporteren mislukt. Het bestand kon niet geopend worden voor schrijven.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">waarschuwing: te lange maat is ingekort</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -10964,7 +10958,7 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -11026,12 +11020,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>Voeg &boog toe</translation>
</message>
@@ -11526,14 +11520,6 @@
<translation>Audiobestand converteren...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">Audiobestand her-samplen...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">Audiobestand converteren en hersamplen...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation>Audiobestand importeren...</translation>
@@ -11547,24 +11533,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><geen synth></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><geen plugin></translation>
</message>
@@ -11617,10 +11603,6 @@
<translation>Bestand</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><geen audio bestanden></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Opslaan bestand als</translation>
@@ -11746,10 +11728,6 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<translation>Voer nieuw label in</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Remote audiobestand importeren</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>Audiobestand importeren dat geconverteerd of geresampled moet worden</translation>
@@ -11784,7 +11762,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Audiomixer</translation>
</message>
@@ -11800,20 +11778,20 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Pan</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>Audioniveau</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Mono of stereo</translation>
</message>
@@ -11824,21 +11802,21 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><geen></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
@@ -11858,7 +11836,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Sub %1</translation>
</message>
@@ -11874,14 +11852,14 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<translation>Master</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><geen plugin></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation></translation>
</message>
@@ -12440,7 +12418,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<translation><nieuwe bank %1></translation>
</message>
<message>
- <location line="+508"/>
+ <location line="+514"/>
<source>Some internal error: no device selected</source>
<translation type="unfinished"></translation>
</message>
@@ -12456,7 +12434,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<translation></translation>
</message>
<message>
- <location line="-774"/>
+ <location line="-780"/>
<source><new bank></source>
<translation><nieuwe bank></translation>
</message>
@@ -12476,7 +12454,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<translation>Deze bank echt verwijderen?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>Deze toetsen-mapping echt verwijderen?</translation>
</message>
@@ -12644,6 +12622,120 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -12967,7 +13059,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13192,7 +13284,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Snelheid</translation>
</message>
@@ -13208,7 +13300,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Niet-ondersteund gebeurtenistype</translation>
</message>
@@ -13223,12 +13315,13 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<translation>Controller Gebeurtenissen</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>Controller Gebeurtenis Nummer</translation>
</message>
@@ -13236,7 +13329,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>&Kopieer</translation>
</message>
@@ -13246,7 +13339,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<translation>(gedeelte)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(gekopierd)</translation>
</message>
@@ -13316,7 +13409,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>&Knippen</translation>
</message>
@@ -13392,7 +13485,7 @@ Selecteer welke u permanent van de harde schijf wilt verwijderen.
<translation></translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation>[ geen poort ]</translation>
</message>
@@ -14013,46 +14106,10 @@ Dit zou problemen kunnen veroorzaken als het later een andere berekende waarde o
<translation>Patroon</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Mol - stel %1 in op waarde</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Alternerend - zet %1 op max en min waarde bij alternerende gebeurtenissen</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo - zet %1 oplopend van min naar max</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo - zet %1 aflopend van max naar min</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Rammelend - stel %1 alternerend van max naar min met beiden afnemend tot nul</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>Waarde</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Eerste Waarde</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Twee Waarde</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Lage waarde</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Hoge waarde</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14841,13 +14898,6 @@ Wilt u proberen het bestand op het zoeken of het overslaan?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Guitar::Fingering</name>
- <message>
- <source>couldn't parse fingering '%1' in '%2'</source>
- <translation type="obsolete">Kon vingerzetting '%1' in '%2' niet parsen</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::GuitarChordEditorDialog</name>
<message>
<location filename="../../src/gui/editors/guitar/GuitarChordEditorDialog.cpp" line="+40"/>
@@ -15372,7 +15422,7 @@ Voorbeeldtekst uit het bestand:</translation>
<translation>Instrumentparameters</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Spoor</translation>
</message>
@@ -15380,7 +15430,7 @@ Voorbeeldtekst uit het bestand:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -15765,7 +15815,6 @@ Voorbeeldtekst uit het bestand:</translation>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15773,42 +15822,15 @@ Would you like to use
%1
instead?</source>
- <translation>Lilypond staat geen spaties of backslashes toe in bestandsnamen.<br><br> Wilt u<br> <br>%1<br><br>in plaats van de opgegeven bestandsnaam gebruiken?</translation>
+ <translation type="obsolete">Lilypond staat geen spaties of backslashes toe in bestandsnamen.<br><br> Wilt u<br> <br>%1<br><br>in plaats van de opgegeven bestandsnaam gebruiken?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">Exporteren mislukt. Het bestand kon niet geopend worden voor schrijven.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Exporteren mislukt. Het bestand kon niet geopend worden voor schrijven.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>waarschuwing: te lange maat is ingekort</translation>
- </message>
- <message>
- <location line="+11"/>
- <source>warning: bar too short, padding with rests</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">waarschuwing: te lange maat is ingekort</translation>
</message>
</context>
<context>
@@ -15839,10 +15861,6 @@ Would you like to use
<translation type="unfinished"></translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Geselecteerd spoors</translation>
- </message>
- <message>
<location line="+16"/>
<source>Compatibility level</source>
<translation>Lilypond compatibiliteitsniveau</translation>
@@ -16518,7 +16536,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -16603,12 +16621,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Geen verbinding</translation>
</message>
@@ -16832,6 +16845,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17037,12 +17059,12 @@ Dubbelklik om de marker-editor te openen.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Houd Shift ingedrukt om niet naar het rooster te springen</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Kopieer en verplaats gebeurtenis</translation>
</message>
@@ -17201,7 +17223,7 @@ Dubbelklik om de marker-editor te openen.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>Klik-en-sleep om geselecteerde noten te kopiëren</translation>
</message>
@@ -17214,12 +17236,12 @@ Dubbelklik om de marker-editor te openen.</translation>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation>Noot-invoegactie %1 onbekend</translation>
</message>
<message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation><naamloos></translation>
</message>
@@ -17282,7 +17304,7 @@ Dubbelklik om de marker-editor te openen.</translation>
<translation>Van</translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation></translation>
</message>
@@ -17298,8 +17320,7 @@ Dubbelklik om de marker-editor te openen.</translation>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -17309,7 +17330,7 @@ Dubbelklik om de marker-editor te openen.</translation>
<translation>Geschatte maatsoort wordt getoond</translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation>Geschatte maatsoort getoond</translation>
</message>
@@ -17324,10 +17345,6 @@ Dubbelklik om de marker-editor te openen.</translation>
<translation>Per aantal halve toonsafstanden:</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Stel Gebeurtenis Snelheden In</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation>Trigger segment</translation>
@@ -17338,20 +17355,15 @@ Dubbelklik om de marker-editor te openen.</translation>
<translation>Verwijder triggers</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
- <translation>Matrix</translation>
- </message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Kan noot niet invoegen: Geen roosterlengte geselecteerd</translation>
+ <translation>Matrix</translation>
</message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Detail</translation>
</message>
@@ -17371,7 +17383,7 @@ Dubbelklik om de marker-editor te openen.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -17478,13 +17490,6 @@ Dubbelklik om de marker-editor te openen.</translation>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">Toetsen-mapping</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="+53"/>
@@ -17501,7 +17506,7 @@ Dubbelklik om de marker-editor te openen.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>MIDI-mixer</translation>
</message>
@@ -17516,7 +17521,7 @@ Dubbelklik om de marker-editor te openen.</translation>
<translation>Instrument</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation></translation>
</message>
@@ -17820,13 +17825,13 @@ Dubbelklik om de marker-editor te openen.</translation>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Notatie</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Standaard layout-modus</translation>
</message>
@@ -18400,7 +18405,7 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> Lettertype: </translation>
</message>
@@ -18420,16 +18425,12 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
<translation>Spatiëring:</translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-117"/>
<source> No selection </source>
<translation>Geen selectie</translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Triool</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation>Akkoord</translation>
</message>
@@ -18446,7 +18447,7 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
<translation>%1 %2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation>Onbekende spatiëring actie %1</translation>
</message>
@@ -18471,21 +18472,17 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
<translation>Lilypond preview-opties</translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Exporteren mislukt. Het bestand kon niet geopend worden voor schrijven.</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Klembord is leeg</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>Kan niet meerdere Segmenten in elkaar plakken</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -18498,23 +18495,22 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+88"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation type="unfinished"></translation>
</message>
@@ -18529,29 +18525,29 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>Invoegen van klembord inhoud...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>Kan niet plakken op dit punt.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation>Verplaats gebeurtenissen naar bovenliggende notenbalk</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>Verhogen snelheden...</translation>
</message>
@@ -18561,15 +18557,7 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
<translation>Verlagen snelheden...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Stel Gebeurtenis Snelheden In</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Instellen Snelheden...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation type="unfinished"></translation>
</message>
@@ -18584,7 +18572,7 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
<translation>Inklappen noten...</translation>
</message>
<message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation>Noot-invoegactie %1 onbekend</translation>
</message>
@@ -18594,13 +18582,13 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
<translation>Noot invoegen</translation>
</message>
<message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation>Punt toevoegen...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation>Versiering spoor %1 maat %2</translation>
</message>
@@ -18610,10 +18598,6 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
<translation>Versiering maat %1 </translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Maak versiering</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>Gebruik versiering</translation>
@@ -18649,7 +18633,7 @@ Dit is een bug (het programma zou anders nu gecrashed zijn)</translation>
<translation>Sustain</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>Er is geen sustain-controller gedefinieerd voor dit apparaat.
@@ -18661,7 +18645,7 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
<translation>Geschatte maatsoort getoond</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation type="unfinished"></translation>
</message>
@@ -18694,7 +18678,7 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
<translation>Per aantal halve toonsafstanden:</translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>Tijd: %1 (%2.%3s)</translation>
</message>
@@ -18743,16 +18727,11 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
<source>Cycling slashes...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>Kan noot niet invoegen: Geen noot lengte geselecteerd</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Detail</translation>
</message>
@@ -18777,7 +18756,7 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
<translation>Sluit spoorheaders</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
@@ -19236,14 +19215,6 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
<translation type="unfinished"></translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Waarde (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Duur (%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation type="unfinished"></translation>
@@ -19269,10 +19240,6 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resolution:</source>
- <translation type="obsolete">Resolutie:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation type="unfinished"></translation>
@@ -19607,10 +19574,6 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
- <message>
- <source><qt><h3>Processing...</h3></qt></source>
- <translation type="obsolete"><qt><h3>Verwerken...</h3></qt></translation>
- </message>
</context>
<context>
<name>Rosegarden::ProjectPackager</name>
@@ -19803,13 +19766,6 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1-controller</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -19897,12 +19853,12 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Geen</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>2-in-de-tijd-van-3</translation>
</message>
@@ -19967,7 +19923,7 @@ Controleer of het apparaat juist is geconfigureerd in het dialoog 'Beheer M
<translation>Splits-en-bind overlappende akkoorden</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Quantiseer volledig</translation>
</message>
@@ -20306,8 +20262,8 @@ There may be some incompatibilities with the file format.</source>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20319,7 +20275,7 @@ There may be some incompatibilities with the file format.</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation type="unfinished"></translation>
</message>
@@ -20396,7 +20352,12 @@ Selecteer de bestanden die u permanent van de harde schijf wilt wissen.
<translation>Samenvoegen</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation type="unfinished"></translation>
</message>
@@ -20411,7 +20372,7 @@ Selecteer de bestanden die u permanent van de harde schijf wilt wissen.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished">Waarschuwing</translation>
</message>
@@ -20425,11 +20386,7 @@ Het moet naar een geldige map wijzen in Documenteigenschappen voordat u geluid o
Wilt u het pad nu instellen?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Opslaan bestand...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation type="unfinished"></translation>
</message>
@@ -20507,7 +20464,7 @@ Wij bevelen aan om dit bestand vanuit deze Rosegarden-versie opnieuw op te slaan
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>Selectie moet alleen audio- of non-audio-segmenten bevatten</translation>
</message>
@@ -20518,7 +20475,7 @@ Wij bevelen aan om dit bestand vanuit deze Rosegarden-versie opnieuw op te slaan
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20527,7 +20484,7 @@ Wij bevelen aan om dit bestand vanuit deze Rosegarden-versie opnieuw op te slaan
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20547,7 +20504,7 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -20557,10 +20514,6 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">Remote audiobestand importeren</translation>
- </message>
- <message>
<location line="+28"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>Audiobestand importeren dat geconverteerd of geresampled moet worden</translation>
@@ -20620,14 +20573,14 @@ See Edit -> Preferences -> Audio.</source>
<translation>Starten...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> Detail: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1- %2</translation>
@@ -20656,12 +20609,12 @@ Wilt u dit bestand openen in plaats van het origineel?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Zonder titel</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20700,12 +20653,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20725,33 +20678,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Alle bestanden</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Open Bestand</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -20761,16 +20714,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>Kan bestand %1 niet openen</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>Opslaan bestand...</translation>
</message>
@@ -20867,12 +20820,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Waarschuwing</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -20928,12 +20881,12 @@ Wilt u het nu instellen?</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Stel Globaal Tempo in</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>Werkbalk aan/uit...</translation>
</message>
@@ -21001,12 +20954,12 @@ Segmenten->Samenvoegen.
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Rosegarden project-bestanden</translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -21016,13 +20969,13 @@ Segmenten->Samenvoegen.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation></translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21046,8 +20999,8 @@ Segmenten->Samenvoegen.
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21057,7 +21010,7 @@ Segmenten->Samenvoegen.
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21075,8 +21028,8 @@ Segmenten->Samenvoegen.
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21085,12 +21038,12 @@ Segmenten->Samenvoegen.
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation></translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation type="unfinished"></translation>
</message>
@@ -21100,7 +21053,7 @@ Segmenten->Samenvoegen.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>Open MIDI Bestand</translation>
</message>
@@ -21110,12 +21063,12 @@ Segmenten->Samenvoegen.
<translation>Voeg MIDI Bestand Samen</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>Importeren MIDI bestand...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>Berekenen notatie...</translation>
</message>
@@ -21147,36 +21100,24 @@ Segmenten->Samenvoegen.
<translation>Kan X11 Rosegarden-bestand niet laden. Het lijkt ongeldig.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Open Hydrogen-bestand</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Hydrogen-bestand importeren...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Kan Hydrogen-bestand niet laden. Het lijkt ongeldig.</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>Het sequencer-proces van Rosegarden is onverwacht afgebroken. Geluid en opname is deze sessie niet langer beschikbaar.
Sluit af en start Rosegarden opnieuw om geluidsmogelijkheden te herstellen.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>Sequencer starten...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation type="unfinished"></translation>
@@ -21223,7 +21164,7 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation>De Rosegarden-sequencer kon niet worden gestart. Geluid en opname zijn deze sessie niet beschikbaar.
@@ -21237,7 +21178,7 @@ Voor hulp met de juiste audio- en MIDI-instellingen, ga naar http://rosegardenmu
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21245,7 +21186,7 @@ Voor hulp met de juiste audio- en MIDI-instellingen, ga naar http://rosegardenmu
<translation>Exporteren als...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Rosegarden-bestand in pakket opslaan mislukt: %1</translation>
</message>
@@ -21261,7 +21202,7 @@ Voor hulp met de juiste audio- en MIDI-instellingen, ga naar http://rosegardenmu
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21328,14 +21269,14 @@ Voor hulp met de juiste audio- en MIDI-instellingen, ga naar http://rosegardenmu
<translation>Exporteren MusicXML bestand...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>XML bestanden</translation>
</message>
<message>
- <location line="-941"/>
+ <location line="-936"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation type="unfinished"></translation>
@@ -21352,7 +21293,7 @@ Voor hulp met de juiste audio- en MIDI-instellingen, ga naar http://rosegardenmu
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1008"/>
+ <location line="+1003"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
@@ -21440,7 +21381,7 @@ Wilt u het pad nu instellen?</translation>
<translation>Voer nieuw label in</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Afspeellijst</translation>
</message>
@@ -21450,7 +21391,7 @@ Wilt u het pad nu instellen?</translation>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>MIDI paniek-gebeurtenissen oplijnen voor versturing...</translation>
</message>
@@ -21529,7 +21470,7 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Kies een nieuwe waarde</translation>
</message>
@@ -21581,7 +21522,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Verander segmentkleur...</translation>
</message>
@@ -21624,7 +21565,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Klik op een segment om het te verwijderen</translation>
</message>
@@ -21657,7 +21598,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">&Samenvoegen</translation>
</message>
@@ -21665,7 +21606,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>&Herbenoem...</translation>
</message>
@@ -21702,22 +21643,22 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>Verplaats segment</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>Verplaats segmenten</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Houd Shift ingedrukt om niet naar het rooster te springen</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>Klik-en-sleep om een segment te verplaatsen</translation>
</message>
@@ -21912,12 +21853,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>Houd Shift ingesrukt om niet naar maatstrepen te verspringen</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>Hier audio droppen of opnemen</translation>
</message>
@@ -21993,7 +21934,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Waarschuwing</translation>
</message>
@@ -22017,17 +21958,17 @@ Wilt u het nu instellen?</translation>
<translation>Bezig met genereren van audio voorbeeld...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Verander segmentgrootte</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Houd Shift ingedrukt om niet naar het rooster te springen</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>Houd Shift ingedrukt om niet naar rooster te verspringen; gebruik ook Ctrl om de inhoud te herschalen</translation>
</message>
@@ -22037,7 +21978,7 @@ Wilt u het nu instellen?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>Klik-en-sleep om een segment te herschalen; houd Ctrl ook ingedrukt om de inhoud te herschalen</translation>
</message>
@@ -22050,25 +21991,25 @@ Wilt u het nu instellen?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Klik-en-sleep om segmenten te selecteren</translation>
</message>
<message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Verplaats segment</numerusform>
- <numerusform>Verplaats segmenten</numerusform>
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+154"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Houd Shift ingedrukt om niet naar het rooster te springen</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>Klik-en-sleep om segmenten te selecteren; middel-klik-en-sleep om een leeg segment te tekenen</translation>
</message>
@@ -22093,19 +22034,11 @@ Wilt u het nu instellen?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">Klik-en-sleep om segmenten te verplaatsen; houd Ctrl ook ingedrukt om te kopiëren</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation>Klik-en-sleep om segmenten te kopiëren</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">Klik-en-sleep om segmenten te verplaatsen; houd Ctrl ook ingedrukt om te kopiëren; dubbelklik om te bewerken</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation>Klik-en-sleep om segment te kopiëren</translation>
@@ -22176,24 +22109,12 @@ Wilt u het nu instellen?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Splits segment tweemaal</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Klik op een segment om het in tweeën te splitsen; houd Shift ingedrukt om niet naar het rooster te springen</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>Klik op een segment om het in tweeën te splitsen</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23908,7 +23829,7 @@ Andere lopende applicaties afsluiten kan de werking van Rosegarden verbeteren.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><geen instrument></translation>
</message>
@@ -23923,19 +23844,7 @@ Andere lopende applicaties afsluiten kan de werking van Rosegarden verbeteren.</
<translation><naamloos></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Waarschuwing</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Het audiobestandspad bestaat niet of is niet schrijfbaar.
-Het moet naar een geldige map wijzen in Documenteigenschappen voordat u geluid opneemt.
-Wilt u het pad nu instellen?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Demp Spoor</translation>
</message>
@@ -23948,25 +23857,17 @@ Wilt u het pad nu instellen?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Zet het herhalende segment om in echte kopieën</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Zet de herhalende segmenten om in echte kopieën</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -23974,7 +23875,7 @@ Wilt u het pad nu instellen?</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -23982,7 +23883,7 @@ Wilt u het pad nu instellen?</translation>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24028,7 +23929,7 @@ Wilt u het pad nu instellen?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Spoor</translation>
</message>
@@ -24039,12 +23940,12 @@ Wilt u het pad nu instellen?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><naamloos></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Afspeelparameters</translation>
</message>
@@ -24185,7 +24086,103 @@ Wilt u het pad nu instellen?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+2"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">viool-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">bas-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">crotales-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">xylofoon-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">gitaar-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">contrabas-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">celesta-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">oude celesta-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">franse</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">sopraan-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">mezzosopraan-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">alt-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">tenor-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">bariton-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">(variatie) bariton-</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">subbas-</translation>
+ </message>
+ <message>
+ <location line="+39"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -24215,87 +24212,71 @@ Wilt u het pad nu instellen?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>treble</source>
- <translation>viool-</translation>
+ <translation type="obsolete">viool-</translation>
</message>
<message>
- <location line="+1"/>
<source>bass</source>
- <translation>bas-</translation>
+ <translation type="obsolete">bas-</translation>
</message>
<message>
- <location line="+1"/>
<source>crotales</source>
- <translation>crotales-</translation>
+ <translation type="obsolete">crotales-</translation>
</message>
<message>
- <location line="+1"/>
<source>xylophone</source>
- <translation>xylofoon-</translation>
+ <translation type="obsolete">xylofoon-</translation>
</message>
<message>
- <location line="+1"/>
<source>guitar</source>
- <translation>gitaar-</translation>
+ <translation type="obsolete">gitaar-</translation>
</message>
<message>
- <location line="+1"/>
<source>contrabass</source>
- <translation>contrabas-</translation>
+ <translation type="obsolete">contrabas-</translation>
</message>
<message>
- <location line="+1"/>
<source>celesta</source>
- <translation>celesta-</translation>
+ <translation type="obsolete">celesta-</translation>
</message>
<message>
- <location line="+1"/>
<source>old celesta</source>
- <translation>oude celesta-</translation>
+ <translation type="obsolete">oude celesta-</translation>
</message>
<message>
- <location line="+1"/>
<source>french</source>
- <translation>franse</translation>
+ <translation type="obsolete">franse</translation>
</message>
<message>
- <location line="+1"/>
<source>soprano</source>
- <translation>sopraan-</translation>
+ <translation type="obsolete">sopraan-</translation>
</message>
<message>
- <location line="+1"/>
<source>mezzosoprano</source>
- <translation>mezzosopraan-</translation>
+ <translation type="obsolete">mezzosopraan-</translation>
</message>
<message>
- <location line="+1"/>
<source>alto</source>
- <translation>alt-</translation>
+ <translation type="obsolete">alt-</translation>
</message>
<message>
- <location line="+1"/>
<source>tenor</source>
- <translation>tenor-</translation>
+ <translation type="obsolete">tenor-</translation>
</message>
<message>
- <location line="+1"/>
<source>baritone</source>
- <translation>bariton-</translation>
+ <translation type="obsolete">bariton-</translation>
</message>
<message>
- <location line="+1"/>
<source>varbaritone</source>
- <translation>(variatie) bariton-</translation>
+ <translation type="obsolete">(variatie) bariton-</translation>
</message>
<message>
- <location line="+1"/>
<source>subbass</source>
- <translation>subbas-</translation>
+ <translation type="obsolete">subbas-</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+36"/>
<source>Transpose</source>
<translation>Transponeren</translation>
</message>
@@ -24336,7 +24317,7 @@ Wilt u het pad nu instellen?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Audio</translation>
@@ -24968,13 +24949,6 @@ Wilt u het pad nu instellen?</translation>
</message>
</context>
<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">(opgenomen)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/pl.ts b/data/locale/pl.ts
index d05442c..966ebcb 100644
--- a/data/locale/pl.ts
+++ b/data/locale/pl.ts
@@ -4,11 +4,6 @@
<context>
<name>:</name>
<message>
- <source>Dummy-do-not-translate</source>
- <comment>"long" is a C++ data type</comment>
- <translation type="obsolete">Dummy-do-not-translate</translation>
- </message>
- <message>
<location filename="../../src/sound/MidiFile.cpp" line="+109"/>
<source></source>
<comment>this is a keyboard shortcut for an English QWERTY keyboard. If you adjust this to suit your language * DO NOT translate English names for special keys like Ctrl Shift Alt Up Down and so on, because this will break the * translation. You should only translate single keys, like switching the meaning of Z and Y to fit better on a QWERTZ * keyboard. Treat ASCII characters as single keys. ; : < > [ ] - = ( ) and so on, even if they require Shift or some * special combination on your keyboard.</comment>
@@ -337,23 +332,23 @@
<translation>Nie można otworzyć pliku mapowania czcionki %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>Plik</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>Dodaj plik dźwiękowy...</translation>
</message>
@@ -363,54 +358,54 @@
<translation>Eksportuj plik dźwiękowy...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>Zamknij</translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>Edytuj</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>Wyładuj plik dźwiękowy</translation>
</message>
@@ -435,350 +430,346 @@
<translation>PodglÄ…d odtwarzania</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation>F1</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">Samouczek Rosegarden</translation>
- </message>
- <message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>Wskazówki zgłaszania błędów</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>O Rosegarden</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Podstawowy pasek narzędziowy</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>Nic do cofnięcia</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>Nic do ponowienia</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>Kopiuj</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>Wklej</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Przejdź do narzędzia zaznaczania</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Przejdź do wpisywania nut</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Przejdź do narzędzia wymazywania</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>Zapisz</translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation>Wstaw przypadek</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation>Usuń przypadek</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation>Usuń</translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation>Edytuj przypadek</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation>Zaawansowany edytor przypadków</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>Wytnij</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation>Zaznacz wszystko</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>Wyczyść zaznaczone</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>Ustawianie filtra</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation>Ustaw współrzędne początkowe dla segmentu...</translation>
</message>
@@ -788,82 +779,82 @@
<translation>Ustaw czas trwania segmentu...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>Widok</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>Współrzędne muzyczne</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>Współrzędne rzeczywiste</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>Współrzędne surowe</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Segment</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Edytuj w</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Otwórz w edytorze pianolowym</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Otwórz w edytorze nutowym</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>O Qt</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>Dodaj segno</translation>
</message>
@@ -893,7 +884,7 @@
<translation>Półnuta z kropką</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>Przełącz do nut</translation>
</message>
@@ -913,12 +904,12 @@
<translation>Wyłącz kropkę</translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>Pokaż pasek narzędziowy symboli</translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>Pasek narzędziowy czasu trwania</translation>
</message>
@@ -928,12 +919,7 @@
<translation>Pasek narzędziowy symboli</translation>
</message>
<message>
- <source>Enter, Media Play, Ctrl+Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Enter, Odtwarzaj media, Ctrl+Return</translation>
- </message>
- <message>
- <location line="+623"/>
+ <location line="-2120"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
<translation>Insert, Zatrzymaj media</translation>
@@ -975,7 +961,7 @@
<translation>End</translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>Pokaż pasek narzędziowy</translation>
</message>
@@ -985,39 +971,39 @@
<translation>Ukryj pasek stanu</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Pasek narzędziowy akcji</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Pasek narzędziowy czasu</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Pasek transportu</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Pasek narzędziowy powiększania</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1067,7 +1053,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Wstaw znacznik</translation>
</message>
@@ -1082,131 +1068,123 @@
<translation>Edytuj znacznik</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation>F2</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Przejdź do narzędzia przesuwania</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation>F5</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Przejdź do narzędzia rysowania</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation>F3</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Przejdź do narzędzia zmiany rozmiaru</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation>F4</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">Nic do cofnięcia</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Nic do ponowienia</translation>
- </message>
- <message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>Usuń</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Usuń, Ctrl+D</translation>
</message>
<message>
- <location line="-3804"/>
- <location line="+1724"/>
+ <location line="+316"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>Wstaw sekwencjÄ™ odchylenia stroju...</translation>
</message>
<message>
- <location line="-2009"/>
+ <location line="-3205"/>
<source>&Grid</source>
<translation>Siatka</translation>
</message>
@@ -1222,13 +1200,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation>0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation>PrzeciÄ…gnij do 1/48</translation>
</message>
@@ -1239,13 +1217,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation>PrzeciÄ…gnij do 1/24</translation>
</message>
@@ -1256,13 +1234,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation>PrzeciÄ…gnij do 1/12</translation>
</message>
@@ -1273,13 +1251,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation>8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation>PrzeciÄ…gnij do 3/16</translation>
</message>
@@ -1290,13 +1268,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation>PrzeciÄ…gnij do 3/8</translation>
</message>
@@ -1307,37 +1285,37 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation>PrzyciÄ…gaj do akordu</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation>PrzyciÄ…gaj do taktu</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation>Pokaż pasek narzędziowy akcji</translation>
</message>
@@ -1348,35 +1326,35 @@
</message>
<message>
<location line="+7"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>Dodaj wykres kontrolny</translation>
</message>
<message>
- <location line="-1282"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2477"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>Utwór</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Dodaj zmianÄ™ tempa...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>Dodaj zmianÄ™ oznaczenia metrycznego...</translation>
</message>
<message>
- <location line="-4156"/>
+ <location line="-2679"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -1387,120 +1365,120 @@
</message>
<message>
<location line="+183"/>
- <location line="+1550"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1543"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2739"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Otwórz w edytorze listy przypadku</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation>=</translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation>+</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation>-</translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Lewo</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Prawo</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Góra</translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Dół</translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation>Góra</translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation>Dół</translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Góra</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Dół</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Alt+I</translation>
@@ -1513,732 +1491,737 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1724"/>
+ <location line="-2917"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Lewo</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Prawo</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>Kursor do tyłu i zaznacz</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Lewo</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>Kursor do przodu i zaznacz</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Prawo</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+;</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgUp</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgDown</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation>Lewo</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation>Prawo</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Lewo</translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Prawo</translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation>Pause</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation>F7</translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I/do</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>I/do krzyżyk</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II/re bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II/re</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation>S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II/re krzyżyk</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III/mi bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III/mi</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV/fa</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV/fa krzyżyk</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V/sol bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V/sol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V/sol krzyżyk</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI/la bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI/la</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI/la krzyżyk</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII/si bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII/si</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation>L</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+E</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation>R</translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Shift+R</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation>U</translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+I</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+I</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation>O</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation>Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+X</translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation>X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Shift+X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation>V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Shift+V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation>N</translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+M</translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation>M</translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation>H</translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+540"/>
- <location line="+371"/>
+ <location line="-1512"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-1314"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2417"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-578"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1266"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2687"/>
+ <location line="-890"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -2263,7 +2246,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1973"/>
+ <location line="+65"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -2385,7 +2368,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2419"/>
+ <location line="+323"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Shift+X</translation>
@@ -2437,7 +2420,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+12"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -2706,14 +2689,14 @@
<translation>Ctrl+U</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+R</translation>
@@ -2731,8 +2714,8 @@
<translation>Ctrl+)</translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation>~</translation>
@@ -2750,27 +2733,27 @@
<translation>></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>Dopasuj</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>Kwantyzuj</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>Kwantyzuj...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>Przywróć ostatnią kwantyzację</translation>
</message>
@@ -2781,36 +2764,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>Scal legowane nuty o tej same wysokości</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>Popchnij w lewo</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>Popchnij w prawo</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>Zwiększ głośność</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>Zmniejsz głośność</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation>Ustaw na bieżącą głośność</translation>
</message>
@@ -2826,301 +2809,301 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>Czas trwania</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>Podwójny czas trwania</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>Skurcz lub zagęść...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>Transponuj</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>O półton w górę</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>O półton w dół</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>O oktawę w górę</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>O oktawę w dół</translation>
</message>
<message>
- <location line="-1683"/>
- <location line="+1158"/>
+ <location line="-2879"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Transponuj przez interwał...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>Przekształć</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>Odwróć</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>Wsteczny</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>Odwróć wsteczny</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>Wyzwól segment...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>Narzędzia</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>Zaznacz i edytuj</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>Rysuj</translation>
</message>
<message>
- <location line="-3692"/>
+ <location line="-1831"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>Przesuń</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>Zmień rozmiar</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>Podziel</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>Głośność</translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation>Kursor do tyłu i zaznacz</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>Kursor do przodu i zaznacz</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>Ustaw pętlę na zaznaczeniu</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>Wyłącz pętlę</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>Transport</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>Odtwarzaj</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>Zatrzymaj</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>Przewiń</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Szybko do przodu</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Przewiń na początek</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Szybko przewiń do końca</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>Solo</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>Podążaj za kursorem odtwarzania</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>Panika</translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>Górna oktawa</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>Tryb wpisywania akordów</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>Nagrywanie krok po kroku</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>Paski narzędziowe</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>Wykresy</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>Pokaż wykres nazw akordów</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>Pokaż wykres zmian tempa</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Narzędzia pasków narzędziowych</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>Nagraj</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>Ustawienia</translation>
</message>
@@ -3205,7 +3188,7 @@
<translation>Pokaż nieprzyporządkowane fadery</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Przełącz na narzędzie wpisywania</translation>
</message>
@@ -3215,23 +3198,23 @@
<translation>Scal pauzy po wymazaniu</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>Drukuj...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>PodglÄ…d wydruku...</translation>
</message>
<message>
- <location line="-1153"/>
+ <location line="-2348"/>
<source>Show T&ransport Toolbar</source>
<translation>Pokaż pasek transportu</translation>
</message>
<message>
- <location line="-609"/>
+ <location line="+1414"/>
<source>Insert into Selected Audio Track</source>
<translation>Wstaw do zaznaczonej ścieżki dźwiękowej</translation>
</message>
@@ -3246,25 +3229,25 @@
<translation>Pomoc</translation>
</message>
<message>
- <location line="+1492"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-531"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>Podręcznik Rosegarden</translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>Właściwości...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="-826"/>
<source>Cursor Back and Se&lect</source>
<translation>Kursor do tyłu i zaznacz</translation>
</message>
<message>
- <location line="+1004"/>
+ <location line="+2199"/>
<source>C&ut and Close</source>
<translation>Wytnij i zamknij</translation>
</message>
@@ -3309,13 +3292,13 @@
<translation>Wyczyść zaznaczenie</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+1996"/>
+ <location line="-718"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>Właściwości...</translation>
</message>
<message>
- <location line="-1994"/>
+ <location line="+2"/>
<source>Note &Font</source>
<translation>Czcionka nutowa</translation>
</message>
@@ -3360,31 +3343,31 @@
<translation>Pokaż wykres surowych nut</translation>
</message>
<message>
- <location line="-1270"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2465"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Otwórz w edytorze perkusyjnym</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>Dodaj zmianÄ™ klucza...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Dodaj zmianÄ™ oznaczenia tonacji...</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-29"/>
<source>Show La&yer Toolbar</source>
<translation>Pokaż pasek narzędziowy warstwy</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+30"/>
<source>Add Pedal &Press</source>
<translation>Dodaj oznaczenie pedału</translation>
</message>
@@ -3670,8 +3653,8 @@
<translation>Przywróć laseczki</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>Wrażenie</translation>
</message>
@@ -3731,14 +3714,14 @@
<translation>Åuk poniżej</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>Ligatura</translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>Bez ligatury</translation>
</message>
@@ -3991,13 +3974,13 @@
<translation>Precyzyjne przesuwanie w czasie</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>Popchnij w prawo</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>Widoczne</translation>
</message>
@@ -4012,8 +3995,8 @@
<translation>Zrób widoczne</translation>
</message>
<message>
- <location line="-1627"/>
- <location line="+1754"/>
+ <location line="-2823"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>Krok do tyłu (lewo)</translation>
</message>
@@ -4023,21 +4006,21 @@
<translation>Odtwarzaj</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>Krok do przodu (prawo)</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+1472"/>
+ <location line="-1713"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+N</translation>
</message>
<message>
- <location line="-3015"/>
- <location line="+1554"/>
+ <location line="-2739"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+=</translation>
@@ -4101,21 +4084,21 @@
<translation>.</translation>
</message>
<message>
- <location line="+471"/>
- <location line="+516"/>
+ <location line="-1756"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation>P</translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location line="-2072"/>
+ <location line="-882"/>
<source>Insert &Expression Controller Sequence...</source>
<translation type="unfinished"></translation>
</message>
@@ -4315,26 +4298,26 @@
<translation>Następna pięciolinia w dół</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>Poprzedni segment</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>Następny segment</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>Krok do tyłu</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>Krok do przodu</translation>
</message>
@@ -4474,14 +4457,14 @@
<translation>Edytor akordów gitarowych</translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>Wpisz nutÄ™</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>Niższa oktawa</translation>
</message>
@@ -4501,13 +4484,13 @@
<translation>Tryb wpisywania przednutki</translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>Pokaż narzędzia paska narzędziowego</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>Pokaż pasek narzędziowy znaków chromatycznych</translation>
</message>
@@ -4527,23 +4510,23 @@
<translation>Pokaż pasek narzędziowy grupy</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>Pokaż pasek transportu</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>Pokaż pasek narzędziowy widoku</translation>
</message>
<message>
- <location line="+1989"/>
+ <location line="-753"/>
<source>Show Cho&rd Name Ruler</source>
<translation>Pokaż wykres nazw akordów</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+767"/>
<source>Show &Annotations</source>
<translation>Pokaż adnotacje</translation>
</message>
@@ -4553,7 +4536,7 @@
<translation>Pokaż dyrektywy Lilypond</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>Pasek narzędziowy kluczy</translation>
</message>
@@ -4573,7 +4556,7 @@
<translation>Pasek narzędziowy znaczników</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation>Zaznacz wszystkie przypadki</translation>
</message>
@@ -4589,34 +4572,34 @@
</message>
<message>
<location line="-190"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>Pokaż wykres zmian głośności</translation>
</message>
<message>
- <location line="-1920"/>
+ <location line="-1092"/>
<source>&Action</source>
<translation>Akcja</translation>
</message>
<message>
- <location line="+619"/>
- <location line="+1302"/>
+ <location line="-1404"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Pokaż wykres odchylenia stroju</translation>
</message>
<message>
- <location line="-406"/>
- <location line="+2123"/>
+ <location line="-1601"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Pasek narzędziowy wykresów</translation>
</message>
<message>
- <location line="-1726"/>
+ <location line="-1727"/>
<source>Show &Rulers Toolbar</source>
<translation>Pokaż pasek narzędziowy wykresów</translation>
</message>
<message>
- <location line="+1509"/>
+ <location line="+1510"/>
<source>Tuplet Insert Mo&de</source>
<translation>Tryb wpisywania grupy niemiarowej</translation>
</message>
@@ -4637,7 +4620,7 @@
<translation>Pasek narzędziowy warstwy</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Przełącz na narzędzie wpisywania</translation>
</message>
@@ -4687,7 +4670,7 @@
<translation>Zrób widoczne</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Autobelkowanie gdzie pasuje</translation>
</message>
@@ -4727,7 +4710,7 @@
<translation>Podwójny bemol</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>Nowy</translation>
</message>
@@ -4737,14 +4720,6 @@
<translation>Importuj</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Importuj plik projektu Rosegarden...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Importuj plik &MIDI...</translation>
- </message>
- <message>
<location line="+6"/>
<source>&Merge</source>
<translation>Scal</translation>
@@ -4755,10 +4730,6 @@
<translation>Scal plik...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Scal plik MIDI...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Scal plik Hydrogen...</translation>
@@ -4769,26 +4740,6 @@
<translation>Eksportuj</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Eksportuj plik projektu Rosegarden...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Eksportuj plik MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Eksportuj plik partytury Csound...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Eksportuj plik Mup...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Eksportuj plik MusicXML...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>Otwórz...</translation>
@@ -4799,10 +4750,6 @@
<translation>Otwórz ostatnie</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Zapisz jako...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>Zapisz jako szablon...</translation>
@@ -4943,48 +4890,44 @@
<translation>Przełącz repetycję</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Otwórz w domyślnym edytorze</translation>
- </message>
- <message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>Przemianuj...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>Przywróć ostatnią kwantyzację</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>Skurcz lub zagęść...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>Ustaw współrzędne początkowe...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>Ustaw czas trwania...</translation>
</message>
<message>
- <location line="+19"/>
- <location line="+382"/>
+ <location line="-1219"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Połącz</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>Podziel</translation>
</message>
@@ -5084,26 +5027,26 @@
<translation>Zmień przyporządkowanie instrumentów...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>Zmień rozmiar</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation>Wcinaj siÄ™ z nagraniem</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>Pokaż główny pasek narzędziowy</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>Pokaż pasek narzędziowy ścieżek</translation>
</message>
@@ -5118,27 +5061,19 @@
<translation>Pokaż pasek narzędziowy powiększania</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>Pokaż pasek stanu</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>Pokaż oś czasu odtwarzania</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Importuj plik Rosegarden X11...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Scal plik Rosegarden X11...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>Mikser MIDI</translation>
@@ -5149,10 +5084,6 @@
<translation>Pokaż wykres zmian tempa</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Eksportuj do pliku LilyPond...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>Pokaż transport</translation>
@@ -5188,31 +5119,31 @@
<translation>Pasek narzędziowy edytorów</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Przewiń na początek</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Szybko przewiń do końca</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>Wsparcie Rosegarden</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="-1867"/>
<source>&Rosegarden Tutorials</source>
<translation>Samouczki Rosegarden</translation>
</message>
<message>
- <location line="+225"/>
+ <location line="+76"/>
<source>Insert Tempo Change</source>
<translation>Wstaw zmianÄ™ tempa</translation>
</message>
@@ -5252,7 +5183,7 @@
<translation>Otwórz edytor tempa i oznaczenia metrycznego</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>Edytuj wpis</translation>
</message>
@@ -5272,36 +5203,36 @@
<translation>Właściwości</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>Wklej jako nowy wyzwolony segment</translation>
</message>
<message>
- <location line="-4383"/>
+ <location line="+1943"/>
<source>Delete Marker</source>
<translation>Usuń znacznik</translation>
</message>
<message>
- <location line="+469"/>
- <location line="+1693"/>
+ <location line="-4082"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>Transponuj o półtony...</translation>
</message>
<message>
- <location line="-1499"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-2695"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>Wymaż</translation>
</message>
<message>
- <location line="-2594"/>
+ <location line="-851"/>
<source>Show &Track Headers</source>
<translation>Pokaż nagłówki ścieżki</translation>
</message>
<message>
- <location line="+217"/>
+ <location line="+218"/>
<source>&Triplet</source>
<translation>Triola</translation>
</message>
@@ -5316,12 +5247,12 @@
<translation>Klucz wiolinowy</translation>
</message>
<message>
- <location line="+881"/>
+ <location line="-3570"/>
<source>Respell as Flat</source>
<translation>Zamień na dźwięk enharmoniczny równoważny z bemolem</translation>
</message>
<message>
- <location line="+37"/>
+ <location line="+1745"/>
<source>Import &Hydrogen file...</source>
<translation>Importuj plik Hydrogen...</translation>
</message>
@@ -5339,13 +5270,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Ins</translation>
@@ -5357,21 +5288,21 @@
<translation>T</translation>
</message>
<message>
- <location line="-2029"/>
- <location line="+2059"/>
+ <location line="+30"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="-1489"/>
<source>Im&port Studio from File...</source>
<translation>Importuj studio z pliku...</translation>
</message>
@@ -5382,21 +5313,21 @@
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>Return</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="-353"/>
+ <location line="+29"/>
<source>Ctrl+Shift+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+T</translation>
@@ -5423,19 +5354,19 @@
<translation>Edytuj znaczniki...</translation>
</message>
<message>
- <location line="-1986"/>
- <location line="+2111"/>
+ <location line="+125"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>Konwertuj notacjÄ™ do...</translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-747"/>
<source>&Set Quick Marker at Playback Position</source>
<translation>Ustaw szybki znacznik na pozycji odtwarzania</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>Skocz do szybkiego znacznika</translation>
</message>
@@ -6741,7 +6672,7 @@
<translation>Chiński talerz</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-1877"/>
+ <location filename="../QMenuStrings.cpp" line="-634"/>
<location filename="../InstrumentStrings.cpp" line="+1"/>
<source>Triangle</source>
<translation>Trójkąt</translation>
@@ -8425,16 +8356,16 @@
<translation><żaden></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>Wtyczka syntezatora</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>Dźwięk</translation>
@@ -10575,20 +10506,15 @@
<translation>Nieznany</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10603,10 +10529,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 Kontroler %2 %3</translation>
</message>
@@ -10621,7 +10547,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Witaj!</translation>
</message>
@@ -10729,45 +10655,57 @@
<translation><qt><p>Brak uzbrojonych ścieżek do nagrywania.</p><p>Uzbrój przynajmniej jedną diodę <img src=":pixmaps/tooltip/record-leds.png">i spróbuj ponownie</p></qt></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>Nie można uruchomić nagrywania dźwięku.</p><p>Ustaw poprawną ścieżkę do nagrywania w <b>Utwór -> Edytuj właściwości dokumentu... -> Dźwięk</b></p></qt></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+1"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="-29"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>Nieprawidłowa długość dla długich danych w strumieniu MIDI</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>Nieprawidłowa długość dla int danych w strumieniu MIDI</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>Koniec pliku MIDI napotkał podczas czytania</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation>Próbuj uzyskać więcej bajtów niż oczekiwano w ścieżce</translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation>Próbuj odczytać za końcem pliku MIDI</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>Znaleziono nieprawidłowy kod przypadku</translation>
+ <translation type="obsolete">Znaleziono nieprawidłowy kod przypadku</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation>Bieżący stan używa dla pierwszego przypadku w ścieżce</translation>
</message>
@@ -10863,10 +10801,6 @@
<translation>Wtyczka syntezatora</translation>
</message>
<message>
- <source>Dummy-do-not-translate</source>
- <translation type="obsolete">Dummy-do-not-translate</translation>
- </message>
- <message>
<location filename="../../src/sound/PeakFileManager.h" line="+61"/>
<location line="+2"/>
<source>Bad peak file </source>
@@ -10885,7 +10819,7 @@
<translation>Zły plik dźwiękowy</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation>Ten przypadek jest powiÄ…zany z innym przypadkiem.</translation>
</message>
@@ -10930,39 +10864,91 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/base/figuration/SegmentID.cpp" line="+69"/>
- <source>Chord Source Segment</source>
- <translation type="unfinished"></translation>
+ <location filename="../../src/base/figuration/SegmentID.cpp" line="+69"/>
+ <source>Chord Source Segment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Figuration Source Segment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Generated Segment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Segment of unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/base/parameterpattern/RelativeRamp.cpp" line="+30"/>
+ <source>Relative Ramp - modify existing %1 values linearly</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Increase first value this much: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Increase last value this much: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">LilyPond nie pozwala na odstępy lub ukośniki w nazwach plików.
+
+Czy chciałbyś użyć
+
+%1
+
+zamiast tego?</translation>
</message>
<message>
- <location line="+2"/>
- <source>Figuration Source Segment</source>
- <translation type="unfinished"></translation>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Eksport się nie powiódł. Plik nie mógł zostać otwarty do zapisu.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Generated Segment</source>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Segment of unknown type</source>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/base/parameterpattern/RelativeRamp.cpp" line="+30"/>
- <source>Relative Ramp - modify existing %1 values linearly</source>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <source>Increase first value this much: </source>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Increase last value this much: </source>
- <translation type="unfinished"></translation>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">ostrzeżenie: skrócono za długi takt</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">ostrzeżenie: za krótki takt, wypełnianie pauzami</translation>
</message>
</context>
<context>
@@ -10979,13 +10965,9 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Prawa autorskie 2000-2010 zespół programistów Rosegarden.</p><p>Wersja: %1 Wersja Qt: %2<br>Wydanie: %3.</p><p>Rosegarden został stworzony dla Ciebie przez zespół wolontariuszy z całego świata. Aby zobaczyć listę autorów, odwiedź <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Aby uzyskać więcej informacji o Rosegarden, odwiedź <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licencja: GNU GPL w wersji 2.</p><p>Polskie tłumaczenie: Grzegorz Pruchniakowski (gootector at o2.pl).</p></translation>
- </message>
</context>
<context>
<name>Rosegarden::ActionCommandArgumentQuerier</name>
@@ -11045,12 +11027,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>Nie można dodać identyczne nakładających się wskazań</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>Dodaj Å‚uk</translation>
</message>
@@ -11558,24 +11540,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Kliknij, aby zmienić nazwę tego instrumentu</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>Kliknij przycisk powyżej, aby zmienić nazwę tego instrumentu</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><brak syntezatora></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><brak wtyczki></translation>
</message>
@@ -11628,10 +11610,6 @@
<translation>Plik</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><brak plików dźwiękowych></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Zapisz plik jako</translation>
@@ -11794,7 +11772,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Mikser dźwięku</translation>
</message>
@@ -11810,20 +11788,20 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Panorama</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>Poziom dźwięku</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Mono lub stereo</translation>
</message>
@@ -11834,21 +11812,21 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><brak></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>Kliknij, aby wczytać wtyczkę dźwiękową</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>Kliknij, aby zmienić nazwę tego instrumentu</translation>
</message>
@@ -11868,7 +11846,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<translation>Kliknij przycisk powyżej, aby zmienić nazwę tego instrumentu</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Szyna %1</translation>
</message>
@@ -11884,14 +11862,14 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<translation>Suma</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><brak wtyczki></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</translation>
</message>
@@ -12470,7 +12448,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<translation>Naprawdę usunąć ten bank?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>Naprawdę usunąć to mapowanie klawisza?</translation>
</message>
@@ -12654,6 +12632,120 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"> </translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -12977,7 +13069,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13202,7 +13294,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Głośność</translation>
</message>
@@ -13218,7 +13310,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Niewspierany rodzaj przypadku</translation>
</message>
@@ -13233,12 +13325,13 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<translation>Kontroler przypadków</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>Wstaw linię kontrolerów</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>Numer kontrolera przypadku</translation>
</message>
@@ -13246,7 +13339,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>Kopiuj</translation>
</message>
@@ -13256,7 +13349,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<translation>(wyciÄ…g)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(skopiowane)</translation>
</message>
@@ -13326,7 +13419,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>Wytnij</translation>
</message>
@@ -13366,10 +13459,6 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Komenda połączenia na nowo</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>Usuń zakres</translation>
@@ -13406,7 +13495,7 @@ Zaznacz te, które mają być na zawsze usunięte z dysku twardego.
<translation>http://rosegardenmusic.com/wiki/doc:device-manager-en</translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation>[ Brak portu ]</translation>
</message>
@@ -14027,46 +14116,10 @@ To może spowodować problemy, jeśli nadpisze się inne, później wyliczone wa
<translation>Wzór</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Obniż - ustaw do wartości %1</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Zmienny - ustaw %1 dla maks. i min. wartości przypadków</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo - ustaw %1 zgłaśnianie od min. do maks.</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo - ustaw %1 wyciszanie od maks. do min.</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Åšladowy - ustaw zmiennÄ… %1 od maks. do min. z obiema dochodzÄ…cymi do zera</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>Wartość</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Pierwsza wartość</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Druga wartość</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Niska wartość</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Wysoka wartość</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14461,22 +14514,6 @@ Czy chciałbyś spróbować sam go zlokalizować, czy go pominąć?</translation
<translation>Pobieranie %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Nie udało się połączyć z serwerem FTP</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Logowanie nie powiodło się</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Nie udało się zmienić do odpowiedniego katalogu</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">Pobieranie z serwera FTP przerwane</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Pobieranie anulowane</translation>
@@ -14792,10 +14829,6 @@ Czy chciałbyś spróbować sam go zlokalizować, czy go pominąć?</translation
<translation>Adobe Acrobat Reader (płatny)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation>Wykorzystywane do podglądu generowanego wyjścia LilyPond</translation>
@@ -14806,10 +14839,6 @@ Czy chciałbyś spróbować sam go zlokalizować, czy go pominąć?</translation
<translation>Narzędzie wiersza polecenia drukowania pliku</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">KPrinter (KDE 3)</translation>
- </message>
- <message>
<location line="+5"/>
<source>Gtk-LP (GNOME)</source>
<translation>Gtk-LP (GNOME)</translation>
@@ -15403,7 +15432,7 @@ Przykładowy tekst z pliku:</translation>
<translation>Parametry instrumentu</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Ścieżka</translation>
</message>
@@ -15411,7 +15440,7 @@ Przykładowy tekst z pliku:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -15808,7 +15837,6 @@ Przykładowy tekst z pliku:</translation>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15816,7 +15844,7 @@ Would you like to use
%1
instead?</source>
- <translation>LilyPond nie pozwala na odstępy lub ukośniki w nazwach plików.
+ <translation type="obsolete">LilyPond nie pozwala na odstępy lub ukośniki w nazwach plików.
Czy chciałbyś użyć
@@ -15825,39 +15853,16 @@ Czy chciałbyś użyć
zamiast tego?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Eksport się nie powiódł. Plik nie mógł zostać otwarty do zapisu.</translation>
</message>
<message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>ostrzeżenie: skrócono za długi takt</translation>
+ <translation type="obsolete">ostrzeżenie: skrócono za długi takt</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>ostrzeżenie: za krótki takt, wypełnianie pauzami</translation>
+ <translation type="obsolete">ostrzeżenie: za krótki takt, wypełnianie pauzami</translation>
</message>
</context>
<context>
@@ -15888,10 +15893,6 @@ zamiast tego?</translation>
<translation><qt>Wybierz, które ścieżki lub segmenty eksportować</qt></translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Zaznaczone ścieżki</translation>
- </message>
- <message>
<location line="+16"/>
<source>Compatibility level</source>
<translation>Poziom kompatybilności</translation>
@@ -16567,7 +16568,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation><qt>Ustaw wariacje na temat programu powyżej, jeśli są dostępne w studio</qt></translation>
</message>
@@ -16652,12 +16653,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>Otrzymuj zewnętrzny</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Brak połączenia</translation>
</message>
@@ -16881,6 +16877,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17086,12 +17091,12 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Przytrzymaj klawisz Shift, aby przyciągnąć do siatki</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Skopiuj i przesuń przypadek</translation>
</message>
@@ -17250,7 +17255,7 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<translation>Zmień głośności</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>Kliknij i przeciągnij, aby ustawić głośność zaznaczonych nut</translation>
</message>
@@ -17327,7 +17332,7 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<translation>Wył.</translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:matrix-en</translation>
</message>
@@ -17343,8 +17348,7 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -17359,7 +17363,7 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<translation>Szacowane oznaczenie tonacji widoczne</translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation>Szacowane oznaczenie metryczne widoczne</translation>
</message>
@@ -17374,10 +17378,6 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<translation>Wpisz, o ile półtonów transponować:</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Ustaw przypadek głośności</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation>Wyzwalaj segment</translation>
@@ -17388,20 +17388,15 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<translation>Usuń wyzwalacze</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>Edytor pianolowy</translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Nie można wpisać nuty: Nie wybrano siatki</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Powiększenie</translation>
</message>
@@ -17421,7 +17416,7 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<translation>Normalne powiększenie</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Obróć rolkę, aby zmienić aktywny segment</qt></translation>
</message>
@@ -17544,7 +17539,7 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>Mikser MIDI</translation>
</message>
@@ -17559,7 +17554,7 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<translation>Instrument</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</translation>
</message>
@@ -17856,13 +17851,13 @@ Kliknij podwójnie myszką, aby otworzyć edytor znaczników.</translation>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Notacja</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Domyślny tryb widoku</translation>
</message>
@@ -18443,7 +18438,7 @@ Jest to błąd (program would previously have crashed by now)</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+344"/>
+ <location line="+346"/>
<source> Font: </source>
<translation>Czcionka:</translation>
</message>
@@ -18463,7 +18458,7 @@ Jest to błąd (program would previously have crashed by now)</translation>
<translation>Odstępy:</translation>
</message>
<message>
- <location line="+2538"/>
+ <location line="+2563"/>
<source>Chord</source>
<translation>Akord</translation>
</message>
@@ -18473,7 +18468,7 @@ Jest to błąd (program would previously have crashed by now)</translation>
<translation>Przednutka</translation>
</message>
<message>
- <location line="-2238"/>
+ <location line="-2263"/>
<source>Unknown spacing action %1</source>
<translation>Nieznana akcja odległości %1</translation>
</message>
@@ -18498,16 +18493,12 @@ Jest to błąd (program would previously have crashed by now)</translation>
<translation>Opcje podglÄ…du LilyPond</translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Eksport nie powiódł się. Plik nie mógł zostać otworzony do zapisu.</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Schowek jest pusty</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>Nie można wkleić kilku segmentów do jednego</translation>
</message>
@@ -18519,16 +18510,15 @@ Jest to błąd (program would previously have crashed by now)</translation>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>Drukowanie z LilyPond...</translation>
</message>
@@ -18543,24 +18533,24 @@ Jest to błąd (program would previously have crashed by now)</translation>
<translation><qt><p>Nie udało się otworzyć pliku tymczasowego dla eksportu do LilyPond.</p><p>Prawdopodobnie oznacza to, że nie zabraknie miejsca na dysku <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation><qt><p>Ograniczone wklejane wymaga wystarczająco dużo pustej przestrzeni (zawierającej tylko pauzy) w pozycji wklejenia do przechowywania wszystkich przypadków, które mają być wklejone.</p>Stwierdzono mało miejsca.</p><p>Jeśli chcesz wkleić, musisz rozważyć użycie jednego z innych rodzajów wklejania z opcji <b>Wklej... </ b> w menu Edytuj. Możesz również zmienić domyślne wklejanie na inne niż ograniczone, jeśli chcesz.</p></qt></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>Wstawianie zawartości schowka...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>Nie można było wkleić w tym punkcie.</translation>
</message>
<message numerus="yes">
- <location line="-580"/>
+ <location line="-584"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> %n zaznaczony</numerusform>
@@ -18574,7 +18564,7 @@ Jest to błąd (program would previously have crashed by now)</translation>
<translation>Brak zaznaczenia</translation>
</message>
<message>
- <location line="+718"/>
+ <location line="+724"/>
<source>Raising velocities...</source>
<translation>Zwiększanie głośności...</translation>
</message>
@@ -18584,14 +18574,6 @@ Jest to błąd (program would previously have crashed by now)</translation>
<translation>Zmniejszanie głośności...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Ustaw przypadek głośności</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Ustawienia głośności...</translation>
- </message>
- <message>
<location line="+744"/>
<source>Unknown note insert action %1</source>
<translation>Nieznana akcja wpisywania nut %1</translation>
@@ -18612,10 +18594,6 @@ Jest to błąd (program would previously have crashed by now)</translation>
<translation>Ozdobnik takt %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Zrób ozdobnik</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>Użyj ozdobnika</translation>
@@ -18651,7 +18629,7 @@ Jest to błąd (program would previously have crashed by now)</translation>
<translation>Pedał</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>Brak zdefiniowanego komunikatu pedału dla tego urządzenia.
@@ -18663,7 +18641,7 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
<translation>Szacowane oznaczenie metryczne widoczne</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - Segment Ścieżka #%3 - Notacja</translation>
</message>
@@ -18704,7 +18682,7 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
<translation>Wpisz, o ile półtonów transponować:</translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>Czas: %1 (%2.%3s)</translation>
</message>
@@ -18779,16 +18757,11 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
<source>Cycling slashes...</source>
<translation>Cycling ukośników...</translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>Nie można wstawić nuty: Nie wybrano wartości rytmicznej</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Powiększenie</translation>
</message>
@@ -18813,7 +18786,7 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
<translation>Zamknij nagłówki ścieżki</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Obróć rolkę, aby zmienić aktywny segment</qt></translation>
@@ -19035,10 +19008,6 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">Sekwencja odchylenia stroju</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>Preset</translation>
@@ -19049,10 +19018,6 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
<translation>Preset:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">Użytkownik</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -19280,14 +19245,6 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
<translation type="unfinished"></translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Wartość (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Czas trwania (%):</translation>
- </message>
- <message>
<location line="-851"/>
<source>Ramp duration (%):</source>
<translation>Czas trwania nachylenia (%):</translation>
@@ -19308,31 +19265,11 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
<translation>Wartość końcowa (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">PoczÄ…tkowa amplituda vibrato (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">Końcowa amplituda vibrato (%):</translation>
- </message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation>Sekwencja odchylenia</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Długość fali Vibrato:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">Rozdzielczość:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Nieprawidłowy czas zakończenia. Czy zaznaczyłeś przypadki?</translation>
@@ -19859,13 +19796,6 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1 kontroler</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -19953,12 +19883,12 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Brak</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>2-w-czasie-3</translation>
</message>
@@ -20023,7 +19953,7 @@ Sprawdź, czy urządzenie jest poprawnie skonfigurowane w oknie Zarządzania urz
<translation>Podziel i połącz ligaturą nachodzące na siebie akordy</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Pełna kwantyzacja</translation>
</message>
@@ -20363,8 +20293,8 @@ Może wystąpić pewien brak kompatybilności z tym formatem pliku.</translation
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20376,7 +20306,7 @@ Może wystąpić pewien brak kompatybilności z tym formatem pliku.</translation
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>Nie można zapisać dokumentu na %1</translation>
</message>
@@ -20460,7 +20390,12 @@ Wybierz te, które chcesz na zawsze usunąć z dysku twardego.
<translation>Scal</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>Nie można utworzyć pliku tymczasowego w katalogu '%1': %2</translation>
</message>
@@ -20475,7 +20410,7 @@ Wybierz te, które chcesz na zawsze usunąć z dysku twardego.
<translation>Nie udało się zmienić nazwy tymczasowego pliku wyjściowego '%1' do żądanego pliku wyjściowego '%2'</translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished">Ostrzeżenie</translation>
</message>
@@ -20489,11 +20424,7 @@ Ustaw ścieżkę dźwięku do obowiązującego katalogu we Właściwościach dok
Czy chciałbyś ją teraz ustawić?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Zapisywanie pliku...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation>BÅ‚Ä…d zapisywania na '%1'</translation>
</message>
@@ -20554,10 +20485,6 @@ Wsparcie dla tych elementów może w przyszłości zostać wycofane z Rosegarden
Zalecamy zapisać ten plik w tej wersji programu, aby zapewnić, że będzie go można otworzyć w przyszłości.</translation>
</message>
<message>
- <source><qt><h2>Channels were remapped</h2><p>Beginning with version 10.02, Rosegarden no longer provides controls for changing the channel associated with each MIDI instrument. Instead, each instrument uses the same channel as its instrument number. For example, "MIDI Input System Device #12" always uses channel 12.</p><p>The file you just loaded contained instruments whose channels differed from the instrument numbers. These channels have been reassigned so that instrument #1 will always use channel 1, regardless of what channel it might have used previously. In most cases, you will experience no difference, but you may have to make some small changes to this file in order for it to play as intended. We recommend that you save this file in order to avoid seeing this warning in the future.</p><p>We apologize for any inconvenience.</p></qt></source>
- <translation type="obsolete"><qt><h2>Kanały zostały remapowane</h2><p>Począwszy od wersji 10.02, Rosegarden już nie zapewnia kontroli dla zmian kanału związanych z każdym instrumentem MIDI. Zamiast tego, każdy instrument wykorzystuje ten sam kanał, co numer instrumentu. Na przykład, "Urządzenie systemu wejścia MIDI #12" zawsze używa kanału 12.</p><p>Plik, który właśnie załadowałeś, zawiera instrumenty, których kanały różniły od numerów instrumentów. Kanały te zostały przypisane tak, że instrument #1 będzie zawsze używać kanału 1, bez względu na to, co to mogło używać tego kanału wcześniej. W większości przypadków nie będzie to miało znaczenia, ale być może trzeba będzie dokonać pewnych drobnych w tym pliku, w celu użycia go do odtwarzania zgodnie z przeznaczeniem. Zaleca się, aby zapisać ten plik w celu uniknięcia tego ostrzeżenia w przyszłości.</p><p>Przepraszamy za wszelkie niedogodności.</p></qt></translation>
- </message>
- <message>
<location line="+650"/>
<source>Insert Recorded MIDI</source>
<translation>Wstaw nagrane MIDI</translation>
@@ -20577,7 +20504,7 @@ Zalecamy zapisać ten plik w tej wersji programu, aby zapewnić, że będzie go
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>Zaznaczenie musi zawierać tylko segmenty dźwięku lub MIDI</translation>
</message>
@@ -20588,7 +20515,7 @@ Zalecamy zapisać ten plik w tej wersji programu, aby zapewnić, że będzie go
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20597,7 +20524,7 @@ Zalecamy zapisać ten plik w tej wersji programu, aby zapewnić, że będzie go
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20618,7 +20545,7 @@ See Edit -> Preferences -> Audio.</source>
Zobacz Edytuj -> Właściwości -> Dźwięk.</translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -20687,14 +20614,14 @@ Zobacz Edytuj -> Właściwości -> Dźwięk.</translation>
<translation>Rozpoczynanie...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation>Powiększenie:</translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -20723,12 +20650,12 @@ Chcesz go otworzyć zamiast tego?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Nienazwany</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20768,12 +20695,12 @@ BÅ‚Ä…d: %2</translation>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Wszystkie obsługiwane pliki</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20793,33 +20720,33 @@ BÅ‚Ä…d: %2</translation>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Wszystkie pliki</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Otwórz plik</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -20829,16 +20756,16 @@ BÅ‚Ä…d: %2</translation>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>Nie można otworzyć pliku %1</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>Zapisywanie pliku...</translation>
</message>
@@ -20935,12 +20862,12 @@ BÅ‚Ä…d: %2</translation>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Ostrzeżenie</translation>
</message>
<message>
- <location line="-2767"/>
+ <location line="-2756"/>
<source>Jog Selection</source>
<translation>Popychanie zaznaczenia</translation>
</message>
@@ -21027,12 +20954,12 @@ No segment will be split.</source>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Ustaw główne tempo</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>Przełącz paski narzędziowe...</translation>
</message>
@@ -21100,7 +21027,7 @@ Segmenty->Scal segmenty.
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Pliki projektów Rosegarden</translation>
</message>
@@ -21122,7 +21049,7 @@ Segmenty->Scal segmenty.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1999"/>
+ <location line="+1994"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation><qt><p>Musisz wybrać nazwę pliku dla tego utworu przed nagrywaniem dźwięku.</p><p>Pliki dźwiękowe zostaną zapisane w <b>%1</b> jako <b>rg-[<i>nazwa pliku</i>]-[<i>instrument</i>]-<i>data</i>_<i>czas</i>-<i>n</i>.wav</b>. Możesz też zmienić nazwę instrumentów dźwiękowych przed rozpoczęciem nagrywania. Aby uzyskać więcej informacji, zobacz <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></translation>
</message>
@@ -21132,7 +21059,7 @@ Segmenty->Scal segmenty.
<translation>Wejście</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-en</translation>
</message>
@@ -21142,7 +21069,7 @@ Segmenty->Scal segmenty.
<translation>http://rosegardenmusic.com/tutorials/</translation>
</message>
<message>
- <location line="+615"/>
+ <location line="+595"/>
<source><h3>Invalid audio path</h3></source>
<translation><h3>Nieprawidłowa ścieżka dźwięku</h3></translation>
</message>
@@ -21172,8 +21099,8 @@ Segmenty->Scal segmenty.
<translation><qt><p>Ścieżka dźwięku "%1" istnieje, ale nie jest zapisywalna.</p>%2</qt></translation>
</message>
<message>
- <location line="-7445"/>
- <location line="+312"/>
+ <location line="-7414"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21197,8 +21124,8 @@ Segmenty->Scal segmenty.
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21208,7 +21135,7 @@ Segmenty->Scal segmenty.
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21226,8 +21153,8 @@ Segmenty->Scal segmenty.
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21246,7 +21173,7 @@ Segmenty->Scal segmenty.
<translation><p>Używasz wersji %1. Wersja %2 jest już dostępna.</p><p>Odwiedź <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">stronę internetową Rosegarden</a>, aby uzyskać więcej informacji.</p></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>Otwórz plik MIDI</translation>
</message>
@@ -21256,12 +21183,12 @@ Segmenty->Scal segmenty.
<translation>Scal plik MIDI</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>Importowanie pliku MIDI...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>Kalkulowanie notacji...</translation>
</message>
@@ -21293,36 +21220,24 @@ Segmenty->Scal segmenty.
<translation>Nie można otworzyć pliku Rosegarden X11. Plik wydaje się być uszkodzony.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Otwórz plik Hydrogen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Importowanie pliku Hydrogen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Nie można otworzyć pliku Hydrogen. Plik wydaje się być uszkodzony.</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>Nie udało się otworzyć pliku tymczasowego dla eksportu do LilyPond.</p><p>Prawdopodobnie oznacza to, że zabraknie miejsca na dysku <pre>%1</pre></p></qt></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>Rosegarden niespodziewanie zakończył pracę. Dźwięk i nagrywanie będą niedostępne dla tej sesji.
Uruchom ponownie Rosegarden, aby przywrócić funkcje dźwiękowe.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>Uruchamianie sekwencera...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>Zapisywanie pliku%1z nowÄ… nazwÄ… pliku...</translation>
@@ -21333,7 +21248,7 @@ Uruchom ponownie Rosegarden, aby przywrócić funkcje dźwiękowe.</translation>
<translation>jako szablon</translation>
</message>
<message>
- <location line="+2916"/>
+ <location line="+2910"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation>Rosegarden nie mógł wystartować, więc dźwięk i nagrywanie będą niedostępne dla tej sesji.
@@ -21347,7 +21262,7 @@ Aby uzyskać wsparcie w konfiguracji dźwięku i MIDI, wejdź na stronę http://
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21355,7 +21270,7 @@ Aby uzyskać wsparcie w konfiguracji dźwięku i MIDI, wejdź na stronę http://
<translation>Eksportuj jako...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Zapisywanie pliku Rosegarden do pakietu nie powiodło się: %1</translation>
</message>
@@ -21371,7 +21286,7 @@ Aby uzyskać wsparcie w konfiguracji dźwięku i MIDI, wejdź na stronę http://
<translation>Standardowe pliki MIDI</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21438,9 +21353,9 @@ Aby uzyskać wsparcie w konfiguracji dźwięku i MIDI, wejdź na stronę http://
<translation>Eksportowanie pliku MusicXML...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>Pliki XML</translation>
</message>
@@ -21533,7 +21448,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<translation>Wprowadź nową etykietę</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Lista odtwarzania</translation>
</message>
@@ -21543,7 +21458,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>Kolejkowanie przypadków paniki MIDI dla transmisji...</translation>
</message>
@@ -21585,7 +21500,7 @@ Wystąpił błąd: %2</translation>
<translation>Importuj studio</translation>
</message>
<message>
- <location line="-5561"/>
+ <location line="-5507"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21602,7 +21517,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<translation><qt><p>Kliknij i przeciągnij w górę i w dół lub w lewo i w prawo, aby zmienić.</ p> </p><p>Kliknij podwójnie myszką, aby bezpośrednio edytować wartość.</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Wybierz nową wartość</translation>
</message>
@@ -21654,7 +21569,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Zmień kolor segmentu...</translation>
</message>
@@ -21697,7 +21612,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Kliknij na segmencie, aby go usunąć</translation>
</message>
@@ -21730,7 +21645,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation>Połącz</translation>
</message>
@@ -21738,7 +21653,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>Zmień etykietę segmentu...</translation>
</message>
@@ -21775,22 +21690,22 @@ Czy chciałbyś ją teraz ustawić?</translation>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>Przesuń segment</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>Przesuń segmenty</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Przytrzymaj klawisz Shift, aby przyciągnąć do siatki</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>Kliknij i przeciągnij, aby przesunąć segment</translation>
</message>
@@ -21985,12 +21900,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>Przytrzymaj klawisz Shift, aby przyciągnąć do kreski taktowej</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>Nagrywaj MIDI lub dźwięk</translation>
</message>
@@ -22066,7 +21981,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Ostrzeżenie</translation>
</message>
@@ -22090,17 +22005,17 @@ Czy chciałbyś ją teraz ustawić?</translation>
<translation>Tworzenie wykresu fali dźwiękowej...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Zmień rozmiar segmentu</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Przytrzymaj klawisz Shift, aby przyciągnąć do siatki</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>Przytrzymaj klawisz Shift, aby przyciągnąć do siatki; przytrzymaj klawisz CTRL, aby skalować zawartości</translation>
</message>
@@ -22110,7 +22025,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>Kliknij i przeciągnij, aby zmienić rozmiar segmentu; przytrzymaj klawisz Ctrl, aby go przeskalować</translation>
</message>
@@ -22123,17 +22038,26 @@ Czy chciałbyś ją teraz ustawić?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Kliknij i przeciągnij, aby zaznaczyć segmenty</translation>
</message>
+ <message numerus="yes">
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <location line="+323"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Przytrzymaj klawisz Shift, aby przyciągnąć do siatki</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>Kliknij i przeciągnij, aby zaznaczyć segmenty; kliknij rolką myszki i przeciągnij, aby narysować pusty segment</translation>
</message>
@@ -22158,32 +22082,15 @@ Czy chciałbyś ją teraz ustawić?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">Kliknij i przeciągnij, aby przesunąć segmenty; przytrzymaj klawisz Ctrl, aby je skopiować</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation>Kliknij i przeciągnij, aby skopiować segmenty</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">Kliknij i przeciągnij, aby przesunąć segment; przytrzymaj klawisz Ctrl, aby ją skopiować; kliknij podwójnie myszką, aby edytować</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation>Kliknij i przeciągnij, aby skopiować segment</translation>
</message>
- <message numerus="yes">
- <location line="-294"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Przesuń segment</numerusform>
- <numerusform>Przesuń segmenty</numerusform>
- <numerusform>Przesuń segment(y)</numerusform>
- </translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSingleRepeatToCopyCommand</name>
@@ -22250,24 +22157,12 @@ Czy chciałbyś ją teraz ustawić?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Podziel podwójny segment</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Kliknij na segmencie, aby podzielić go na dwa; przytrzymaj klawisz Shift, aby przyciągnąć do siatki</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>Kliknij na segmencie, aby podzielić go na dwa</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23982,7 +23877,7 @@ Zamknięcie innych programów może spowodować wzrost wydajności Rosegarden.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><brak instrumentu></translation>
</message>
@@ -23997,19 +23892,7 @@ Zamknięcie innych programów może spowodować wzrost wydajności Rosegarden.</
<translation><nienazwana></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Ostrzeżenie</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Ścieżka dźwięku nie istnieje lub nie jest zapisywalna.
-Ustaw ścieżkę dźwięku do obowiązującego katalogu we Właściwościach dokumentu, zanim nagrasz dźwięk.
-Czy chciałbyś ją teraz ustawić?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Wycisz ścieżkę</translation>
</message>
@@ -24022,25 +23905,17 @@ Czy chciałbyś ją teraz ustawić?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Zamień powtórzenie segmentu w rzeczywiste kopie</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Zamień powtórzenie segmentów w rzeczywiste kopie</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -24049,7 +23924,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -24058,7 +23933,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24104,7 +23979,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Ścieżka</translation>
</message>
@@ -24115,12 +23990,12 @@ Czy chciałbyś ją teraz ustawić?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><nienazwana></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Parametry odtwarzania</translation>
</message>
@@ -24261,7 +24136,103 @@ Czy chciałbyś ją teraz ustawić?</translation>
<translation><qt><p>Nowe segmenty będą tworzone z tym kluczem wstawionym na początku</p></qt></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+2"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">wiolinowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">basowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">krotale</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">ksylofon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">gitarowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">kontrabasowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">czelesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">stara czelesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">francuski</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">sopranowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">mezzosopranowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">altowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">tenorowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">barytonowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">varbarytonowy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">subbasowy</translation>
+ </message>
+ <message>
+ <location line="+39"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation><qt><p>Wybierz najniższą zaproponowaną i możliwą do wykonania nutę, używając pięciolinii</p></qt></translation>
</message>
@@ -24291,87 +24262,71 @@ Czy chciałbyś ją teraz ustawić?</translation>
<translation><qt><p>Załaduj parametry segmentu preset z naszej obszernej bazy danych instrumentów z całego świata.</p><p>Kiedy stworzysz nowe segmenty, będą one miały te parametry w chwili stworzenia. Aby używać tych parametrów na istniejących segmentach (np. aby zamienić istniejący wyciąg głosu do odtwarzania trąbki Bb bez transpozycji), użyj <b>Segmenty -> Konwertuj notację do...</b> w edytorze nutowym.</p></qt></translation>
</message>
<message>
- <location line="+13"/>
<source>treble</source>
- <translation>wiolinowy</translation>
+ <translation type="obsolete">wiolinowy</translation>
</message>
<message>
- <location line="+1"/>
<source>bass</source>
- <translation>basowy</translation>
+ <translation type="obsolete">basowy</translation>
</message>
<message>
- <location line="+1"/>
<source>crotales</source>
- <translation>krotale</translation>
+ <translation type="obsolete">krotale</translation>
</message>
<message>
- <location line="+1"/>
<source>xylophone</source>
- <translation>ksylofon</translation>
+ <translation type="obsolete">ksylofon</translation>
</message>
<message>
- <location line="+1"/>
<source>guitar</source>
- <translation>gitarowy</translation>
+ <translation type="obsolete">gitarowy</translation>
</message>
<message>
- <location line="+1"/>
<source>contrabass</source>
- <translation>kontrabasowy</translation>
+ <translation type="obsolete">kontrabasowy</translation>
</message>
<message>
- <location line="+1"/>
<source>celesta</source>
- <translation>czelesta</translation>
+ <translation type="obsolete">czelesta</translation>
</message>
<message>
- <location line="+1"/>
<source>old celesta</source>
- <translation>stara czelesta</translation>
+ <translation type="obsolete">stara czelesta</translation>
</message>
<message>
- <location line="+1"/>
<source>french</source>
- <translation>francuski</translation>
+ <translation type="obsolete">francuski</translation>
</message>
<message>
- <location line="+1"/>
<source>soprano</source>
- <translation>sopranowy</translation>
+ <translation type="obsolete">sopranowy</translation>
</message>
<message>
- <location line="+1"/>
<source>mezzosoprano</source>
- <translation>mezzosopranowy</translation>
+ <translation type="obsolete">mezzosopranowy</translation>
</message>
<message>
- <location line="+1"/>
<source>alto</source>
- <translation>altowy</translation>
+ <translation type="obsolete">altowy</translation>
</message>
<message>
- <location line="+1"/>
<source>tenor</source>
- <translation>tenorowy</translation>
+ <translation type="obsolete">tenorowy</translation>
</message>
<message>
- <location line="+1"/>
<source>baritone</source>
- <translation>barytonowy</translation>
+ <translation type="obsolete">barytonowy</translation>
</message>
<message>
- <location line="+1"/>
<source>varbaritone</source>
- <translation>varbarytonowy</translation>
+ <translation type="obsolete">varbarytonowy</translation>
</message>
<message>
- <location line="+1"/>
<source>subbass</source>
- <translation>subbasowy</translation>
+ <translation type="obsolete">subbasowy</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+36"/>
<source>Transpose</source>
<translation>Transponuj</translation>
</message>
@@ -24412,7 +24367,7 @@ Czy chciałbyś ją teraz ustawić?</translation>
<translation><qt><p>Nowe segmenty będą tworzone przy użyciu tego koloru</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Dźwięk</translation>
@@ -25290,11 +25245,6 @@ Transponuj o półtony...</translation>
<context>
<name>S:</name>
<message>
- <source>Dummy-do-not-translate</source>
- <comment>if the manual is translated into your language, you can</comment>
- <translation type="obsolete">Dummy-do-not-translate</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/AudioManagerDialog.cpp" line="-5"/>
<source></source>
<comment>if the manual is translated into your language, you can</comment>
diff --git a/data/locale/pt_BR.ts b/data/locale/pt_BR.ts
index 7a6331a..92350cd 100644
--- a/data/locale/pt_BR.ts
+++ b/data/locale/pt_BR.ts
@@ -379,55 +379,67 @@
<translation>maior</translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+721"/>
<location filename="../../src/base/Studio.cpp" line="+58"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+707"/>
<location filename="../AutoloadStrings.cpp" line="+39"/>
<source>Audio</source>
<translation>áudio</translation>
</message>
<message>
- <location line="+3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="-37"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location line="-37"/>
+ <location filename="../../src/base/Studio.cpp" line="+3"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="+1"/>
<source>Synth plugin</source>
<translation>Plugin synth</translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+6"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="-24"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>Tamanho errado para os dados de tempo no fluxo MIDI</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>Tamanho errado para os dados Int de fluxo MIDI</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>Final do arquivo MIDI encontrado durante a leitura</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation>Tentativa de obter mais bytes do que o previsto na faixa</translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation>Tentativa de ler fim do arquivo MIDI ultrapassado</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>Encontrado código do evento inválido</translation>
+ <translation type="obsolete">Encontrado código do evento inválido</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation>Estado de execução usado para o primeiro evento na faixa</translation>
</message>
@@ -504,7 +516,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Bem-vindo!</translation>
</message>
@@ -535,14 +547,14 @@
<translation>Plugin synth</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location line="+9"/>
+ <location filename="../../src/gui/general/ActionFileParser.cpp" line="+9"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -652,20 +664,20 @@
<translation><qt><p>Nenhuma faixa foi armada para a gravação..</p><p>Por favor arme ao menos uma faixa como gravavel <img src=":pixmaps/tooltip/record-leds.png"> e tente novamente</p></qt></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>Não foi possÃvel iniciar a gravação de áudio.</p><p>Por favor, definir um caminho válido de gravação em<b>Composição -> Editar Propriedades do Documento... -> Ãudio</b></p></qt></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation>Este evento está ligado a outro evento.</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>Controles %1 - %2 %3</translation>
</message>
@@ -695,34 +707,29 @@
<translation>Não é possÃvel abrir o arquivo de mapeamento de fontes %1</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&Arquivo</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>&Adicionar Arquivo de Ãudio ...</translation>
</message>
@@ -732,55 +739,55 @@
<translation>&Exportar Arquivo de Ãudio ...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>&Fechar</translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translatorcomment>Atalho de teclado</translatorcomment>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Editar</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>&Descarregar Arquivo de Ãudio</translation>
</message>
@@ -820,357 +827,357 @@
<translation>Distribuir Ãudio no Segmento MIDI</translation>
</message>
<message>
+ <location line="-1686"/>
<location line="+1"/>
- <location line="+59"/>
- <location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>&Ajuda</translation>
</message>
<message>
- <location line="-4708"/>
+ <location line="-2600"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-1680"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>F1</translation>
</message>
<message>
- <location line="-4706"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4286"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>&Sobre Rosegarden</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Barra de Ferramentas Geral</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>&Nada para desfazer</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>N&ada a refazer</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>&Copiar</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translatorcomment>teclas de atalho</translatorcomment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>Co&lar</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translatorcomment>teclas de atalho</translatorcomment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Mudar para Ferramenta Selecionada</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Mudar para Inserir Notas</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Mudar para Apagar Ferramentas</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>&Salvar</translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation>&Inserir Evento</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation>&Excluir Evento</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Delete</translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation>&Editar Evento</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>E</translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation>&Editor de Eventos Advançado</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>Cor&tar</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation>&Selecionar Todos</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>Exc&luir Seleção</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho (Esc)</translatorcomment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>&Filtrar Seleção</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation>Definir o Tempo InÃcio do Se&gmento ...</translation>
</message>
@@ -1180,129 +1187,129 @@
<translation>Definir Duração do Seg&mento ...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+288"/>
+ <location line="-1115"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>Preferências ...</translation>
</message>
<message>
- <location line="-287"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1309"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Exibir</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>Tempo da &Música</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>Tempo &Real</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>Tempo B&ruto</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2327"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>Exibir Barra de Ferramen&tas Principal</translation>
</message>
<message>
- <location line="-3646"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-2483"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>Exibir Barra de St&atus</translation>
</message>
<message>
- <location line="-3676"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2467"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Se&gmento</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Editar &Com</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Abrir no Editor Matri&z</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Abrir no Editor &Notação</translation>
</message>
<message>
- <location line="-4119"/>
+ <location line="-2111"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Barra de Ferramentas Ação</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Barra de Ferramentas Tempo</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Barra de Ferramentas Transporte</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Barra de Ferramentas Zoom</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1352,7 +1359,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Inserir Marcador</translation>
</message>
@@ -1372,142 +1379,134 @@
<translation>Editar Marcador</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>F2</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Mudar para Ferramenta Mover</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>F5</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Mudar para Ferramenta Desenhar</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>F3</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Mudar para Ferramenta Redimensionar</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>F4</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">Nada para &desfazer</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Nada a &refazer</translation>
- </message>
- <message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>&Excluir</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Delete, Ctrl+D</translation>
</message>
<message>
- <location line="-4118"/>
+ <location line="+2"/>
<source>Select &All Events</source>
<translation>Selecionar &Todos os Eventos</translation>
</message>
<message>
<location line="+314"/>
- <location line="+1724"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>Inserir Sequência Pitch &Bend...</translation>
</message>
<message>
- <location line="-2009"/>
+ <location line="-3205"/>
<source>&Grid</source>
<translation>&Grade</translation>
</message>
@@ -1523,14 +1522,14 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation>Ajustar a &1/48</translation>
</message>
@@ -1541,14 +1540,14 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation>Ajustar a 1/&24</translation>
</message>
@@ -1559,14 +1558,14 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation>Ajust&ar a 1/12</translation>
</message>
@@ -1577,14 +1576,14 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation>Ajustar a &3/16</translation>
</message>
@@ -1595,14 +1594,14 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation>Ajustar a 3/8</translation>
</message>
@@ -1613,47 +1612,47 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation>Ajustar para &Ritmo</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation>Ajustar para &Barra</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>5</translation>
</message>
<message>
- <location line="-2217"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-3413"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>Barras de Ferramen&tas</translation>
</message>
<message>
- <location line="-3280"/>
+ <location line="-2486"/>
<source>Show To&ols</source>
<translation>Exibir F&erramentas</translation>
</message>
@@ -1674,153 +1673,153 @@
</message>
<message>
<location line="+2"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>&Régua</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>Exibir Régua Nome do Ac&orde</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>Exibir Régua &Andamento</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>Exibir Régua &Velocidade</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Exibir Régua Pitch &Bend</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>Adicionar Régua &Controle</translation>
</message>
<message>
- <location line="-1284"/>
- <location line="+1550"/>
+ <location line="-2479"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2744"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&Composição</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Adicionar Mudança de Anda&mento ...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>Adicionar Mudança de &Fórmula de Compasso...</translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Abrir no Editor Lista de &Eventos</translation>
</message>
<message>
- <location line="-3741"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Abrir no Editor Matriz &Percussão</translation>
</message>
<message>
- <location line="-3722"/>
- <location line="+1290"/>
+ <location line="-2482"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Adicionar Mudança de &Chave ...</translation>
</message>
<message>
- <location line="-1289"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2485"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>Definir &Tempo InÃcial...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>Definir &Duração...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1570"/>
+ <location line="-2487"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>A&juste</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Quantização</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>&Quantizar...</translation>
</message>
<message>
- <location line="-3809"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2944"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>=</translation>
</message>
<message>
- <location line="-3814"/>
+ <location line="-2949"/>
<source>&Repeat Last Quantize</source>
<translation>&Repetir Última Quantização</translation>
</message>
<message>
<location line="+7"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>+</translation>
</message>
<message>
- <location line="-3814"/>
+ <location line="-1834"/>
<source>&Legato</source>
<translatorcomment>(do Italiano)</translatorcomment>
<translation>&Ligado</translation>
@@ -1834,72 +1833,72 @@
</message>
<message>
<location line="+2"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>R&eduzir Notas de Igual-Tom</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>Saltar a &Esquerda</translation>
</message>
<message>
- <location line="-3364"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3010"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Alt+Left</translation>
</message>
<message>
- <location line="-3369"/>
+ <location line="-3015"/>
<source>&Jog Right</source>
<translation>&Saltar a Direita</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Alt+Right</translation>
</message>
<message>
- <location line="-3369"/>
- <location line="+1777"/>
+ <location line="-3015"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>Aumentar a Veloc&idade</translation>
</message>
<message>
- <location line="-1770"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-2966"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+Up</translation>
</message>
<message>
- <location line="-3425"/>
- <location line="+1777"/>
+ <location line="-2971"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>&Reduzir a Velocidade</translation>
</message>
<message>
- <location line="-1770"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2966"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+Down</translation>
</message>
<message>
- <location line="-3407"/>
+ <location line="-2971"/>
<source>&Set to Current Velocity</source>
<translation>&Definir para Velocidade Atual</translation>
</message>
@@ -1915,130 +1914,130 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>&Reduzir Duração pela Metade</translation>
</message>
<message>
- <location line="-1686"/>
- <location line="+1693"/>
+ <location line="-2882"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1691"/>
- <location line="+1693"/>
+ <location line="-2887"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>&Dobrar Duração</translation>
</message>
<message>
- <location line="-1686"/>
- <location line="+1693"/>
+ <location line="-2882"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1691"/>
- <location line="+1693"/>
+ <location line="-2887"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>Esticar ou E&ncolher ...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>Trans&por</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>S&ubir um Semitom</translation>
</message>
<message>
- <location line="-1686"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2882"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Up</translation>
</message>
<message>
- <location line="-3402"/>
- <location line="+1693"/>
+ <location line="-2887"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>&Descer um Semitom</translation>
</message>
<message>
- <location line="-1686"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2882"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Down</translation>
</message>
<message>
- <location line="-3384"/>
- <location line="+1693"/>
+ <location line="-2887"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>Subir uma &Oitava</translation>
</message>
<message>
- <location line="-1686"/>
- <location line="+1693"/>
+ <location line="-2882"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Up</translation>
</message>
<message>
- <location line="-1691"/>
- <location line="+1693"/>
+ <location line="-2887"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>Descer uma Oita&va</translation>
</message>
<message>
- <location line="-1686"/>
- <location line="+1693"/>
+ <location line="-2882"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Down</translation>
</message>
<message>
- <location line="-1691"/>
- <location line="+1693"/>
+ <location line="-2887"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>&Transposição por Semitons ...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Transposição por &Intervalo...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>&Converter</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>&Inverter</translation>
</message>
<message>
- <location line="-1686"/>
+ <location line="-2882"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
@@ -2046,12 +2045,12 @@
</message>
<message>
<location line="+2"/>
- <location line="+1685"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>&Retroceder</translation>
</message>
<message>
- <location line="-1678"/>
+ <location line="-2874"/>
<source>Shift+Alt+R</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
@@ -2059,12 +2058,12 @@
</message>
<message>
<location line="+2"/>
- <location line="+1677"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>Inverter Re&troceder</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>Disparar Se&gmento...</translation>
</message>
@@ -2075,361 +2074,361 @@
</message>
<message>
<location line="+1"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1723"/>
+ <location line="-2919"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Mover</translation>
</message>
<message>
- <location line="-3682"/>
+ <location line="-2919"/>
<source>Cursor Back and Se&lect</source>
<translation>Se&lecionar e Voltar Cursor</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1724"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+Left</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>&Selecionar e Avançar Cursor</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+Right</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>Selecionar e Voltar Cursor a &Barra</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+Left</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>Selecionar e A&vançar Cursor a Barra</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+Right</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>Definir Ciclo ¶ Seleção</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+;</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>Limpar Cicl&o</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1742"/>
+ <location line="-2918"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>Segmento A&nterior</translation>
</message>
<message>
- <location line="-1735"/>
- <location line="+1742"/>
+ <location line="-2931"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Alt+PgUp</translation>
</message>
<message>
- <location line="-1740"/>
- <location line="+1742"/>
+ <location line="-2936"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>Pró&ximo Segmento</translation>
</message>
<message>
- <location line="-1735"/>
- <location line="+1742"/>
+ <location line="-2931"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Alt+PgDown</translation>
</message>
<message>
- <location line="-1740"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-2936"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>Re&produzir</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&Parar</translation>
</message>
<message>
- <location line="-3358"/>
- <location line="+1754"/>
+ <location line="-2943"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>Um Passo &Atrás</translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1754"/>
+ <location line="-2943"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Left</translation>
</message>
<message>
- <location line="-1748"/>
- <location line="+1754"/>
+ <location line="-2944"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>Um Compasso Atrás (a esquerda)</translation>
</message>
<message>
- <location line="-1752"/>
- <location line="+1754"/>
+ <location line="-2948"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>Um Passo a &Frente</translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1754"/>
+ <location line="-2943"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Right</translation>
</message>
<message>
- <location line="-1748"/>
- <location line="+1754"/>
+ <location line="-2944"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>Um Compasso A Frente (a direita)</translation>
</message>
<message>
- <location line="-1752"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2948"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>Ret&roceder Rápido</translation>
</message>
<message>
- <location line="-3330"/>
- <location line="+1754"/>
+ <location line="-2943"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Left</translation>
</message>
<message>
- <location line="-1752"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2948"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Avançar &Rápido</translation>
</message>
<message>
- <location line="-3330"/>
- <location line="+1754"/>
+ <location line="-2943"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Right</translation>
</message>
<message>
- <location line="-1752"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2948"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Retroceder ao &InÃcio</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Avançar para o &Final</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translatorcomment>(individual)</translatorcomment>
<translation>S&olo</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>Ro&lar para Executar Reprodução</translation>
</message>
<message>
- <location line="-3345"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Pause</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2975"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>P&anico</translation>
</message>
<message>
- <location line="-3345"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2976"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="-2981"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>Ferramen&tas</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>&Selecionar e Editar</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>&Desenhar</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>&Apagar</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-2972"/>
<source>Resi&ze</source>
<translation>Redimensio&nar</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>Di&vidir</translation>
</message>
<message>
- <location line="-3522"/>
+ <location line="-1670"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>F7</translation>
</message>
<message>
- <location line="-3527"/>
+ <location line="-1675"/>
<source>&Velocity</source>
<translation>&Velocidade</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1908"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>&Inserir Nota</translation>
</message>
<message>
- <location line="-1907"/>
+ <location line="-3103"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
@@ -2437,18 +2436,18 @@
<translation>I/dó</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
@@ -2456,18 +2455,18 @@
<translation>I/dó sustenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
@@ -2475,19 +2474,19 @@
<translation>II/re bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
@@ -2495,74 +2494,74 @@
<translation>II/re</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>I/re sustenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III/mi bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III/mi</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
@@ -2570,481 +2569,486 @@
<translation>IV/fa</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV/fa sustenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V/sol bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V/sol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V/sol sustenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI/la bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI/la</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI/la sustenido</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII/si bemol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII/si</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>L</translation>
</message>
<message>
- <location line="-1906"/>
- <location line="+1908"/>
+ <location line="-3102"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>Oitava A&cima</translation>
</message>
<message>
- <location line="-1900"/>
- <location line="+1908"/>
+ <location line="-3096"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+E</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>R</translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+R</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>U</translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+I</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+I</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>O</translation>
</message>
<message>
- <location line="-1906"/>
- <location line="+1908"/>
+ <location line="-3102"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>Oitava &Abaixo</translation>
</message>
<message>
- <location line="-1900"/>
- <location line="+1908"/>
+ <location line="-3096"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+X</translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>N</translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>Ctrl+Shift+M</translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>M</translation>
</message>
<message>
- <location line="-2883"/>
- <location line="+1917"/>
+ <location line="-3102"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>Modo de Inserção de &Acordes</translation>
</message>
<message>
- <location line="-1910"/>
- <location line="+1917"/>
+ <location line="-3106"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>H</translation>
</message>
<message>
- <location line="-1915"/>
- <location line="+1936"/>
+ <location line="-3111"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>&Passo de Gravação</translation>
</message>
<message>
- <location line="-1934"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3130"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>&Manual Rosegarden</translation>
</message>
<message>
- <location line="-607"/>
+ <location line="-1503"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-967"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -3119,70 +3123,66 @@
<translation type="unfinished">Ajustar batidas existentes para Batida do Segmento</translation>
</message>
<message>
- <location line="+53"/>
- <location line="+371"/>
+ <location line="-570"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-257"/>
+ <location line="+114"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">Tutorial &Rosegarden</translation>
- </message>
- <message>
- <location line="-2589"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-1042"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>Guia de Relatório de &Erros</translation>
</message>
<message>
- <location line="-2814"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3130"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>Sobre &Qt</translation>
</message>
<message>
- <location line="-2815"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3131"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>&Suporte Rosegarden</translation>
</message>
<message>
- <location line="-2814"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-3130"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Barra de Ferramentas Ferramentas</translation>
</message>
<message>
- <location line="-2815"/>
- <location line="+2123"/>
+ <location line="-3129"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Barra de Ferramentas Régua</translation>
</message>
<message>
- <location line="-1986"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-3051"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>T&ransporte</translation>
</message>
<message>
- <location line="-2580"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-902"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>Grava&r</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>Configuraçõe&s</translation>
</message>
@@ -3292,7 +3292,7 @@
<translation>Exibir &Faders não AtribuÃdo</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Mudar para Inserção de Ferramentas</translation>
</message>
@@ -3302,18 +3302,18 @@
<translation>Apagar Após Reduzir Pausas</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+954"/>
<source>P&rint Preview...</source>
<translation>Visualizar Imp&ressão ...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+1990"/>
+ <location line="-751"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>Im&primir...</translation>
</message>
<message>
- <location line="-1934"/>
+ <location line="+56"/>
<source>C&ut and Close</source>
<translation>C&ortar e Fechar</translation>
</message>
@@ -3382,13 +3382,13 @@
<translation>L&impar Seleção</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+1996"/>
+ <location line="-718"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>&Preferências...</translation>
</message>
<message>
- <location line="-1994"/>
+ <location line="+2"/>
<source>Note &Font</source>
<translation>&Fonte da Nota</translation>
</message>
@@ -3428,13 +3428,13 @@
<translation>Abrir Editor de L&etras</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+1989"/>
+ <location line="-750"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>Exibir Barra de Ferramentas &Ferramentas</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>Exibir Barra de Ferramentas &Acidentes</translation>
</message>
@@ -3459,13 +3459,13 @@
<translation>Exibir Barra de Ferramentas &SÃmbolos</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+1986"/>
+ <location line="-755"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>Exibir Barra de Ferramentas T&ransporte</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>Exibir Barra de Ferramentas &Layout</translation>
</message>
@@ -3515,22 +3515,18 @@
<translation>Dump BarDataMap (debug)</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation>Abrir no &Tom da Faixa</translation>
</message>
<message>
- <location line="-2461"/>
+ <location line="+1"/>
<source>Add Cle&f Change...</source>
<translation>Adicionar Troca de Cla&ve...</translation>
</message>
<message>
- <source>Add Clef Change in this link only...</source>
- <translation type="obsolete">Adicionar Troca de Clave somente neste link...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Add Pedal &Press</source>
<translation>Adicionar Pedal de &Presão</translation>
@@ -3541,13 +3537,13 @@
<translation>Adicionar Pedal de &Lançamento</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>&Converter Notação para...</translation>
</message>
<message>
- <location line="-2184"/>
+ <location line="-74"/>
<source>Search and Selec&t</source>
<translation type="unfinished"></translation>
</message>
@@ -3557,7 +3553,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Add &Layer</source>
<translation>Adicionar &Layer</translation>
</message>
@@ -3951,8 +3947,8 @@
<translation>&Restaurar Hastes</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>&Frase</translation>
</message>
@@ -4003,15 +3999,15 @@
<translation>Quialt&eras...</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1968"/>
+ <location line="-768"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translatorcomment>atalho de teclado</translatorcomment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="-1966"/>
+ <location line="+2"/>
<source>&Triplet</source>
<translation>&Tercinas</translation>
</message>
@@ -4072,22 +4068,22 @@
<translation>Ligadura A&baixo</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>L&igar</translation>
</message>
<message>
- <location line="-1543"/>
- <location line="+1550"/>
+ <location line="-2739"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translatorcomment>atalho de teclado</translatorcomment>
<translation>~</translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1550"/>
+ <location line="-2744"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>&Desfazer Ligar</translation>
</message>
@@ -4191,15 +4187,15 @@
<translation>&Normalizar Pausas</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translatorcomment>atalho de teclado</translatorcomment>
<translation>Ctrl+N</translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation>&Reduzir Pausas</translation>
</message>
@@ -4209,8 +4205,8 @@
<translation>&Notas</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translatorcomment>atalho de teclado</translatorcomment>
@@ -4513,13 +4509,13 @@
<translation>Crono&metragem</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>Saltar a &Direita</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>&Visibilidade</translation>
</message>
@@ -4573,19 +4569,19 @@
<translation>Parar</translation>
</message>
<message>
- <location line="+55"/>
- <location line="+1636"/>
+ <location line="-1052"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Retroceder ao InÃcio</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Avançar Rápido para o Final</translation>
</message>
<message>
- <location line="-1622"/>
+ <location line="+16"/>
<source>Solo the Active Track</source>
<translation>Solo na Faixa Ativa</translation>
</message>
@@ -4784,12 +4780,12 @@
<translation>Nota Fusa Pontuada &y</translation>
</message>
<message>
- <location line="+788"/>
+ <location line="-2573"/>
<source>Switch To &Notes</source>
<translation>Mudar para &Notas</translation>
</message>
<message>
- <location line="-780"/>
+ <location line="+2581"/>
<location line="+9"/>
<source>Y</source>
<comment>keyboard shortcut</comment>
@@ -4797,7 +4793,7 @@
<translation>Y</translation>
</message>
<message>
- <location line="+772"/>
+ <location line="-2589"/>
<source>Switch To &Rests</source>
<translation>Mudar pa&ra &Pausas</translation>
</message>
@@ -4807,7 +4803,7 @@
<translation>Alternar Ponto On &g</translation>
</message>
<message>
- <location line="-764"/>
+ <location line="+2597"/>
<location line="+9"/>
<source>.</source>
<comment>keyboard shortcut</comment>
@@ -4815,17 +4811,17 @@
<translation>.</translation>
</message>
<message>
- <location line="+756"/>
+ <location line="-2605"/>
<source>To&ggle Dot Off</source>
<translation>Alternar Ponto Off &g</translation>
</message>
<message>
- <location line="-292"/>
+ <location line="+3069"/>
<source>Insert Rest</source>
<translation>Inserir Pausa</translation>
</message>
<message>
- <location line="-2948"/>
+ <location line="-4144"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -4836,51 +4832,51 @@
</message>
<message>
<location line="+355"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1030"/>
- <location line="+1936"/>
+ <location line="-2226"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2526"/>
+ <location line="+105"/>
<source>&Guess Beats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -4945,28 +4941,28 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>P</translation>
</message>
<message>
- <location line="-505"/>
+ <location line="+11"/>
<source>Triplet Insert Mo&de</source>
<translation>Mo&do de Inserção Tercina</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1190"/>
+ <location line="-4313"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translatorcomment>tecla de atalho</translatorcomment>
<translation>G</translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation>Mo&do de Inserção Quialtera</translation>
</message>
@@ -5173,7 +5169,7 @@
<translation>Barra de Ferramentas Camadas</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Mudar para Inserir Ferramenta</translation>
</message>
@@ -5228,7 +5224,7 @@
<translation>Fazer VisÃvel</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Barra de Ligação Automática</translation>
</message>
@@ -5268,7 +5264,7 @@
<translation>Dobrado Bemol</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>&Novo</translation>
</message>
@@ -5278,18 +5274,6 @@
<translation>&Importar</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Importar &Projeto Rosegarden...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Importar &MIDI...</translation>
- </message>
- <message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Importar &X11 Rosegarden...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>Importar &Hydrogen...</translation>
@@ -5305,14 +5289,6 @@
<translation>Mesclar &Arquivo...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Mesclar &MIDI...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Mesclar &X11 Rosegarden...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Mesclar &Hydrogen...</translation>
@@ -5323,30 +5299,6 @@
<translation>&Exportar</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Exportar &Projeto Rosegarden...</translation>
- </message>
- <message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Exportar &LilyPond...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Exportar &MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Exportar Partitura &Csound...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Exportar M&up...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Exportar Music&XML...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>&Abrir...</translation>
@@ -5363,10 +5315,6 @@
<translation>Abrir &Recente</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Salvar &Como...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>Salvar Como Mo&delo...</translation>
@@ -5430,13 +5378,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location line="-839"/>
+ <location line="-611"/>
<source>&Insert Range...</source>
<translation>&Inserir Faixa...</translation>
</message>
@@ -5543,10 +5491,6 @@
<translation>Definir Duração para &Batida do Segmento</translation>
</message>
<message>
- <source>Fit existing beats to beat segment</source>
- <translation type="obsolete">Ajustar batidas existentes para bater segmento</translation>
- </message>
- <message>
<location line="+2"/>
<source>Change &Composition Start and End...</source>
<translation>Alterar Inicio e Fim da &Composição...</translation>
@@ -5557,14 +5501,14 @@
<translation>Editar Mar&cadores...</translation>
</message>
<message>
- <location line="-2052"/>
- <location line="+2059"/>
+ <location line="+7"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-681"/>
<source>Edit Document P&roperties...</source>
<translation>Editar P&ropriedades do Documento...</translation>
</message>
@@ -5574,20 +5518,20 @@
<translation>Definir Marcador Rápido na Po&sição de Reprodução</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>&Saltar para Marcador Rápido</translation>
</message>
<message>
- <location line="-1236"/>
- <location line="+1243"/>
+ <location line="-1493"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1498"/>
<source>&Studio</source>
<translation>E&stúdio</translation>
</message>
@@ -5658,30 +5602,26 @@
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Abrir com Editor Pa&drão</translation>
- </message>
- <message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>Return</translation>
</message>
<message>
- <location line="-324"/>
- <location line="+452"/>
+ <location line="-495"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>R&enomear...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>Repetir ùltim&a Quantização</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>Esticar &ou Encolher ...</translation>
</message>
@@ -5691,20 +5631,20 @@
<translation>Criar &Anacrusis...</translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Unir</translation>
</message>
<message>
- <location line="-375"/>
- <location line="+382"/>
+ <location line="-605"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="-380"/>
+ <location line="+2"/>
<source>&Split</source>
<translation>&Dividir</translation>
</message>
@@ -5831,23 +5771,18 @@
<translation>&Remapear Instrumentos...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>&Redimensionar</translation>
</message>
<message>
- <location line="-279"/>
+ <location line="+26"/>
<source>Ctrl+Enter, Enter, Media Play, Ctrl+Return</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Enter, Media Play, Ctrl+Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Enter, Media Play, Ctrl+Return</translation>
- </message>
- <message>
<location line="+9"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
@@ -5915,7 +5850,7 @@
<translation>End</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+48"/>
<source>Insert Tempo Change</source>
<translation>Inserir Mudança de Andamento</translation>
</message>
@@ -5955,7 +5890,7 @@
<translation>Abrit Editor Andamento e Fórmula de Compasso</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>&Editar Item</translation>
</message>
@@ -5985,7 +5920,7 @@
<translation>Ocultar Barra de St&atus</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+2585"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>Colar como Novo &Segmento Acionado</translation>
</message>
@@ -11108,10 +11043,6 @@ red1</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
<location filename="../../src/base/figuration/SegmentFigData.cpp" line="+53"/>
<source>Replace segment contents</source>
<translation type="unfinished"></translation>
@@ -11156,6 +11087,58 @@ red1</translation>
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">LilyPond não permite espaços ou barras invertidas em nomes de arquivos.
+
+Você gostaria de usar
+
+ %1
+
+ em vez disso?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Exportação falhou. O arquivo não pôde ser aberto para gravação.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">aviso: barra longo demais truncada aqui</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">aviso: barra muito curta, preenchida com pausas</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11171,13 +11154,9 @@ red1</translation>
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2011 por equipe Rosegarden de desenvolvimento </p><p>Versão: %1 Qt versão: %2<br>Build chave: %3</p><p>Rosegarden foi trazido a você por uma equipe de voluntários em todo o mundo. Para obter a lista de colaboradores, visite <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>Para mais informações sobre o Rosegarden, visite <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licença: GNU General Public License Version 2</p></translation>
- </message>
</context>
<context>
<name>Rosegarden::ActionCommandArgumentQuerier</name>
@@ -11237,12 +11216,12 @@ red1</translation>
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>Não é possÃvel adicionar idênticas indicações sobrepostas</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>Adicionar &Ligadura</translation>
</message>
@@ -11750,24 +11729,24 @@ red1</translation>
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Clique para renomear este instrumento</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>Clique no botão acima para renomear este instrumento</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><no synth></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><no plugin></translation>
</message>
@@ -11820,10 +11799,6 @@ red1</translation>
<translation>Arquivo</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><no audio files></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Salvar Arquivo Como</translation>
@@ -11983,7 +11958,7 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Mixer de Audio</translation>
</message>
@@ -11999,20 +11974,20 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Pan</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>NÃvel de Ãudio</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Mono ou Estéreo</translation>
</message>
@@ -12023,21 +11998,21 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><nenhum></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>Clique para carregar um plugin de áudio</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>Clique para renomear este instrumento</translation>
</message>
@@ -12057,7 +12032,7 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<translation>Clique no botão acima para renomear este instrumento</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Sub %1</translation>
</message>
@@ -12073,14 +12048,14 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<translation>Master</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><no plugin></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-pt</translation>
</message>
@@ -12659,7 +12634,7 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<translation>Realmente excluir este banco?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>Realmente excluir este mapeamento de teclas?</translation>
</message>
@@ -12837,9 +12812,123 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<translation>Aumentar a Veloc&idade</translation>
</message>
<message>
- <location line="+1"/>
- <source>&Reduce Velocity</source>
- <translation>&Reduzir a Velocidade</translation>
+ <location line="+1"/>
+ <source>&Reduce Velocity</source>
+ <translation>&Reduzir a Velocidade</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"> </translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -13166,7 +13255,7 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13391,7 +13480,7 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Velocidade</translation>
</message>
@@ -13407,7 +13496,7 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Tipo de Evento IncompatÃvel</translation>
</message>
@@ -13422,12 +13511,13 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<translation>Controlador Eventos</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>Inserir linha de controlador</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>Controlador Número de eventos</translation>
</message>
@@ -13435,7 +13525,7 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>&Copiar</translation>
</message>
@@ -13445,7 +13535,7 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<translation>(excerto)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(copiado)</translation>
</message>
@@ -13515,7 +13605,7 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>Cor&tar</translation>
</message>
@@ -13555,10 +13645,6 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Comando Juntar</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>Excluir Intervalo</translation>
@@ -13583,12 +13669,12 @@ Por favor, selecione os que deseja excluir permanentemente do disco rÃgido.
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation>[ Nenhuma porta ]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -14614,22 +14700,6 @@ Gostaria de tentar localizar este arquivo ou ignorá-lo?</translation>
<translation>Descarregando %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Falha na conexão com o servidor FTP</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Falha no login</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Falha ao mudar para o diretório correto</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">Download FTP abortado</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Download cancelado</translation>
@@ -15548,7 +15618,7 @@ Exemplo de texto a partir do arquivo:</translation>
<translation>Parâmetros do Instrumento</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Faixa</translation>
</message>
@@ -15556,7 +15626,7 @@ Exemplo de texto a partir do arquivo:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -15941,7 +16011,6 @@ Exemplo de texto a partir do arquivo:</translation>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15949,7 +16018,7 @@ Would you like to use
%1
instead?</source>
- <translation>LilyPond não permite espaços ou barras invertidas em nomes de arquivos.
+ <translation type="obsolete">LilyPond não permite espaços ou barras invertidas em nomes de arquivos.
Você gostaria de usar
@@ -15958,39 +16027,16 @@ Você gostaria de usar
em vez disso?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">Exportação falhou. O arquivo não pôde ser aberto para gravação.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Exportação falhou. O arquivo não pôde ser aberto para gravação.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>aviso: barra longo demais truncada aqui</translation>
+ <translation type="obsolete">aviso: barra longo demais truncada aqui</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>aviso: barra muito curta, preenchida com pausas</translation>
+ <translation type="obsolete">aviso: barra muito curta, preenchida com pausas</translation>
</message>
</context>
<context>
@@ -16036,10 +16082,6 @@ Você gostaria de usar
<translation>Faixas não-mudas</translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Faixas selecionadas</translation>
- </message>
- <message>
<location line="+1"/>
<source>Selected track</source>
<translation type="unfinished">Faixas selecionadas</translation>
@@ -16702,7 +16744,7 @@ um atraso no inÃcio da reprodução devido à quantidade de dados a serem trans
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-759"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-705"/>
<source><qt>Set the MIDI bank from which to select programs</qt></source>
<translation><qt>Defina o banco MIDI a partir do qual selecionar os programas</qt></translation>
</message>
@@ -16787,12 +16829,7 @@ um atraso no inÃcio da reprodução devido à quantidade de dados a serem trans
<translation>Receptor externo</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Nenhuma coneção</translation>
</message>
@@ -17016,6 +17053,15 @@ um atraso no inÃcio da reprodução devido à quantidade de dados a serem trans
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17221,12 +17267,12 @@ Clique duas vezes para abrir o editor de marcas.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Segure Shift para evitar o encaixe da batida ba grade</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Copiar e Mover o Evento</translation>
</message>
@@ -17385,7 +17431,7 @@ Clique duas vezes para abrir o editor de marcas.</translation>
<translation>Mudanças de velocidades</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>Clique e arraste a escala de velocidade das notas selecionadas</translation>
</message>
@@ -17466,7 +17512,7 @@ Clique duas vezes para abrir o editor de marcas.</translation>
<translation>Desligado</translation>
</message>
<message>
- <location line="+435"/>
+ <location line="+437"/>
<source>Trigger Segment</source>
<translation>Armar Segmento</translation>
</message>
@@ -17507,18 +17553,12 @@ Clique duas vezes para abrir o editor de marcas.</translation>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-95"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Não é possÃvel inserir notas: Nenhuma duração de grade selecionada</translation>
- </message>
- <message>
- <location line="+95"/>
+ <location line="+0"/>
<source>Unknown note insert action %1</source>
<translation>Ação de inserção de nota desconhecida %1</translation>
</message>
@@ -17531,7 +17571,7 @@ Clique duas vezes para abrir o editor de marcas.</translation>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
@@ -17551,7 +17591,7 @@ Clique duas vezes para abrir o editor de marcas.</translation>
<translation>Redefinir Zoom</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Rodar volante para mudar o segmento ativo</qt></translation>
</message>
@@ -17674,7 +17714,7 @@ Clique duas vezes para abrir o editor de marcas.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>Mixer MIDI</translation>
</message>
@@ -17689,7 +17729,7 @@ Clique duas vezes para abrir o editor de marcas.</translation>
<translation>Instrumento</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-pt</translation>
</message>
@@ -17986,13 +18026,13 @@ Clique duas vezes para abrir o editor de marcas.</translation>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Notação</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Modo de Layout padrão</translation>
</message>
@@ -18580,7 +18620,7 @@ Este é um bug (o programa antes teria deixado de funcionar por agora)</translat
<translation> Nenhuma seleção </translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+50"/>
<source> Font: </source>
<translation> Fonte: </translation>
</message>
@@ -18592,16 +18632,15 @@ Este é um bug (o programa antes teria deixado de funcionar por agora)</translat
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3218"/>
+ <location line="-3235"/>
<source>Unknown font "%1", using default</source>
<translation>Fonte desconhecida "%1", usando padrão</translation>
</message>
@@ -18626,10 +18665,6 @@ Este é um bug (o programa antes teria deixado de funcionar por agora)</translat
<translation>visualizar opções LilyPond</translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Exportação falhou. O arquivo não pôde ser aberto para gravação.</translation>
- </message>
- <message>
<location line="+21"/>
<source>Printing with LilyPond...</source>
<translation>Imprimindo com LilyPond...</translation>
@@ -18666,18 +18701,18 @@ Este é um bug (o programa antes teria deixado de funcionar por agora)</translat
</message>
<message>
<location line="+33"/>
- <location line="+56"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>Não foi possÃvel colar neste ponto.</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+56"/>
+ <location line="-56"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation><qt><p>O tipo colar restrito requer bastante espaço vazio (contendo pausas apenas) na posição de colar para segurar todos os eventos a serem colados.</p><p>Espaço insuficiente foi encontrado.</p><p>Se você deseja colar de qualquer forma, considere o uso de outros tipos de <b>Colar...</b> em opção no menu Editar.. Você também pode alterar o tipo de pasta padrão para algo que não seja restrito, se desejar.</p></qt></translation>
</message>
<message>
- <location line="-37"/>
+ <location line="-38"/>
<source>Clipboard is empty</source>
<translation>Ãrea de transferência está vazia</translation>
</message>
@@ -18687,7 +18722,7 @@ Este é um bug (o programa antes teria deixado de funcionar por agora)</translat
<translation>Inserindo conteúdos da área de transferência...</translation>
</message>
<message>
- <location line="+173"/>
+ <location line="+175"/>
<source>Raising velocities...</source>
<translation>Aumentando velocidades...</translation>
</message>
@@ -18717,16 +18752,12 @@ Este é um bug (o programa antes teria deixado de funcionar por agora)</translat
<translation>Ornamento barra %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Fazer Ornamento</translation>
- </message>
- <message>
- <location line="-2164"/>
+ <location line="-2170"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2202"/>
+ <location line="+2208"/>
<source>Use Ornament</source>
<translation>Usar Ornamento</translation>
</message>
@@ -18761,7 +18792,7 @@ Este é um bug (o programa antes teria deixado de funcionar por agora)</translat
<translation>Sustain</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>Não há nenhum controlador de sustain definido para este dispositivo.
@@ -18773,7 +18804,7 @@ Assegure que o dispositivo está configurado corretamente na caixa de diálogo G
<translation>Apresentar tempo de compasso estimado</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - Faixa Segmento #%3 - Notação</translation>
</message>
@@ -18823,12 +18854,7 @@ Assegure que o dispositivo está configurado corretamente na caixa de diálogo G
<translation>Por número de semitons: </translation>
</message>
<message>
- <location line="+215"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>Não é possÃvel inserir nota: Nenhuma duração da nota selecionada</translation>
- </message>
- <message>
- <location line="+164"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>Tempo: %1 (%2.%3s)</translation>
</message>
@@ -18907,7 +18933,7 @@ Assegure que o dispositivo está configurado corretamente na caixa de diálogo G
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
@@ -18932,7 +18958,7 @@ Assegure que o dispositivo está configurado corretamente na caixa de diálogo G
<translation>Fechar cabeçalhos da faixa</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Rodar volante para mudar o segmento ativo</qt></translation>
@@ -19158,10 +19184,6 @@ Esta cadeia nunca é exibido, mas define a maior largura do texto (pitch e nome
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">Sequência Pitch Bend</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>Predefinições</translation>
@@ -19172,10 +19194,6 @@ Esta cadeia nunca é exibido, mas define a maior largura do texto (pitch e nome
<translation>Predefinições:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">Usuário</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -19393,14 +19411,6 @@ Esta cadeia nunca é exibido, mas define a maior largura do texto (pitch e nome
<translation>Pre Bend</translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Valor (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Duração (%):</translation>
- </message>
- <message>
<location line="+38"/>
<source>Bend Sequence</source>
<translation>Curva de Sequência</translation>
@@ -19436,30 +19446,10 @@ Esta cadeia nunca é exibido, mas define a maior largura do texto (pitch e nome
<translation>Valor final (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">Vibrato amplitude inicial (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">Vibrato amplitude final (%):</translation>
- </message>
- <message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Vibrato comprimento da onda:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">Resolução:</translation>
- </message>
- <message>
<location line="+162"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Tempo final inválido. Você selecionou alguns eventos?</translation>
</message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-pt</translation>
- </message>
</context>
<context>
<name>Rosegarden::PitchChooser</name>
@@ -20070,12 +20060,12 @@ Esta cadeia nunca é exibido, mas define a maior largura do texto (pitch e nome
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Nenhum</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>2-no-tempo-de-3</translation>
</message>
@@ -20140,7 +20130,7 @@ Esta cadeia nunca é exibido, mas define a maior largura do texto (pitch e nome
<translation>Dividir e ligar acordes sobrepostos</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Quantização completa</translation>
</message>
@@ -20473,8 +20463,8 @@ Pode haver algumas incompatibilidades com o formato do arquivo.</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20486,7 +20476,7 @@ Pode haver algumas incompatibilidades com o formato do arquivo.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2487"/>
+ <location line="-2514"/>
<source>Could not save document at %1
(%2)</source>
<translation>Não foi possÃvel salvar o documento em %1
@@ -20571,7 +20561,12 @@ Selecione os que você deseja excluir permanentemente do disco rÃgido.
<translation>Mesclar</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>Não foi possÃvel criar arquivo temporário no diretório de '%1': %2</translation>
</message>
@@ -20586,7 +20581,7 @@ Selecione os que você deseja excluir permanentemente do disco rÃgido.
<translation>Falha ao renomear arquivo de saÃda temporária '%1' no arquivo de saÃda desejado '%2'</translation>
</message>
<message>
- <location line="+187"/>
+ <location line="+190"/>
<source>Error while writing on '%1'</source>
<translation>Erro ao escrever sobre '%1'</translation>
</message>
@@ -20645,7 +20640,7 @@ Suporte para esses elementos podem desaparecer em versões futuras do Rosegarden
Nós recomendamos que você salve novamente o arquivo a partir desta versão do Rosegarden para garantir que ele ainda pode ser re-carregado em futuras versões.</translation>
</message>
<message>
- <location line="+1220"/>
+ <location line="+1221"/>
<source>Warning</source>
<translation type="unfinished">Aviso</translation>
</message>
@@ -20659,11 +20654,7 @@ Por favor, defina o caminho do arquivo de áudio para um diretório válido em P
Gostaria de configurá-lo agora?</translation>
</message>
<message>
- <source><qt><h2>Channels were remapped</h2><p>Beginning with version 10.02, Rosegarden no longer provides controls for changing the channel associated with each MIDI instrument. Instead, each instrument uses the same channel as its instrument number. For example, "MIDI Input System Device #12" always uses channel 12.</p><p>The file you just loaded contained instruments whose channels differed from the instrument numbers. These channels have been reassigned so that instrument #1 will always use channel 1, regardless of what channel it might have used previously. In most cases, you will experience no difference, but you may have to make some small changes to this file in order for it to play as intended. We recommend that you save this file in order to avoid seeing this warning in the future.</p><p>We apologize for any inconvenience.</p></qt></source>
- <translation type="obsolete"><qt><h2>Canais foram remapeado </h2><p>Começando com a versão 10.02, Rosegarden já não fornece controles para mudar o canal associado a cada instrumento MIDI. Em vez disso, cada instrumento utiliza o mesmo canal que o número de instrumentos. Por exemplo, "Dispositivo MIDI do Sistema de Entrada #12" sempre usa o canal 12.</p><p>O arquivo que você acabou de carregar os instrumentos contidos cujos canais diferiram dos números dos instrumentos..Estes canais têm sido transferidos para esse instrumento # 1 sempre usará o canal 1, independentemente do canal que poderia ter usado anteriormente.Na maioria dos casos, você não vai experimentar diferença, mas você pode ter que fazer algumas pequenas mudanças para este arquivo para que ele vbenha a desempenhar como pretendido. Nós recomendamos que você salve este arquivo para evitar ver este aviso no futuro.</p><p>Pedimos desculpas por qualquer inconveniente.</p></qt></translation>
- </message>
- <message>
- <location line="-571"/>
+ <location line="-572"/>
<source>Insert Recorded MIDI</source>
<translation>Inserir MIDI Gravado</translation>
</message>
@@ -20682,13 +20673,13 @@ Gostaria de configurá-lo agora?</translation>
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<location line="+100"/>
<location line="+336"/>
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20697,7 +20688,7 @@ Gostaria de configurá-lo agora?</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1546"/>
+ <location line="-1539"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>Seleção deve conter apenas segmentos de áudio ou sem áudio</translation>
</message>
@@ -20723,7 +20714,7 @@ See Edit -> Preferences -> Audio.</source>
Consulte Editar -> Preferências -> Ãudio.</translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation>Não é possÃvel adicionar arquivo arrastado. JACK audio server não está disponÃvel.</translation>
</message>
@@ -20797,26 +20788,26 @@ Consulte Editar -> Preferências -> Ãudio.</translation>
<translation>Iniciando...</translation>
</message>
<message>
- <location line="+466"/>
+ <location line="+455"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+73"/>
+ <location line="+72"/>
<source> Zoom: </source>
<translation> Zoom: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location line="-1071"/>
- <location line="+312"/>
+ <location line="-1094"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -20840,8 +20831,8 @@ Consulte Editar -> Preferências -> Ãudio.</translation>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -20851,7 +20842,7 @@ Consulte Editar -> Preferências -> Ãudio.</translation>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -20869,8 +20860,8 @@ Consulte Editar -> Preferências -> Ãudio.</translation>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -20879,7 +20870,7 @@ Consulte Editar -> Preferências -> Ãudio.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-6768"/>
+ <location line="-6714"/>
<source>File "%1" does not exist</source>
<translation>Arquivo "%1" não existe</translation>
</message>
@@ -20902,12 +20893,12 @@ Você deseja abri-lo em vez disso?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Sem titulo</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20950,16 +20941,16 @@ erro foi : %2</translation>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>Não é possÃvel abrir o arquivo %1</translation>
</message>
<message>
- <location line="-6311"/>
+ <location line="-6257"/>
<location line="+106"/>
<source>Opening file...</source>
<translation>Abrindo arquivo...</translation>
@@ -20972,12 +20963,12 @@ erro foi : %2</translation>
</message>
<message>
<location line="-34"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Todos os arquivos suportados</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20997,22 +20988,22 @@ erro foi : %2</translation>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Todos os arquivos</translation>
</message>
<message>
- <location line="-6175"/>
+ <location line="-6121"/>
<source>Saving file...</source>
<translation>Salvando arquivo...</translation>
</message>
@@ -21126,12 +21117,12 @@ erro foi : %2</translation>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Aviso</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21219,12 +21210,12 @@ Nenhum segmento será dividido.</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Definir Andamento global</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>Alternar a barra de ferramentas...</translation>
</message>
@@ -21292,12 +21283,12 @@ Nenhum segmento será dividido.</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Aquivos do Projeto Rosegarden</translation>
</message>
<message>
- <location line="-1229"/>
+ <location line="-1223"/>
<source>Open MIDI File</source>
<translation>Abrir Arquivo MIDI</translation>
</message>
@@ -21307,12 +21298,12 @@ Nenhum segmento será dividido.</translation>
<translation>Mesclar Arquivi MIDI</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>Importar arquivo MIDI...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>Calculando notação...</translation>
</message>
@@ -21344,18 +21335,6 @@ Nenhum segmento será dividido.</translation>
<translation>Não é possÃvel carregar arquivo Rosegarden X11. Ele parece estar corrompido.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Abrir Arquivo Hydrogen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Importar arquivo Hydrogen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Não é possÃvel carregar arquivos Hydrogen. Ele parece estar corrompido.</translation>
- </message>
- <message>
<location line="+152"/>
<location line="+36"/>
<source>Open MusicXML File</source>
@@ -21394,7 +21373,7 @@ Para obter ajuda com áudio correto e configuração MIDI, vá para http://roseg
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21402,7 +21381,7 @@ Para obter ajuda com áudio correto e configuração MIDI, vá para http://roseg
<translation>Exportar como...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Salvar o arquivo Rosegarden para o pacote falhou: %1</translation>
</message>
@@ -21418,7 +21397,7 @@ Para obter ajuda com áudio correto e configuração MIDI, vá para http://roseg
<translation>Arquivos padrão MIDI</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21490,9 +21469,9 @@ Para obter ajuda com áudio correto e configuração MIDI, vá para http://roseg
<translation>Exportando arquivo MusicXML...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>Arquivo XML</translation>
</message>
@@ -21595,7 +21574,7 @@ Gostaria de configurá-lo agora?</translation>
<translation>Digite um novo rótulo</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Lista de Reprodução</translation>
</message>
@@ -21615,7 +21594,7 @@ Gostaria de configurá-lo agora?</translation>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>Enfileirando eventos pânico MIDI para transmissão...</translation>
</message>
@@ -21705,7 +21684,7 @@ Erro foi %2</translation>
<translation><qt><p>Clique e arraste para cima e para baixo ou para a esquerda e direita para modificar.</p><p>Duplo clique para editar o valor diretamente.</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Selecionar um novo valor</translation>
</message>
@@ -21757,7 +21736,7 @@ Erro foi %2</translation>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Mudar Cor Segmento...</translation>
</message>
@@ -21800,7 +21779,7 @@ Erro foi %2</translation>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Clique em um segmento para excluÃ-lo</translation>
</message>
@@ -21833,7 +21812,7 @@ Erro foi %2</translation>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">&Unir</translation>
</message>
@@ -21841,7 +21820,7 @@ Erro foi %2</translation>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>R&enomear...</translation>
</message>
@@ -21878,22 +21857,22 @@ Erro foi %2</translation>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>Mover Segmento</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>Mover Segmentos</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Segure Shift para evitar o encaixe da batida da grade</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>Clique e arraste para mover um segmento</translation>
</message>
@@ -22089,12 +22068,12 @@ antes da transposição nova poder ser aplicada.</translation>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>Segure Shift para evitar o encaixe a linhas de barra</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>Gravar ou soltar áudio aqui</translation>
</message>
@@ -22170,7 +22149,7 @@ antes da transposição nova poder ser aplicada.</translation>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Aviso</translation>
</message>
@@ -22194,17 +22173,17 @@ Gostaria de configurá-lo agora?</translation>
<translation>Gerando visualização de áudio...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Redimencionar Segmento</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Segure Shift para evitar o encaixe da batida ba grade</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>Segure Shift para evitar o encaixe bater na grade; segure Ctrl, também para reescalar conteúdos</translation>
</message>
@@ -22214,7 +22193,7 @@ Gostaria de configurá-lo agora?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>Clique e arraste para redimensionar um segmento; pressione Ctrl também para reescalar o seu conteúdo</translation>
</message>
@@ -22227,25 +22206,25 @@ Gostaria de configurá-lo agora?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Clique e arraste para selecionar segmentos</translation>
</message>
<message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Mover Segmento(s) %n</numerusform>
- <numerusform>Mover Segmento(s) %n</numerusform>
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+154"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Segure Shift para evitar o encaixe bater grade</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>Clique e arraste para selecionar segmentos; clique no botão do meio do mouse e arraste para desenhar um segmento vazio</translation>
</message>
@@ -22345,24 +22324,12 @@ Gostaria de configurá-lo agora?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Dividir Segmento duas vezes</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Clique num segmento para dividi-lo em dois; segure Shift para evitar o encaixe bater grade</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>Clique num segmento para dividi-lo de dois</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -24077,7 +24044,7 @@ Sair de outros aplicativos em execução pode melhorar o desempenho do Rosegarde
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><no instrument></translation>
</message>
@@ -24092,19 +24059,7 @@ Sair de outros aplicativos em execução pode melhorar o desempenho do Rosegarde
<translation><semnome></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Aviso</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">O caminho do arquivo de áudio não existe ou não é gravável.
-Por favor, defina o caminho do arquivo de áudio para um diretório válido em Propriedades do Documento antes de gravar o áudio.
-Gostaria de configurá-lo agora?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Silenciar faixa</translation>
</message>
@@ -24117,17 +24072,17 @@ Gostaria de configurá-lo agora?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform>Transformar %n Repetições em Cópia Real</numerusform>
@@ -24135,7 +24090,7 @@ Gostaria de configurá-lo agora?</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform>Transformar %n Segmentos Vinculados em Cópia Real</numerusform>
@@ -24143,7 +24098,7 @@ Gostaria de configurá-lo agora?</translation>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24189,7 +24144,7 @@ Gostaria de configurá-lo agora?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Faixa</translation>
</message>
@@ -24200,12 +24155,12 @@ Gostaria de configurá-lo agora?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><semnome></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Parâmetros do Reprodutor</translation>
</message>
@@ -24368,82 +24323,162 @@ Gostaria de configurá-lo agora?</translation>
<message>
<location line="+2"/>
<source>treble</source>
- <translation>treble</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">treble</translation>
</message>
<message>
<location line="+1"/>
<source>bass</source>
- <translation>bass</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">bass</translation>
</message>
<message>
<location line="+1"/>
<source>crotales</source>
- <translation>crotales</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">crotales</translation>
</message>
<message>
<location line="+1"/>
<source>xylophone</source>
- <translation>xylophone</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">xylophone</translation>
</message>
<message>
<location line="+1"/>
<source>guitar</source>
- <translation>guitar</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">guitar</translation>
</message>
<message>
<location line="+1"/>
<source>contrabass</source>
- <translation>contrabass</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">contrabass</translation>
</message>
<message>
<location line="+1"/>
<source>celesta</source>
- <translation>celesta</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">celesta</translation>
</message>
<message>
<location line="+1"/>
<source>old celesta</source>
- <translation>old celesta</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">old celesta</translation>
</message>
<message>
<location line="+1"/>
<source>french</source>
- <translation>french</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">french</translation>
</message>
<message>
<location line="+1"/>
<source>soprano</source>
- <translation>soprano</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">soprano</translation>
</message>
<message>
<location line="+1"/>
<source>mezzosoprano</source>
- <translation>mezzosoprano</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">mezzosoprano</translation>
</message>
<message>
<location line="+1"/>
<source>alto</source>
- <translation>alto</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">alto</translation>
</message>
<message>
<location line="+1"/>
<source>tenor</source>
- <translation>tenor</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">tenor</translation>
</message>
<message>
<location line="+1"/>
<source>baritone</source>
- <translation>baritone</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">baritone</translation>
</message>
<message>
<location line="+1"/>
<source>varbaritone</source>
- <translation>varbaritone</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">varbaritone</translation>
</message>
<message>
<location line="+1"/>
<source>subbass</source>
- <translation>subbass</translation>
+ <comment>Clef name</comment>
+ <translation type="unfinished">subbass</translation>
+ </message>
+ <message>
+ <source>treble</source>
+ <translation type="obsolete">treble</translation>
+ </message>
+ <message>
+ <source>bass</source>
+ <translation type="obsolete">bass</translation>
+ </message>
+ <message>
+ <source>crotales</source>
+ <translation type="obsolete">crotales</translation>
+ </message>
+ <message>
+ <source>xylophone</source>
+ <translation type="obsolete">xylophone</translation>
+ </message>
+ <message>
+ <source>guitar</source>
+ <translation type="obsolete">guitar</translation>
+ </message>
+ <message>
+ <source>contrabass</source>
+ <translation type="obsolete">contrabass</translation>
+ </message>
+ <message>
+ <source>celesta</source>
+ <translation type="obsolete">celesta</translation>
+ </message>
+ <message>
+ <source>old celesta</source>
+ <translation type="obsolete">old celesta</translation>
+ </message>
+ <message>
+ <source>french</source>
+ <translation type="obsolete">french</translation>
+ </message>
+ <message>
+ <source>soprano</source>
+ <translation type="obsolete">soprano</translation>
+ </message>
+ <message>
+ <source>mezzosoprano</source>
+ <translation type="obsolete">mezzosoprano</translation>
+ </message>
+ <message>
+ <source>alto</source>
+ <translation type="obsolete">alto</translation>
+ </message>
+ <message>
+ <source>tenor</source>
+ <translation type="obsolete">tenor</translation>
+ </message>
+ <message>
+ <source>baritone</source>
+ <translation type="obsolete">baritone</translation>
+ </message>
+ <message>
+ <source>varbaritone</source>
+ <translation type="obsolete">varbaritone</translation>
+ </message>
+ <message>
+ <source>subbass</source>
+ <translation type="obsolete">subbass</translation>
</message>
<message>
<location line="+8"/>
@@ -24497,7 +24532,7 @@ Gostaria de configurá-lo agora?</translation>
<translation><qt><p>Novos segmentos serão criados usando esta cor</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Ãudio</translation>
@@ -25370,7 +25405,7 @@ Gostaria de configurá-lo agora?</translation>
<context>
<name>S:</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="-852"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="-802"/>
<location filename="../../src/gui/dialogs/AudioManagerDialog.cpp" line="-20"/>
<location filename="../../src/gui/dialogs/AudioPluginDialog.cpp" line="-9"/>
<location filename="../../src/gui/dialogs/AudioSplitDialog.cpp" line="-14"/>
@@ -25389,14 +25424,14 @@ Gostaria de configurá-lo agora?</translation>
<location filename="../../src/gui/dialogs/TupletDialog.cpp" line="-5"/>
<location filename="../../src/gui/general/PresetHandlerDialog.cpp" line="-6"/>
<location filename="../../src/gui/seqmanager/MidiFilterDialog.cpp" line="-5"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="-59"/>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="-15"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="-39"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="-21"/>
<location filename="../../src/gui/studio/ControlEditorDialog.cpp" line="-6"/>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="-5"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="-4"/>
<location filename="../../src/gui/studio/SynthPluginManagerDialog.cpp" line="-6"/>
<location filename="../../src/gui/editors/eventlist/EventView.cpp" line="+11"/>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="-757"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="-973"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="-758"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="-995"/>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="-7"/>
<location filename="../../src/gui/editors/segment/TriggerSegmentManager.cpp" line="-6"/>
<location filename="../../src/gui/editors/tempo/TempoView.cpp" line="-6"/>
diff --git a/data/locale/rosegarden.ts b/data/locale/rosegarden.ts
index 80e62f4..4ba0c2f 100644
--- a/data/locale/rosegarden.ts
+++ b/data/locale/rosegarden.ts
@@ -358,55 +358,63 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="721"/>
<location filename="../../src/base/Studio.cpp" line="58"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="707"/>
<location filename="../AutoloadStrings.cpp" line="39"/>
<source>Audio</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="684"/>
<location filename="../../src/base/Studio.cpp" line="61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="535"/>
<location filename="../AutoloadStrings.cpp" line="40"/>
<source>Synth plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="133"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="100"/>
<source>Wrong length for int data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="153"/>
- <location filename="../../src/sound/MidiFile.cpp" line="200"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="120"/>
<source>End of MIDI file encountered while reading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="157"/>
- <location filename="../../src/sound/MidiFile.cpp" line="216"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="127"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="178"/>
- <location filename="../../src/sound/MidiFile.cpp" line="236"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="142"/>
<source>Attempt to read past MIDI file end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="525"/>
- <source>Invalid event code found</source>
+ <location filename="../../src/sound/MidiFile.cpp" line="228"/>
+ <source>File corrupted or in non-standard format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="539"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="296"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="301"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/sound/MidiFile.cpp" line="312"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/sound/MidiFile.cpp" line="405"/>
<source>Running status used for first event in track</source>
<translation type="unfinished"></translation>
</message>
@@ -479,17 +487,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/main.cpp" line="791"/>
+ <location filename="../../src/gui/application/main.cpp" line="798"/>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/main.cpp" line="807"/>
+ <location filename="../../src/gui/application/main.cpp" line="814"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/main.cpp" line="808"/>
+ <location filename="../../src/gui/application/main.cpp" line="815"/>
<source><h2>Welcome to Rosegarden!</h2><p>Welcome to the Rosegarden audio and MIDI sequencer and musical notation editor.</p><ul><li>If you have not already done so, you may wish to install some DSSI synth plugins, or a separate synth program such as QSynth. Rosegarden does not synthesize sounds from MIDI on its own, so without these you will hear nothing.</li><li>Rosegarden uses the JACK audio server for recording and playback of audio, and for playback from DSSI synth plugins. These features will only be available if the JACK server is running.</li><li>Rosegarden has comprehensive documentation: see the <a style="color:gold" href="http://rosegardenmusic.com">Rosegarden website</a> for the <a style="color:gold" href="%1">manual</a>, <a style="color:gold" href="http://www.rosegardenmusic.com/tutorials/">tutorials</a>, and other information!</li></ul><p>Rosegarden was brought to you by a team of volunteers across the world. To learn more, go to the <a style="color:gold" href="http://www.rosegardenmusic.com/">Rosegarden website</a>.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -509,9 +517,9 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="643"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="650"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="458"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
@@ -614,20 +622,20 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="789"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="791"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1651"/>
<source>%1 Controller %2 %3</source>
<translation type="unfinished"></translation>
</message>
@@ -657,5053 +665,5053 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="306"/>
- <source>[ %1 ]</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="766"/>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="898"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="716"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="847"/>
<source>%1. %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="30"/>
- <location filename="../QMenuStrings.cpp" line="63"/>
- <location filename="../QMenuStrings.cpp" line="124"/>
- <location filename="../QMenuStrings.cpp" line="173"/>
- <location filename="../QMenuStrings.cpp" line="316"/>
- <location filename="../QMenuStrings.cpp" line="473"/>
- <location filename="../QMenuStrings.cpp" line="1680"/>
- <location filename="../QMenuStrings.cpp" line="1728"/>
- <location filename="../QMenuStrings.cpp" line="1801"/>
- <location filename="../QMenuStrings.cpp" line="3742"/>
- <location filename="../QMenuStrings.cpp" line="4602"/>
- <location filename="../QMenuStrings.cpp" line="4717"/>
+ <location filename="../QMenuStrings.cpp" line="66"/>
+ <location filename="../QMenuStrings.cpp" line="181"/>
+ <location filename="../QMenuStrings.cpp" line="251"/>
+ <location filename="../QMenuStrings.cpp" line="1355"/>
+ <location filename="../QMenuStrings.cpp" line="1495"/>
+ <location filename="../QMenuStrings.cpp" line="1540"/>
+ <location filename="../QMenuStrings.cpp" line="1589"/>
+ <location filename="../QMenuStrings.cpp" line="1831"/>
+ <location filename="../QMenuStrings.cpp" line="1867"/>
+ <location filename="../QMenuStrings.cpp" line="1973"/>
+ <location filename="../QMenuStrings.cpp" line="2720"/>
+ <location filename="../QMenuStrings.cpp" line="2774"/>
<source>&File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="31"/>
+ <location filename="../QMenuStrings.cpp" line="1832"/>
<source>&Add Audio File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="32"/>
+ <location filename="../QMenuStrings.cpp" line="1833"/>
<source>&Export Audio File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="33"/>
- <location filename="../QMenuStrings.cpp" line="64"/>
- <location filename="../QMenuStrings.cpp" line="134"/>
- <location filename="../QMenuStrings.cpp" line="183"/>
- <location filename="../QMenuStrings.cpp" line="317"/>
- <location filename="../QMenuStrings.cpp" line="483"/>
- <location filename="../QMenuStrings.cpp" line="1690"/>
- <location filename="../QMenuStrings.cpp" line="1738"/>
- <location filename="../QMenuStrings.cpp" line="1813"/>
- <location filename="../QMenuStrings.cpp" line="3805"/>
- <location filename="../QMenuStrings.cpp" line="4612"/>
- <location filename="../QMenuStrings.cpp" line="4718"/>
+ <location filename="../QMenuStrings.cpp" line="76"/>
+ <location filename="../QMenuStrings.cpp" line="182"/>
+ <location filename="../QMenuStrings.cpp" line="261"/>
+ <location filename="../QMenuStrings.cpp" line="1365"/>
+ <location filename="../QMenuStrings.cpp" line="1496"/>
+ <location filename="../QMenuStrings.cpp" line="1550"/>
+ <location filename="../QMenuStrings.cpp" line="1599"/>
+ <location filename="../QMenuStrings.cpp" line="1834"/>
+ <location filename="../QMenuStrings.cpp" line="1877"/>
+ <location filename="../QMenuStrings.cpp" line="2036"/>
+ <location filename="../QMenuStrings.cpp" line="2721"/>
+ <location filename="../QMenuStrings.cpp" line="2786"/>
<source>&Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="40"/>
- <location filename="../QMenuStrings.cpp" line="71"/>
- <location filename="../QMenuStrings.cpp" line="141"/>
- <location filename="../QMenuStrings.cpp" line="190"/>
- <location filename="../QMenuStrings.cpp" line="324"/>
- <location filename="../QMenuStrings.cpp" line="490"/>
- <location filename="../QMenuStrings.cpp" line="1697"/>
- <location filename="../QMenuStrings.cpp" line="1745"/>
- <location filename="../QMenuStrings.cpp" line="1820"/>
- <location filename="../QMenuStrings.cpp" line="3812"/>
- <location filename="../QMenuStrings.cpp" line="4619"/>
- <location filename="../QMenuStrings.cpp" line="4725"/>
+ <location filename="../QMenuStrings.cpp" line="83"/>
+ <location filename="../QMenuStrings.cpp" line="189"/>
+ <location filename="../QMenuStrings.cpp" line="268"/>
+ <location filename="../QMenuStrings.cpp" line="1372"/>
+ <location filename="../QMenuStrings.cpp" line="1503"/>
+ <location filename="../QMenuStrings.cpp" line="1557"/>
+ <location filename="../QMenuStrings.cpp" line="1606"/>
+ <location filename="../QMenuStrings.cpp" line="1841"/>
+ <location filename="../QMenuStrings.cpp" line="1884"/>
+ <location filename="../QMenuStrings.cpp" line="2043"/>
+ <location filename="../QMenuStrings.cpp" line="2728"/>
+ <location filename="../QMenuStrings.cpp" line="2793"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="42"/>
- <location filename="../QMenuStrings.cpp" line="73"/>
- <location filename="../QMenuStrings.cpp" line="143"/>
- <location filename="../QMenuStrings.cpp" line="192"/>
- <location filename="../QMenuStrings.cpp" line="326"/>
- <location filename="../QMenuStrings.cpp" line="492"/>
- <location filename="../QMenuStrings.cpp" line="1822"/>
- <location filename="../QMenuStrings.cpp" line="3823"/>
- <location filename="../QMenuStrings.cpp" line="4621"/>
- <location filename="../QMenuStrings.cpp" line="4727"/>
+ <location filename="../QMenuStrings.cpp" line="85"/>
+ <location filename="../QMenuStrings.cpp" line="191"/>
+ <location filename="../QMenuStrings.cpp" line="270"/>
+ <location filename="../QMenuStrings.cpp" line="1374"/>
+ <location filename="../QMenuStrings.cpp" line="1505"/>
+ <location filename="../QMenuStrings.cpp" line="1559"/>
+ <location filename="../QMenuStrings.cpp" line="1843"/>
+ <location filename="../QMenuStrings.cpp" line="2054"/>
+ <location filename="../QMenuStrings.cpp" line="2730"/>
+ <location filename="../QMenuStrings.cpp" line="2795"/>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="43"/>
+ <location filename="../QMenuStrings.cpp" line="1844"/>
<source>&Unload Audio File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="44"/>
+ <location filename="../QMenuStrings.cpp" line="1845"/>
<source>Unload &All Audio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="45"/>
+ <location filename="../QMenuStrings.cpp" line="1846"/>
<source>Unload All Unused Audio &Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="46"/>
+ <location filename="../QMenuStrings.cpp" line="1847"/>
<source>&Delete Unused Audio Files...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="47"/>
+ <location filename="../QMenuStrings.cpp" line="1848"/>
<source>&Action</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="48"/>
+ <location filename="../QMenuStrings.cpp" line="1849"/>
<source>Play Preview</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="49"/>
+ <location filename="../QMenuStrings.cpp" line="1850"/>
<source>Insert into Selected Audio Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="50"/>
+ <location filename="../QMenuStrings.cpp" line="1851"/>
<source>Distribute Audio on MIDI Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="51"/>
- <location filename="../QMenuStrings.cpp" line="110"/>
- <location filename="../QMenuStrings.cpp" line="111"/>
- <location filename="../QMenuStrings.cpp" line="162"/>
- <location filename="../QMenuStrings.cpp" line="163"/>
- <location filename="../QMenuStrings.cpp" line="297"/>
- <location filename="../QMenuStrings.cpp" line="298"/>
- <location filename="../QMenuStrings.cpp" line="349"/>
- <location filename="../QMenuStrings.cpp" line="350"/>
- <location filename="../QMenuStrings.cpp" line="1543"/>
- <location filename="../QMenuStrings.cpp" line="1716"/>
- <location filename="../QMenuStrings.cpp" line="1717"/>
- <location filename="../QMenuStrings.cpp" line="1786"/>
- <location filename="../QMenuStrings.cpp" line="1787"/>
- <location filename="../QMenuStrings.cpp" line="3479"/>
- <location filename="../QMenuStrings.cpp" line="4359"/>
- <location filename="../QMenuStrings.cpp" line="4701"/>
- <location filename="../QMenuStrings.cpp" line="4702"/>
- <location filename="../QMenuStrings.cpp" line="4759"/>
- <location filename="../QMenuStrings.cpp" line="4760"/>
+ <location filename="../QMenuStrings.cpp" line="165"/>
+ <location filename="../QMenuStrings.cpp" line="166"/>
+ <location filename="../QMenuStrings.cpp" line="228"/>
+ <location filename="../QMenuStrings.cpp" line="229"/>
+ <location filename="../QMenuStrings.cpp" line="1321"/>
+ <location filename="../QMenuStrings.cpp" line="1479"/>
+ <location filename="../QMenuStrings.cpp" line="1480"/>
+ <location filename="../QMenuStrings.cpp" line="1528"/>
+ <location filename="../QMenuStrings.cpp" line="1529"/>
+ <location filename="../QMenuStrings.cpp" line="1578"/>
+ <location filename="../QMenuStrings.cpp" line="1579"/>
+ <location filename="../QMenuStrings.cpp" line="1625"/>
+ <location filename="../QMenuStrings.cpp" line="1626"/>
+ <location filename="../QMenuStrings.cpp" line="1852"/>
+ <location filename="../QMenuStrings.cpp" line="1925"/>
+ <location filename="../QMenuStrings.cpp" line="1926"/>
+ <location filename="../QMenuStrings.cpp" line="2590"/>
+ <location filename="../QMenuStrings.cpp" line="2762"/>
+ <location filename="../QMenuStrings.cpp" line="2763"/>
+ <location filename="../QMenuStrings.cpp" line="4453"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="52"/>
+ <location filename="../QMenuStrings.cpp" line="1853"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="59"/>
- <location filename="../QMenuStrings.cpp" line="118"/>
- <location filename="../QMenuStrings.cpp" line="170"/>
- <location filename="../QMenuStrings.cpp" line="305"/>
- <location filename="../QMenuStrings.cpp" line="357"/>
- <location filename="../QMenuStrings.cpp" line="1551"/>
- <location filename="../QMenuStrings.cpp" line="1724"/>
- <location filename="../QMenuStrings.cpp" line="1794"/>
- <location filename="../QMenuStrings.cpp" line="3487"/>
- <location filename="../QMenuStrings.cpp" line="4367"/>
- <location filename="../QMenuStrings.cpp" line="4709"/>
- <location filename="../QMenuStrings.cpp" line="4767"/>
+ <location filename="../QMenuStrings.cpp" line="173"/>
+ <location filename="../QMenuStrings.cpp" line="236"/>
+ <location filename="../QMenuStrings.cpp" line="1329"/>
+ <location filename="../QMenuStrings.cpp" line="1487"/>
+ <location filename="../QMenuStrings.cpp" line="1536"/>
+ <location filename="../QMenuStrings.cpp" line="1586"/>
+ <location filename="../QMenuStrings.cpp" line="1633"/>
+ <location filename="../QMenuStrings.cpp" line="1860"/>
+ <location filename="../QMenuStrings.cpp" line="1933"/>
+ <location filename="../QMenuStrings.cpp" line="2598"/>
+ <location filename="../QMenuStrings.cpp" line="2770"/>
+ <location filename="../QMenuStrings.cpp" line="4461"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="61"/>
- <location filename="../QMenuStrings.cpp" line="120"/>
- <location filename="../QMenuStrings.cpp" line="172"/>
- <location filename="../QMenuStrings.cpp" line="307"/>
- <location filename="../QMenuStrings.cpp" line="359"/>
- <location filename="../QMenuStrings.cpp" line="1555"/>
- <location filename="../QMenuStrings.cpp" line="1726"/>
- <location filename="../QMenuStrings.cpp" line="1796"/>
- <location filename="../QMenuStrings.cpp" line="3491"/>
- <location filename="../QMenuStrings.cpp" line="4371"/>
- <location filename="../QMenuStrings.cpp" line="4711"/>
- <location filename="../QMenuStrings.cpp" line="4769"/>
+ <location filename="../QMenuStrings.cpp" line="175"/>
+ <location filename="../QMenuStrings.cpp" line="238"/>
+ <location filename="../QMenuStrings.cpp" line="1333"/>
+ <location filename="../QMenuStrings.cpp" line="1489"/>
+ <location filename="../QMenuStrings.cpp" line="1538"/>
+ <location filename="../QMenuStrings.cpp" line="1588"/>
+ <location filename="../QMenuStrings.cpp" line="1635"/>
+ <location filename="../QMenuStrings.cpp" line="1862"/>
+ <location filename="../QMenuStrings.cpp" line="1935"/>
+ <location filename="../QMenuStrings.cpp" line="2602"/>
+ <location filename="../QMenuStrings.cpp" line="2772"/>
+ <location filename="../QMenuStrings.cpp" line="4465"/>
<source>&About Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="62"/>
- <location filename="../QMenuStrings.cpp" line="1558"/>
- <location filename="../QMenuStrings.cpp" line="3494"/>
+ <location filename="../QMenuStrings.cpp" line="1336"/>
+ <location filename="../QMenuStrings.cpp" line="1863"/>
+ <location filename="../QMenuStrings.cpp" line="4468"/>
<source>General Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="74"/>
- <location filename="../QMenuStrings.cpp" line="144"/>
- <location filename="../QMenuStrings.cpp" line="193"/>
- <location filename="../QMenuStrings.cpp" line="327"/>
- <location filename="../QMenuStrings.cpp" line="4622"/>
- <location filename="../QMenuStrings.cpp" line="4728"/>
+ <location filename="../QMenuStrings.cpp" line="86"/>
+ <location filename="../QMenuStrings.cpp" line="192"/>
+ <location filename="../QMenuStrings.cpp" line="1375"/>
+ <location filename="../QMenuStrings.cpp" line="1506"/>
+ <location filename="../QMenuStrings.cpp" line="1560"/>
+ <location filename="../QMenuStrings.cpp" line="2731"/>
<source>&Nothing to undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="81"/>
- <location filename="../QMenuStrings.cpp" line="151"/>
- <location filename="../QMenuStrings.cpp" line="200"/>
- <location filename="../QMenuStrings.cpp" line="334"/>
- <location filename="../QMenuStrings.cpp" line="500"/>
- <location filename="../QMenuStrings.cpp" line="1830"/>
- <location filename="../QMenuStrings.cpp" line="3831"/>
- <location filename="../QMenuStrings.cpp" line="4461"/>
- <location filename="../QMenuStrings.cpp" line="4629"/>
- <location filename="../QMenuStrings.cpp" line="4735"/>
+ <location filename="../QMenuStrings.cpp" line="93"/>
+ <location filename="../QMenuStrings.cpp" line="199"/>
+ <location filename="../QMenuStrings.cpp" line="278"/>
+ <location filename="../QMenuStrings.cpp" line="1382"/>
+ <location filename="../QMenuStrings.cpp" line="1513"/>
+ <location filename="../QMenuStrings.cpp" line="1567"/>
+ <location filename="../QMenuStrings.cpp" line="1698"/>
+ <location filename="../QMenuStrings.cpp" line="2062"/>
+ <location filename="../QMenuStrings.cpp" line="2738"/>
+ <location filename="../QMenuStrings.cpp" line="2803"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="83"/>
- <location filename="../QMenuStrings.cpp" line="153"/>
- <location filename="../QMenuStrings.cpp" line="202"/>
- <location filename="../QMenuStrings.cpp" line="336"/>
- <location filename="../QMenuStrings.cpp" line="4631"/>
- <location filename="../QMenuStrings.cpp" line="4737"/>
+ <location filename="../QMenuStrings.cpp" line="95"/>
+ <location filename="../QMenuStrings.cpp" line="201"/>
+ <location filename="../QMenuStrings.cpp" line="1384"/>
+ <location filename="../QMenuStrings.cpp" line="1515"/>
+ <location filename="../QMenuStrings.cpp" line="1569"/>
+ <location filename="../QMenuStrings.cpp" line="2740"/>
<source>N&othing to redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="90"/>
- <location filename="../QMenuStrings.cpp" line="160"/>
- <location filename="../QMenuStrings.cpp" line="209"/>
- <location filename="../QMenuStrings.cpp" line="343"/>
- <location filename="../QMenuStrings.cpp" line="509"/>
- <location filename="../QMenuStrings.cpp" line="1839"/>
- <location filename="../QMenuStrings.cpp" line="3840"/>
- <location filename="../QMenuStrings.cpp" line="4470"/>
- <location filename="../QMenuStrings.cpp" line="4638"/>
- <location filename="../QMenuStrings.cpp" line="4744"/>
+ <location filename="../QMenuStrings.cpp" line="102"/>
+ <location filename="../QMenuStrings.cpp" line="208"/>
+ <location filename="../QMenuStrings.cpp" line="287"/>
+ <location filename="../QMenuStrings.cpp" line="1391"/>
+ <location filename="../QMenuStrings.cpp" line="1522"/>
+ <location filename="../QMenuStrings.cpp" line="1576"/>
+ <location filename="../QMenuStrings.cpp" line="1707"/>
+ <location filename="../QMenuStrings.cpp" line="2071"/>
+ <location filename="../QMenuStrings.cpp" line="2747"/>
+ <location filename="../QMenuStrings.cpp" line="2812"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="92"/>
- <location filename="../QMenuStrings.cpp" line="248"/>
- <location filename="../QMenuStrings.cpp" line="520"/>
- <location filename="../QMenuStrings.cpp" line="1850"/>
- <location filename="../QMenuStrings.cpp" line="3851"/>
- <location filename="../QMenuStrings.cpp" line="4481"/>
+ <location filename="../QMenuStrings.cpp" line="210"/>
+ <location filename="../QMenuStrings.cpp" line="298"/>
+ <location filename="../QMenuStrings.cpp" line="1430"/>
+ <location filename="../QMenuStrings.cpp" line="1718"/>
+ <location filename="../QMenuStrings.cpp" line="2082"/>
+ <location filename="../QMenuStrings.cpp" line="2823"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="99"/>
- <location filename="../QMenuStrings.cpp" line="255"/>
- <location filename="../QMenuStrings.cpp" line="527"/>
- <location filename="../QMenuStrings.cpp" line="1857"/>
- <location filename="../QMenuStrings.cpp" line="3858"/>
- <location filename="../QMenuStrings.cpp" line="4488"/>
+ <location filename="../QMenuStrings.cpp" line="217"/>
+ <location filename="../QMenuStrings.cpp" line="305"/>
+ <location filename="../QMenuStrings.cpp" line="1437"/>
+ <location filename="../QMenuStrings.cpp" line="1725"/>
+ <location filename="../QMenuStrings.cpp" line="2089"/>
+ <location filename="../QMenuStrings.cpp" line="2830"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="101"/>
- <location filename="../QMenuStrings.cpp" line="257"/>
- <location filename="../QMenuStrings.cpp" line="529"/>
- <location filename="../QMenuStrings.cpp" line="1859"/>
- <location filename="../QMenuStrings.cpp" line="3860"/>
- <location filename="../QMenuStrings.cpp" line="4490"/>
+ <location filename="../QMenuStrings.cpp" line="219"/>
+ <location filename="../QMenuStrings.cpp" line="307"/>
+ <location filename="../QMenuStrings.cpp" line="1439"/>
+ <location filename="../QMenuStrings.cpp" line="1727"/>
+ <location filename="../QMenuStrings.cpp" line="2091"/>
+ <location filename="../QMenuStrings.cpp" line="2832"/>
<source>&Paste</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="108"/>
- <location filename="../QMenuStrings.cpp" line="264"/>
- <location filename="../QMenuStrings.cpp" line="536"/>
- <location filename="../QMenuStrings.cpp" line="1866"/>
- <location filename="../QMenuStrings.cpp" line="3867"/>
- <location filename="../QMenuStrings.cpp" line="4497"/>
+ <location filename="../QMenuStrings.cpp" line="226"/>
+ <location filename="../QMenuStrings.cpp" line="314"/>
+ <location filename="../QMenuStrings.cpp" line="1446"/>
+ <location filename="../QMenuStrings.cpp" line="1734"/>
+ <location filename="../QMenuStrings.cpp" line="2098"/>
+ <location filename="../QMenuStrings.cpp" line="2839"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="121"/>
- <location filename="../QMenuStrings.cpp" line="313"/>
- <location filename="../QMenuStrings.cpp" line="365"/>
- <location filename="../QMenuStrings.cpp" line="401"/>
- <location filename="../QMenuStrings.cpp" line="437"/>
- <location filename="../QMenuStrings.cpp" line="1563"/>
- <location filename="../QMenuStrings.cpp" line="1635"/>
- <location filename="../QMenuStrings.cpp" line="1798"/>
- <location filename="../QMenuStrings.cpp" line="3728"/>
- <location filename="../QMenuStrings.cpp" line="4591"/>
- <location filename="../QMenuStrings.cpp" line="4714"/>
+ <location filename="../QMenuStrings.cpp" line="30"/>
+ <location filename="../QMenuStrings.cpp" line="178"/>
+ <location filename="../QMenuStrings.cpp" line="1341"/>
+ <location filename="../QMenuStrings.cpp" line="1828"/>
+ <location filename="../QMenuStrings.cpp" line="1864"/>
+ <location filename="../QMenuStrings.cpp" line="1937"/>
+ <location filename="../QMenuStrings.cpp" line="2631"/>
+ <location filename="../QMenuStrings.cpp" line="4694"/>
+ <location filename="../QMenuStrings.cpp" line="4697"/>
+ <location filename="../QMenuStrings.cpp" line="4700"/>
+ <location filename="../QMenuStrings.cpp" line="4736"/>
<source>Switch to Select Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="122"/>
- <location filename="../QMenuStrings.cpp" line="314"/>
- <location filename="../QMenuStrings.cpp" line="4592"/>
- <location filename="../QMenuStrings.cpp" line="4715"/>
+ <location filename="../QMenuStrings.cpp" line="179"/>
+ <location filename="../QMenuStrings.cpp" line="1865"/>
+ <location filename="../QMenuStrings.cpp" line="4695"/>
+ <location filename="../QMenuStrings.cpp" line="4698"/>
<source>Switch to Inserting Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="123"/>
- <location filename="../QMenuStrings.cpp" line="315"/>
- <location filename="../QMenuStrings.cpp" line="419"/>
- <location filename="../QMenuStrings.cpp" line="455"/>
- <location filename="../QMenuStrings.cpp" line="1590"/>
- <location filename="../QMenuStrings.cpp" line="1617"/>
- <location filename="../QMenuStrings.cpp" line="1653"/>
- <location filename="../QMenuStrings.cpp" line="3717"/>
- <location filename="../QMenuStrings.cpp" line="3729"/>
- <location filename="../QMenuStrings.cpp" line="4593"/>
- <location filename="../QMenuStrings.cpp" line="4716"/>
+ <location filename="../QMenuStrings.cpp" line="48"/>
+ <location filename="../QMenuStrings.cpp" line="180"/>
+ <location filename="../QMenuStrings.cpp" line="240"/>
+ <location filename="../QMenuStrings.cpp" line="1342"/>
+ <location filename="../QMenuStrings.cpp" line="1866"/>
+ <location filename="../QMenuStrings.cpp" line="1955"/>
+ <location filename="../QMenuStrings.cpp" line="2649"/>
+ <location filename="../QMenuStrings.cpp" line="2702"/>
+ <location filename="../QMenuStrings.cpp" line="4696"/>
+ <location filename="../QMenuStrings.cpp" line="4699"/>
+ <location filename="../QMenuStrings.cpp" line="4727"/>
<source>Switch to Erase Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="125"/>
- <location filename="../QMenuStrings.cpp" line="174"/>
- <location filename="../QMenuStrings.cpp" line="474"/>
- <location filename="../QMenuStrings.cpp" line="1681"/>
- <location filename="../QMenuStrings.cpp" line="1729"/>
- <location filename="../QMenuStrings.cpp" line="1802"/>
- <location filename="../QMenuStrings.cpp" line="3781"/>
- <location filename="../QMenuStrings.cpp" line="4603"/>
+ <location filename="../QMenuStrings.cpp" line="67"/>
+ <location filename="../QMenuStrings.cpp" line="252"/>
+ <location filename="../QMenuStrings.cpp" line="1356"/>
+ <location filename="../QMenuStrings.cpp" line="1541"/>
+ <location filename="../QMenuStrings.cpp" line="1590"/>
+ <location filename="../QMenuStrings.cpp" line="1868"/>
+ <location filename="../QMenuStrings.cpp" line="2012"/>
+ <location filename="../QMenuStrings.cpp" line="2775"/>
<source>&Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="132"/>
- <location filename="../QMenuStrings.cpp" line="181"/>
- <location filename="../QMenuStrings.cpp" line="481"/>
- <location filename="../QMenuStrings.cpp" line="1688"/>
- <location filename="../QMenuStrings.cpp" line="1736"/>
- <location filename="../QMenuStrings.cpp" line="1809"/>
- <location filename="../QMenuStrings.cpp" line="3788"/>
- <location filename="../QMenuStrings.cpp" line="4610"/>
+ <location filename="../QMenuStrings.cpp" line="74"/>
+ <location filename="../QMenuStrings.cpp" line="259"/>
+ <location filename="../QMenuStrings.cpp" line="1363"/>
+ <location filename="../QMenuStrings.cpp" line="1548"/>
+ <location filename="../QMenuStrings.cpp" line="1597"/>
+ <location filename="../QMenuStrings.cpp" line="1875"/>
+ <location filename="../QMenuStrings.cpp" line="2019"/>
+ <location filename="../QMenuStrings.cpp" line="2782"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="211"/>
+ <location filename="../QMenuStrings.cpp" line="1393"/>
<source>&Insert Event</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="218"/>
- <location filename="../QMenuStrings.cpp" line="1350"/>
- <location filename="../QMenuStrings.cpp" line="3258"/>
- <location filename="../QMenuStrings.cpp" line="4081"/>
- <location filename="../QMenuStrings.cpp" line="4452"/>
- <location filename="../QMenuStrings.cpp" line="4647"/>
+ <location filename="../QMenuStrings.cpp" line="111"/>
+ <location filename="../QMenuStrings.cpp" line="1128"/>
+ <location filename="../QMenuStrings.cpp" line="1400"/>
+ <location filename="../QMenuStrings.cpp" line="1689"/>
+ <location filename="../QMenuStrings.cpp" line="2312"/>
+ <location filename="../QMenuStrings.cpp" line="4232"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="220"/>
+ <location filename="../QMenuStrings.cpp" line="1402"/>
<source>&Delete Event</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="227"/>
- <location filename="../QMenuStrings.cpp" line="1893"/>
- <location filename="../QMenuStrings.cpp" line="3885"/>
- <location filename="../QMenuStrings.cpp" line="4506"/>
+ <location filename="../QMenuStrings.cpp" line="1409"/>
+ <location filename="../QMenuStrings.cpp" line="1743"/>
+ <location filename="../QMenuStrings.cpp" line="2116"/>
+ <location filename="../QMenuStrings.cpp" line="2866"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="229"/>
+ <location filename="../QMenuStrings.cpp" line="1411"/>
<source>&Edit Event</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="236"/>
- <location filename="../QMenuStrings.cpp" line="1287"/>
- <location filename="../QMenuStrings.cpp" line="3195"/>
- <location filename="../QMenuStrings.cpp" line="4072"/>
- <location filename="../QMenuStrings.cpp" line="4443"/>
- <location filename="../QMenuStrings.cpp" line="4674"/>
+ <location filename="../QMenuStrings.cpp" line="138"/>
+ <location filename="../QMenuStrings.cpp" line="1065"/>
+ <location filename="../QMenuStrings.cpp" line="1418"/>
+ <location filename="../QMenuStrings.cpp" line="1680"/>
+ <location filename="../QMenuStrings.cpp" line="2303"/>
+ <location filename="../QMenuStrings.cpp" line="4169"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="238"/>
+ <location filename="../QMenuStrings.cpp" line="1420"/>
<source>&Advanced Event Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="239"/>
- <location filename="../QMenuStrings.cpp" line="511"/>
- <location filename="../QMenuStrings.cpp" line="1841"/>
- <location filename="../QMenuStrings.cpp" line="3842"/>
- <location filename="../QMenuStrings.cpp" line="4472"/>
+ <location filename="../QMenuStrings.cpp" line="289"/>
+ <location filename="../QMenuStrings.cpp" line="1421"/>
+ <location filename="../QMenuStrings.cpp" line="1709"/>
+ <location filename="../QMenuStrings.cpp" line="2073"/>
+ <location filename="../QMenuStrings.cpp" line="2814"/>
<source>Cu&t</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="246"/>
- <location filename="../QMenuStrings.cpp" line="518"/>
- <location filename="../QMenuStrings.cpp" line="1848"/>
- <location filename="../QMenuStrings.cpp" line="3849"/>
- <location filename="../QMenuStrings.cpp" line="4479"/>
+ <location filename="../QMenuStrings.cpp" line="296"/>
+ <location filename="../QMenuStrings.cpp" line="1428"/>
+ <location filename="../QMenuStrings.cpp" line="1716"/>
+ <location filename="../QMenuStrings.cpp" line="2080"/>
+ <location filename="../QMenuStrings.cpp" line="2821"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="266"/>
+ <location filename="../QMenuStrings.cpp" line="1448"/>
<source>&Select All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="273"/>
- <location filename="../QMenuStrings.cpp" line="554"/>
- <location filename="../QMenuStrings.cpp" line="1908"/>
- <location filename="../QMenuStrings.cpp" line="3932"/>
- <location filename="../QMenuStrings.cpp" line="4683"/>
+ <location filename="../QMenuStrings.cpp" line="147"/>
+ <location filename="../QMenuStrings.cpp" line="332"/>
+ <location filename="../QMenuStrings.cpp" line="1455"/>
+ <location filename="../QMenuStrings.cpp" line="2163"/>
+ <location filename="../QMenuStrings.cpp" line="2881"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="275"/>
- <location filename="../QMenuStrings.cpp" line="556"/>
+ <location filename="../QMenuStrings.cpp" line="334"/>
+ <location filename="../QMenuStrings.cpp" line="1457"/>
<source>C&lear Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="282"/>
- <location filename="../QMenuStrings.cpp" line="563"/>
- <location filename="../QMenuStrings.cpp" line="1917"/>
- <location filename="../QMenuStrings.cpp" line="4692"/>
+ <location filename="../QMenuStrings.cpp" line="156"/>
+ <location filename="../QMenuStrings.cpp" line="341"/>
+ <location filename="../QMenuStrings.cpp" line="1464"/>
+ <location filename="../QMenuStrings.cpp" line="2890"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="565"/>
- <location filename="../QMenuStrings.cpp" line="1928"/>
+ <location filename="../QMenuStrings.cpp" line="343"/>
+ <location filename="../QMenuStrings.cpp" line="2901"/>
<source>&Filter Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="572"/>
- <location filename="../QMenuStrings.cpp" line="1935"/>
+ <location filename="../QMenuStrings.cpp" line="350"/>
+ <location filename="../QMenuStrings.cpp" line="2908"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="284"/>
+ <location filename="../QMenuStrings.cpp" line="1466"/>
<source>Set Se&gment Start Time...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="285"/>
+ <location filename="../QMenuStrings.cpp" line="1467"/>
<source>Set Seg&ment Duration...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="286"/>
- <location filename="../QMenuStrings.cpp" line="574"/>
+ <location filename="../QMenuStrings.cpp" line="352"/>
+ <location filename="../QMenuStrings.cpp" line="1468"/>
<source>Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="287"/>
- <location filename="../QMenuStrings.cpp" line="345"/>
- <location filename="../QMenuStrings.cpp" line="575"/>
- <location filename="../QMenuStrings.cpp" line="1939"/>
- <location filename="../QMenuStrings.cpp" line="3935"/>
- <location filename="../QMenuStrings.cpp" line="4695"/>
- <location filename="../QMenuStrings.cpp" line="4755"/>
+ <location filename="../QMenuStrings.cpp" line="159"/>
+ <location filename="../QMenuStrings.cpp" line="353"/>
+ <location filename="../QMenuStrings.cpp" line="1469"/>
+ <location filename="../QMenuStrings.cpp" line="1524"/>
+ <location filename="../QMenuStrings.cpp" line="2166"/>
+ <location filename="../QMenuStrings.cpp" line="2758"/>
+ <location filename="../QMenuStrings.cpp" line="2912"/>
<source>&View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="288"/>
- <location filename="../QMenuStrings.cpp" line="346"/>
- <location filename="../QMenuStrings.cpp" line="4696"/>
- <location filename="../QMenuStrings.cpp" line="4756"/>
+ <location filename="../QMenuStrings.cpp" line="160"/>
+ <location filename="../QMenuStrings.cpp" line="1470"/>
+ <location filename="../QMenuStrings.cpp" line="1525"/>
+ <location filename="../QMenuStrings.cpp" line="2759"/>
<source>&Musical Times</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="289"/>
- <location filename="../QMenuStrings.cpp" line="347"/>
- <location filename="../QMenuStrings.cpp" line="4697"/>
- <location filename="../QMenuStrings.cpp" line="4757"/>
+ <location filename="../QMenuStrings.cpp" line="161"/>
+ <location filename="../QMenuStrings.cpp" line="1471"/>
+ <location filename="../QMenuStrings.cpp" line="1526"/>
+ <location filename="../QMenuStrings.cpp" line="2760"/>
<source>&Real Times</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="290"/>
- <location filename="../QMenuStrings.cpp" line="348"/>
- <location filename="../QMenuStrings.cpp" line="4698"/>
- <location filename="../QMenuStrings.cpp" line="4758"/>
+ <location filename="../QMenuStrings.cpp" line="162"/>
+ <location filename="../QMenuStrings.cpp" line="1472"/>
+ <location filename="../QMenuStrings.cpp" line="1527"/>
+ <location filename="../QMenuStrings.cpp" line="2761"/>
<source>Ra&w Times</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="291"/>
- <location filename="../QMenuStrings.cpp" line="656"/>
- <location filename="../QMenuStrings.cpp" line="1949"/>
- <location filename="../QMenuStrings.cpp" line="3938"/>
+ <location filename="../QMenuStrings.cpp" line="434"/>
+ <location filename="../QMenuStrings.cpp" line="1473"/>
+ <location filename="../QMenuStrings.cpp" line="2169"/>
+ <location filename="../QMenuStrings.cpp" line="2922"/>
<source>Show Main &Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="292"/>
- <location filename="../QMenuStrings.cpp" line="661"/>
- <location filename="../QMenuStrings.cpp" line="1962"/>
- <location filename="../QMenuStrings.cpp" line="3969"/>
+ <location filename="../QMenuStrings.cpp" line="439"/>
+ <location filename="../QMenuStrings.cpp" line="1474"/>
+ <location filename="../QMenuStrings.cpp" line="2200"/>
+ <location filename="../QMenuStrings.cpp" line="2935"/>
<source>Show St&atusbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="293"/>
- <location filename="../QMenuStrings.cpp" line="690"/>
- <location filename="../QMenuStrings.cpp" line="1978"/>
- <location filename="../QMenuStrings.cpp" line="4018"/>
+ <location filename="../QMenuStrings.cpp" line="468"/>
+ <location filename="../QMenuStrings.cpp" line="1475"/>
+ <location filename="../QMenuStrings.cpp" line="2249"/>
+ <location filename="../QMenuStrings.cpp" line="2952"/>
<source>Se&gment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="294"/>
- <location filename="../QMenuStrings.cpp" line="691"/>
- <location filename="../QMenuStrings.cpp" line="1979"/>
- <location filename="../QMenuStrings.cpp" line="4028"/>
+ <location filename="../QMenuStrings.cpp" line="469"/>
+ <location filename="../QMenuStrings.cpp" line="1476"/>
+ <location filename="../QMenuStrings.cpp" line="2259"/>
+ <location filename="../QMenuStrings.cpp" line="2953"/>
<source>Edit &With</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="295"/>
- <location filename="../QMenuStrings.cpp" line="694"/>
- <location filename="../QMenuStrings.cpp" line="1981"/>
- <location filename="../QMenuStrings.cpp" line="4038"/>
- <location filename="../QMenuStrings.cpp" line="4409"/>
+ <location filename="../QMenuStrings.cpp" line="472"/>
+ <location filename="../QMenuStrings.cpp" line="1477"/>
+ <location filename="../QMenuStrings.cpp" line="1646"/>
+ <location filename="../QMenuStrings.cpp" line="2269"/>
+ <location filename="../QMenuStrings.cpp" line="2955"/>
<source>Open in Matri&x Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="296"/>
- <location filename="../QMenuStrings.cpp" line="693"/>
- <location filename="../QMenuStrings.cpp" line="4056"/>
- <location filename="../QMenuStrings.cpp" line="4427"/>
+ <location filename="../QMenuStrings.cpp" line="471"/>
+ <location filename="../QMenuStrings.cpp" line="1478"/>
+ <location filename="../QMenuStrings.cpp" line="1664"/>
+ <location filename="../QMenuStrings.cpp" line="2287"/>
<source>Open in &Notation Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="308"/>
- <location filename="../QMenuStrings.cpp" line="311"/>
- <location filename="../QMenuStrings.cpp" line="1561"/>
- <location filename="../QMenuStrings.cpp" line="4712"/>
+ <location filename="../QMenuStrings.cpp" line="176"/>
+ <location filename="../QMenuStrings.cpp" line="1339"/>
+ <location filename="../QMenuStrings.cpp" line="1490"/>
+ <location filename="../QMenuStrings.cpp" line="1493"/>
<source>Actions Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="309"/>
- <location filename="../QMenuStrings.cpp" line="360"/>
- <location filename="../QMenuStrings.cpp" line="4713"/>
- <location filename="../QMenuStrings.cpp" line="4770"/>
+ <location filename="../QMenuStrings.cpp" line="177"/>
+ <location filename="../QMenuStrings.cpp" line="1491"/>
+ <location filename="../QMenuStrings.cpp" line="1539"/>
+ <location filename="../QMenuStrings.cpp" line="2773"/>
<source>Time Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="310"/>
- <location filename="../QMenuStrings.cpp" line="1560"/>
- <location filename="../QMenuStrings.cpp" line="1727"/>
- <location filename="../QMenuStrings.cpp" line="1797"/>
- <location filename="../QMenuStrings.cpp" line="3496"/>
- <location filename="../QMenuStrings.cpp" line="4380"/>
+ <location filename="../QMenuStrings.cpp" line="1338"/>
+ <location filename="../QMenuStrings.cpp" line="1492"/>
+ <location filename="../QMenuStrings.cpp" line="1636"/>
+ <location filename="../QMenuStrings.cpp" line="1936"/>
+ <location filename="../QMenuStrings.cpp" line="2611"/>
+ <location filename="../QMenuStrings.cpp" line="4470"/>
<source>Transport Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="312"/>
- <location filename="../QMenuStrings.cpp" line="4399"/>
+ <location filename="../QMenuStrings.cpp" line="1494"/>
+ <location filename="../QMenuStrings.cpp" line="2630"/>
<source>Zoom Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3686"/>
+ <location filename="../QMenuStrings.cpp" line="4660"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3687"/>
+ <location filename="../QMenuStrings.cpp" line="4661"/>
<source>&Interpret Active Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3688"/>
+ <location filename="../QMenuStrings.cpp" line="4662"/>
<source>Interpret &Text Dynamics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3693"/>
+ <location filename="../QMenuStrings.cpp" line="4667"/>
<source>Adjust velocity to follow text dynamics (f, p, mf...)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3695"/>
+ <location filename="../QMenuStrings.cpp" line="4669"/>
<source>Interpret &Hairpins</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3700"/>
+ <location filename="../QMenuStrings.cpp" line="4674"/>
<source>Adjust velocity to follow hairpin dynamics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3702"/>
+ <location filename="../QMenuStrings.cpp" line="4676"/>
<source>Interpret &Slurs and Marks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3707"/>
+ <location filename="../QMenuStrings.cpp" line="4681"/>
<source>Articulate slurs, staccato, tenuto, etc.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3709"/>
+ <location filename="../QMenuStrings.cpp" line="4683"/>
<source>Interpret &Beats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3714"/>
+ <location filename="../QMenuStrings.cpp" line="4688"/>
<source>Place accents on certain beats according to the time signature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="361"/>
+ <location filename="../QMenuStrings.cpp" line="4690"/>
<source>Insert Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="362"/>
+ <location filename="../QMenuStrings.cpp" line="4691"/>
<source>Insert Marker at Playback Position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="363"/>
+ <location filename="../QMenuStrings.cpp" line="4692"/>
<source>Delete Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="364"/>
+ <location filename="../QMenuStrings.cpp" line="4693"/>
<source>Edit Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="372"/>
- <location filename="../QMenuStrings.cpp" line="408"/>
- <location filename="../QMenuStrings.cpp" line="444"/>
- <location filename="../QMenuStrings.cpp" line="1015"/>
- <location filename="../QMenuStrings.cpp" line="1570"/>
- <location filename="../QMenuStrings.cpp" line="1642"/>
- <location filename="../QMenuStrings.cpp" line="2808"/>
- <location filename="../QMenuStrings.cpp" line="4239"/>
- <location filename="../QMenuStrings.cpp" line="4544"/>
+ <location filename="../QMenuStrings.cpp" line="37"/>
+ <location filename="../QMenuStrings.cpp" line="793"/>
+ <location filename="../QMenuStrings.cpp" line="1781"/>
+ <location filename="../QMenuStrings.cpp" line="1944"/>
+ <location filename="../QMenuStrings.cpp" line="2470"/>
+ <location filename="../QMenuStrings.cpp" line="2638"/>
+ <location filename="../QMenuStrings.cpp" line="3782"/>
+ <location filename="../QMenuStrings.cpp" line="4707"/>
+ <location filename="../QMenuStrings.cpp" line="4743"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="374"/>
- <location filename="../QMenuStrings.cpp" line="446"/>
- <location filename="../QMenuStrings.cpp" line="1572"/>
- <location filename="../QMenuStrings.cpp" line="1608"/>
- <location filename="../QMenuStrings.cpp" line="1662"/>
+ <location filename="../QMenuStrings.cpp" line="1946"/>
+ <location filename="../QMenuStrings.cpp" line="2658"/>
+ <location filename="../QMenuStrings.cpp" line="2693"/>
+ <location filename="../QMenuStrings.cpp" line="4709"/>
+ <location filename="../QMenuStrings.cpp" line="4745"/>
<source>Switch to Move Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="381"/>
- <location filename="../QMenuStrings.cpp" line="453"/>
- <location filename="../QMenuStrings.cpp" line="1042"/>
- <location filename="../QMenuStrings.cpp" line="1579"/>
- <location filename="../QMenuStrings.cpp" line="1615"/>
- <location filename="../QMenuStrings.cpp" line="1669"/>
- <location filename="../QMenuStrings.cpp" line="4266"/>
- <location filename="../QMenuStrings.cpp" line="4553"/>
+ <location filename="../QMenuStrings.cpp" line="820"/>
+ <location filename="../QMenuStrings.cpp" line="1790"/>
+ <location filename="../QMenuStrings.cpp" line="1953"/>
+ <location filename="../QMenuStrings.cpp" line="2497"/>
+ <location filename="../QMenuStrings.cpp" line="2665"/>
+ <location filename="../QMenuStrings.cpp" line="2700"/>
+ <location filename="../QMenuStrings.cpp" line="4716"/>
+ <location filename="../QMenuStrings.cpp" line="4752"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="383"/>
- <location filename="../QMenuStrings.cpp" line="410"/>
- <location filename="../QMenuStrings.cpp" line="1581"/>
- <location filename="../QMenuStrings.cpp" line="1599"/>
- <location filename="../QMenuStrings.cpp" line="1644"/>
+ <location filename="../QMenuStrings.cpp" line="39"/>
+ <location filename="../QMenuStrings.cpp" line="2640"/>
+ <location filename="../QMenuStrings.cpp" line="2684"/>
+ <location filename="../QMenuStrings.cpp" line="4718"/>
+ <location filename="../QMenuStrings.cpp" line="4754"/>
<source>Switch to Draw Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="390"/>
- <location filename="../QMenuStrings.cpp" line="417"/>
- <location filename="../QMenuStrings.cpp" line="1024"/>
- <location filename="../QMenuStrings.cpp" line="1588"/>
- <location filename="../QMenuStrings.cpp" line="1606"/>
- <location filename="../QMenuStrings.cpp" line="1651"/>
- <location filename="../QMenuStrings.cpp" line="2818"/>
- <location filename="../QMenuStrings.cpp" line="4248"/>
- <location filename="../QMenuStrings.cpp" line="4562"/>
+ <location filename="../QMenuStrings.cpp" line="46"/>
+ <location filename="../QMenuStrings.cpp" line="802"/>
+ <location filename="../QMenuStrings.cpp" line="1799"/>
+ <location filename="../QMenuStrings.cpp" line="2479"/>
+ <location filename="../QMenuStrings.cpp" line="2647"/>
+ <location filename="../QMenuStrings.cpp" line="2691"/>
+ <location filename="../QMenuStrings.cpp" line="3792"/>
+ <location filename="../QMenuStrings.cpp" line="4725"/>
+ <location filename="../QMenuStrings.cpp" line="4761"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="392"/>
- <location filename="../QMenuStrings.cpp" line="428"/>
- <location filename="../QMenuStrings.cpp" line="464"/>
- <location filename="../QMenuStrings.cpp" line="1626"/>
- <location filename="../QMenuStrings.cpp" line="1671"/>
+ <location filename="../QMenuStrings.cpp" line="57"/>
+ <location filename="../QMenuStrings.cpp" line="1964"/>
+ <location filename="../QMenuStrings.cpp" line="2667"/>
+ <location filename="../QMenuStrings.cpp" line="2711"/>
+ <location filename="../QMenuStrings.cpp" line="4763"/>
<source>Switch to Resize Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="399"/>
- <location filename="../QMenuStrings.cpp" line="435"/>
- <location filename="../QMenuStrings.cpp" line="471"/>
- <location filename="../QMenuStrings.cpp" line="1051"/>
- <location filename="../QMenuStrings.cpp" line="1633"/>
- <location filename="../QMenuStrings.cpp" line="1678"/>
- <location filename="../QMenuStrings.cpp" line="4275"/>
- <location filename="../QMenuStrings.cpp" line="4580"/>
+ <location filename="../QMenuStrings.cpp" line="64"/>
+ <location filename="../QMenuStrings.cpp" line="829"/>
+ <location filename="../QMenuStrings.cpp" line="1817"/>
+ <location filename="../QMenuStrings.cpp" line="1971"/>
+ <location filename="../QMenuStrings.cpp" line="2506"/>
+ <location filename="../QMenuStrings.cpp" line="2674"/>
+ <location filename="../QMenuStrings.cpp" line="2718"/>
+ <location filename="../QMenuStrings.cpp" line="4770"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="426"/>
- <location filename="../QMenuStrings.cpp" line="462"/>
- <location filename="../QMenuStrings.cpp" line="1033"/>
- <location filename="../QMenuStrings.cpp" line="1597"/>
- <location filename="../QMenuStrings.cpp" line="1624"/>
- <location filename="../QMenuStrings.cpp" line="1660"/>
- <location filename="../QMenuStrings.cpp" line="2827"/>
- <location filename="../QMenuStrings.cpp" line="4257"/>
- <location filename="../QMenuStrings.cpp" line="4571"/>
+ <location filename="../QMenuStrings.cpp" line="55"/>
+ <location filename="../QMenuStrings.cpp" line="811"/>
+ <location filename="../QMenuStrings.cpp" line="1808"/>
+ <location filename="../QMenuStrings.cpp" line="1962"/>
+ <location filename="../QMenuStrings.cpp" line="2488"/>
+ <location filename="../QMenuStrings.cpp" line="2656"/>
+ <location filename="../QMenuStrings.cpp" line="2709"/>
+ <location filename="../QMenuStrings.cpp" line="3801"/>
+ <location filename="../QMenuStrings.cpp" line="4734"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="538"/>
- <location filename="../QMenuStrings.cpp" line="3878"/>
- <location filename="../QMenuStrings.cpp" line="4499"/>
- <location filename="../QMenuStrings.cpp" line="4658"/>
+ <location filename="../QMenuStrings.cpp" line="122"/>
+ <location filename="../QMenuStrings.cpp" line="316"/>
+ <location filename="../QMenuStrings.cpp" line="1736"/>
+ <location filename="../QMenuStrings.cpp" line="2109"/>
<source>&Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="545"/>
- <location filename="../QMenuStrings.cpp" line="4665"/>
+ <location filename="../QMenuStrings.cpp" line="129"/>
+ <location filename="../QMenuStrings.cpp" line="323"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="547"/>
+ <location filename="../QMenuStrings.cpp" line="325"/>
<source>Select &All Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="861"/>
- <location filename="../QMenuStrings.cpp" line="2585"/>
+ <location filename="../QMenuStrings.cpp" line="639"/>
+ <location filename="../QMenuStrings.cpp" line="3559"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="576"/>
+ <location filename="../QMenuStrings.cpp" line="354"/>
<source>&Grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="577"/>
+ <location filename="../QMenuStrings.cpp" line="355"/>
<source>&No Snap</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="578"/>
+ <location filename="../QMenuStrings.cpp" line="356"/>
<source>&Snap to 1/64</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="585"/>
- <location filename="../QMenuStrings.cpp" line="2935"/>
+ <location filename="../QMenuStrings.cpp" line="363"/>
+ <location filename="../QMenuStrings.cpp" line="3909"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="587"/>
+ <location filename="../QMenuStrings.cpp" line="365"/>
<source>Snap to &1/48</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="588"/>
+ <location filename="../QMenuStrings.cpp" line="366"/>
<source>Sn&ap to 1/32</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="595"/>
- <location filename="../QMenuStrings.cpp" line="2926"/>
+ <location filename="../QMenuStrings.cpp" line="373"/>
+ <location filename="../QMenuStrings.cpp" line="3900"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="597"/>
+ <location filename="../QMenuStrings.cpp" line="375"/>
<source>Snap to 1/&24</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="598"/>
+ <location filename="../QMenuStrings.cpp" line="376"/>
<source>Sna&p to 1/16</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="605"/>
- <location filename="../QMenuStrings.cpp" line="2917"/>
+ <location filename="../QMenuStrings.cpp" line="383"/>
+ <location filename="../QMenuStrings.cpp" line="3891"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="607"/>
+ <location filename="../QMenuStrings.cpp" line="385"/>
<source>Snap t&o 1/12</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="608"/>
+ <location filename="../QMenuStrings.cpp" line="386"/>
<source>Snap to 1/&8</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="615"/>
- <location filename="../QMenuStrings.cpp" line="2908"/>
+ <location filename="../QMenuStrings.cpp" line="393"/>
+ <location filename="../QMenuStrings.cpp" line="3882"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="617"/>
+ <location filename="../QMenuStrings.cpp" line="395"/>
<source>Snap to &3/16</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="618"/>
+ <location filename="../QMenuStrings.cpp" line="396"/>
<source>Snap to 1/4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="625"/>
- <location filename="../QMenuStrings.cpp" line="2899"/>
+ <location filename="../QMenuStrings.cpp" line="403"/>
+ <location filename="../QMenuStrings.cpp" line="3873"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="627"/>
+ <location filename="../QMenuStrings.cpp" line="405"/>
<source>Snap to 3/8</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="628"/>
+ <location filename="../QMenuStrings.cpp" line="406"/>
<source>Snap to 1/2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="635"/>
- <location filename="../QMenuStrings.cpp" line="2890"/>
+ <location filename="../QMenuStrings.cpp" line="413"/>
+ <location filename="../QMenuStrings.cpp" line="3864"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="637"/>
+ <location filename="../QMenuStrings.cpp" line="415"/>
<source>Snap to Bea&t</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="644"/>
- <location filename="../QMenuStrings.cpp" line="2881"/>
+ <location filename="../QMenuStrings.cpp" line="422"/>
+ <location filename="../QMenuStrings.cpp" line="3855"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="646"/>
+ <location filename="../QMenuStrings.cpp" line="424"/>
<source>Snap to &Bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="653"/>
- <location filename="../QMenuStrings.cpp" line="2872"/>
+ <location filename="../QMenuStrings.cpp" line="431"/>
+ <location filename="../QMenuStrings.cpp" line="3846"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="655"/>
- <location filename="../QMenuStrings.cpp" line="1948"/>
- <location filename="../QMenuStrings.cpp" line="3937"/>
+ <location filename="../QMenuStrings.cpp" line="433"/>
+ <location filename="../QMenuStrings.cpp" line="2168"/>
+ <location filename="../QMenuStrings.cpp" line="2921"/>
<source>&Toolbars</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="657"/>
+ <location filename="../QMenuStrings.cpp" line="435"/>
<source>Show To&ols</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="658"/>
+ <location filename="../QMenuStrings.cpp" line="436"/>
<source>Show T&ransport Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="659"/>
+ <location filename="../QMenuStrings.cpp" line="437"/>
<source>Show A&ctions Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="660"/>
+ <location filename="../QMenuStrings.cpp" line="438"/>
<source>Show R&ulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="662"/>
- <location filename="../QMenuStrings.cpp" line="1963"/>
- <location filename="../QMenuStrings.cpp" line="3944"/>
+ <location filename="../QMenuStrings.cpp" line="440"/>
+ <location filename="../QMenuStrings.cpp" line="2175"/>
+ <location filename="../QMenuStrings.cpp" line="2936"/>
<source>&Rulers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="663"/>
- <location filename="../QMenuStrings.cpp" line="1964"/>
+ <location filename="../QMenuStrings.cpp" line="441"/>
+ <location filename="../QMenuStrings.cpp" line="2937"/>
<source>Show Ch&ord Name Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="664"/>
- <location filename="../QMenuStrings.cpp" line="1966"/>
+ <location filename="../QMenuStrings.cpp" line="442"/>
+ <location filename="../QMenuStrings.cpp" line="2939"/>
<source>Show &Tempo Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="665"/>
- <location filename="../QMenuStrings.cpp" line="1967"/>
+ <location filename="../QMenuStrings.cpp" line="443"/>
+ <location filename="../QMenuStrings.cpp" line="2940"/>
<source>Show &Velocity Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="666"/>
- <location filename="../QMenuStrings.cpp" line="1968"/>
+ <location filename="../QMenuStrings.cpp" line="444"/>
+ <location filename="../QMenuStrings.cpp" line="2941"/>
<source>Show Pitch &Bend Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="667"/>
- <location filename="../QMenuStrings.cpp" line="1969"/>
+ <location filename="../QMenuStrings.cpp" line="445"/>
+ <location filename="../QMenuStrings.cpp" line="2942"/>
<source>Add &Control Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="685"/>
- <location filename="../QMenuStrings.cpp" line="2235"/>
+ <location filename="../QMenuStrings.cpp" line="463"/>
+ <location filename="../QMenuStrings.cpp" line="3209"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="687"/>
- <location filename="../QMenuStrings.cpp" line="1975"/>
- <location filename="../QMenuStrings.cpp" line="3970"/>
+ <location filename="../QMenuStrings.cpp" line="465"/>
+ <location filename="../QMenuStrings.cpp" line="2201"/>
+ <location filename="../QMenuStrings.cpp" line="2948"/>
<source>&Composition</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="688"/>
- <location filename="../QMenuStrings.cpp" line="1976"/>
- <location filename="../QMenuStrings.cpp" line="3971"/>
- <location filename="../QMenuStrings.cpp" line="4640"/>
+ <location filename="../QMenuStrings.cpp" line="104"/>
+ <location filename="../QMenuStrings.cpp" line="466"/>
+ <location filename="../QMenuStrings.cpp" line="2202"/>
+ <location filename="../QMenuStrings.cpp" line="2949"/>
<source>Add Te&mpo Change...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="689"/>
- <location filename="../QMenuStrings.cpp" line="1977"/>
- <location filename="../QMenuStrings.cpp" line="3972"/>
- <location filename="../QMenuStrings.cpp" line="4649"/>
+ <location filename="../QMenuStrings.cpp" line="113"/>
+ <location filename="../QMenuStrings.cpp" line="467"/>
+ <location filename="../QMenuStrings.cpp" line="2203"/>
+ <location filename="../QMenuStrings.cpp" line="2950"/>
<source>Add Time Si&gnature Change...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="692"/>
- <location filename="../QMenuStrings.cpp" line="1980"/>
- <location filename="../QMenuStrings.cpp" line="4065"/>
- <location filename="../QMenuStrings.cpp" line="4436"/>
+ <location filename="../QMenuStrings.cpp" line="470"/>
+ <location filename="../QMenuStrings.cpp" line="1673"/>
+ <location filename="../QMenuStrings.cpp" line="2296"/>
+ <location filename="../QMenuStrings.cpp" line="2954"/>
<source>Open in &Event List Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="695"/>
- <location filename="../QMenuStrings.cpp" line="1982"/>
- <location filename="../QMenuStrings.cpp" line="4047"/>
- <location filename="../QMenuStrings.cpp" line="4418"/>
+ <location filename="../QMenuStrings.cpp" line="473"/>
+ <location filename="../QMenuStrings.cpp" line="1655"/>
+ <location filename="../QMenuStrings.cpp" line="2278"/>
+ <location filename="../QMenuStrings.cpp" line="2956"/>
<source>Open in &Percussion Matrix Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="696"/>
- <location filename="../QMenuStrings.cpp" line="1986"/>
+ <location filename="../QMenuStrings.cpp" line="474"/>
+ <location filename="../QMenuStrings.cpp" line="2960"/>
<source>Add &Key Change...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="697"/>
- <location filename="../QMenuStrings.cpp" line="1989"/>
- <location filename="../QMenuStrings.cpp" line="4106"/>
+ <location filename="../QMenuStrings.cpp" line="475"/>
+ <location filename="../QMenuStrings.cpp" line="2337"/>
+ <location filename="../QMenuStrings.cpp" line="2963"/>
<source>Set Start &Time...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="698"/>
- <location filename="../QMenuStrings.cpp" line="1990"/>
- <location filename="../QMenuStrings.cpp" line="4107"/>
+ <location filename="../QMenuStrings.cpp" line="476"/>
+ <location filename="../QMenuStrings.cpp" line="2338"/>
+ <location filename="../QMenuStrings.cpp" line="2964"/>
<source>Set &Duration...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="699"/>
- <location filename="../QMenuStrings.cpp" line="2269"/>
+ <location filename="../QMenuStrings.cpp" line="477"/>
+ <location filename="../QMenuStrings.cpp" line="3243"/>
<source>Ad&just</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="700"/>
- <location filename="../QMenuStrings.cpp" line="2455"/>
+ <location filename="../QMenuStrings.cpp" line="478"/>
+ <location filename="../QMenuStrings.cpp" line="3429"/>
<source>&Quantize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="701"/>
- <location filename="../QMenuStrings.cpp" line="2456"/>
- <location filename="../QMenuStrings.cpp" line="4084"/>
- <location filename="../QMenuStrings.cpp" line="4517"/>
+ <location filename="../QMenuStrings.cpp" line="479"/>
+ <location filename="../QMenuStrings.cpp" line="1754"/>
+ <location filename="../QMenuStrings.cpp" line="2315"/>
+ <location filename="../QMenuStrings.cpp" line="3430"/>
<source>&Quantize...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="708"/>
- <location filename="../QMenuStrings.cpp" line="2463"/>
- <location filename="../QMenuStrings.cpp" line="4091"/>
- <location filename="../QMenuStrings.cpp" line="4524"/>
+ <location filename="../QMenuStrings.cpp" line="486"/>
+ <location filename="../QMenuStrings.cpp" line="1761"/>
+ <location filename="../QMenuStrings.cpp" line="2322"/>
+ <location filename="../QMenuStrings.cpp" line="3437"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="710"/>
+ <location filename="../QMenuStrings.cpp" line="488"/>
<source>&Repeat Last Quantize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="717"/>
- <location filename="../QMenuStrings.cpp" line="4100"/>
- <location filename="../QMenuStrings.cpp" line="4533"/>
+ <location filename="../QMenuStrings.cpp" line="495"/>
+ <location filename="../QMenuStrings.cpp" line="1770"/>
+ <location filename="../QMenuStrings.cpp" line="2331"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="719"/>
+ <location filename="../QMenuStrings.cpp" line="497"/>
<source>&Legato</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="726"/>
+ <location filename="../QMenuStrings.cpp" line="504"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="728"/>
- <location filename="../QMenuStrings.cpp" line="2282"/>
+ <location filename="../QMenuStrings.cpp" line="506"/>
+ <location filename="../QMenuStrings.cpp" line="3256"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="737"/>
- <location filename="../QMenuStrings.cpp" line="2558"/>
- <location filename="../QMenuStrings.cpp" line="4108"/>
+ <location filename="../QMenuStrings.cpp" line="515"/>
+ <location filename="../QMenuStrings.cpp" line="2339"/>
+ <location filename="../QMenuStrings.cpp" line="3532"/>
<source>Jog &Left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="744"/>
- <location filename="../QMenuStrings.cpp" line="2565"/>
- <location filename="../QMenuStrings.cpp" line="4115"/>
+ <location filename="../QMenuStrings.cpp" line="522"/>
+ <location filename="../QMenuStrings.cpp" line="2346"/>
+ <location filename="../QMenuStrings.cpp" line="3539"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="746"/>
+ <location filename="../QMenuStrings.cpp" line="524"/>
<source>&Jog Right</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="753"/>
- <location filename="../QMenuStrings.cpp" line="2574"/>
- <location filename="../QMenuStrings.cpp" line="4124"/>
+ <location filename="../QMenuStrings.cpp" line="531"/>
+ <location filename="../QMenuStrings.cpp" line="2355"/>
+ <location filename="../QMenuStrings.cpp" line="3548"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="755"/>
- <location filename="../QMenuStrings.cpp" line="2532"/>
+ <location filename="../QMenuStrings.cpp" line="533"/>
+ <location filename="../QMenuStrings.cpp" line="3506"/>
<source>&Increase Velocity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="762"/>
- <location filename="../QMenuStrings.cpp" line="2539"/>
- <location filename="../QMenuStrings.cpp" line="4189"/>
+ <location filename="../QMenuStrings.cpp" line="540"/>
+ <location filename="../QMenuStrings.cpp" line="2420"/>
+ <location filename="../QMenuStrings.cpp" line="3513"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="764"/>
- <location filename="../QMenuStrings.cpp" line="2541"/>
+ <location filename="../QMenuStrings.cpp" line="542"/>
+ <location filename="../QMenuStrings.cpp" line="3515"/>
<source>&Reduce Velocity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="771"/>
- <location filename="../QMenuStrings.cpp" line="2548"/>
- <location filename="../QMenuStrings.cpp" line="4180"/>
+ <location filename="../QMenuStrings.cpp" line="549"/>
+ <location filename="../QMenuStrings.cpp" line="2411"/>
+ <location filename="../QMenuStrings.cpp" line="3522"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="773"/>
+ <location filename="../QMenuStrings.cpp" line="551"/>
<source>&Set to Current Velocity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="774"/>
+ <location filename="../QMenuStrings.cpp" line="552"/>
<source>Set Event &Velocities...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="775"/>
+ <location filename="../QMenuStrings.cpp" line="553"/>
<source>Resc&ale</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="776"/>
- <location filename="../QMenuStrings.cpp" line="2469"/>
+ <location filename="../QMenuStrings.cpp" line="554"/>
+ <location filename="../QMenuStrings.cpp" line="3443"/>
<source>&Halve Durations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="783"/>
- <location filename="../QMenuStrings.cpp" line="2476"/>
+ <location filename="../QMenuStrings.cpp" line="561"/>
+ <location filename="../QMenuStrings.cpp" line="3450"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="785"/>
- <location filename="../QMenuStrings.cpp" line="2478"/>
+ <location filename="../QMenuStrings.cpp" line="563"/>
+ <location filename="../QMenuStrings.cpp" line="3452"/>
<source>&Double Durations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="792"/>
- <location filename="../QMenuStrings.cpp" line="2485"/>
+ <location filename="../QMenuStrings.cpp" line="570"/>
+ <location filename="../QMenuStrings.cpp" line="3459"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="794"/>
- <location filename="../QMenuStrings.cpp" line="2487"/>
+ <location filename="../QMenuStrings.cpp" line="572"/>
+ <location filename="../QMenuStrings.cpp" line="3461"/>
<source>Stretch or S&quash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="795"/>
- <location filename="../QMenuStrings.cpp" line="2488"/>
+ <location filename="../QMenuStrings.cpp" line="573"/>
+ <location filename="../QMenuStrings.cpp" line="3462"/>
<source>Trans&pose</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="796"/>
- <location filename="../QMenuStrings.cpp" line="2489"/>
+ <location filename="../QMenuStrings.cpp" line="574"/>
+ <location filename="../QMenuStrings.cpp" line="3463"/>
<source>&Up a Semitone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="803"/>
- <location filename="../QMenuStrings.cpp" line="2496"/>
- <location filename="../QMenuStrings.cpp" line="4207"/>
+ <location filename="../QMenuStrings.cpp" line="581"/>
+ <location filename="../QMenuStrings.cpp" line="2438"/>
+ <location filename="../QMenuStrings.cpp" line="3470"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="805"/>
- <location filename="../QMenuStrings.cpp" line="2498"/>
+ <location filename="../QMenuStrings.cpp" line="583"/>
+ <location filename="../QMenuStrings.cpp" line="3472"/>
<source>&Down a Semitone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="812"/>
- <location filename="../QMenuStrings.cpp" line="2505"/>
- <location filename="../QMenuStrings.cpp" line="4198"/>
+ <location filename="../QMenuStrings.cpp" line="590"/>
+ <location filename="../QMenuStrings.cpp" line="2429"/>
+ <location filename="../QMenuStrings.cpp" line="3479"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="814"/>
- <location filename="../QMenuStrings.cpp" line="2507"/>
+ <location filename="../QMenuStrings.cpp" line="592"/>
+ <location filename="../QMenuStrings.cpp" line="3481"/>
<source>Up an &Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="821"/>
- <location filename="../QMenuStrings.cpp" line="2514"/>
+ <location filename="../QMenuStrings.cpp" line="599"/>
+ <location filename="../QMenuStrings.cpp" line="3488"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="823"/>
- <location filename="../QMenuStrings.cpp" line="2516"/>
+ <location filename="../QMenuStrings.cpp" line="601"/>
+ <location filename="../QMenuStrings.cpp" line="3490"/>
<source>Down an Octa&ve</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="830"/>
- <location filename="../QMenuStrings.cpp" line="2523"/>
+ <location filename="../QMenuStrings.cpp" line="608"/>
+ <location filename="../QMenuStrings.cpp" line="3497"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="832"/>
- <location filename="../QMenuStrings.cpp" line="2525"/>
+ <location filename="../QMenuStrings.cpp" line="610"/>
+ <location filename="../QMenuStrings.cpp" line="3499"/>
<source>&Transpose by Semitones...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="833"/>
- <location filename="../QMenuStrings.cpp" line="1991"/>
- <location filename="../QMenuStrings.cpp" line="2526"/>
- <location filename="../QMenuStrings.cpp" line="4102"/>
- <location filename="../QMenuStrings.cpp" line="4536"/>
+ <location filename="../QMenuStrings.cpp" line="611"/>
+ <location filename="../QMenuStrings.cpp" line="1773"/>
+ <location filename="../QMenuStrings.cpp" line="2333"/>
+ <location filename="../QMenuStrings.cpp" line="2965"/>
+ <location filename="../QMenuStrings.cpp" line="3500"/>
<source>Transpose by &Interval...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="834"/>
+ <location filename="../QMenuStrings.cpp" line="612"/>
<source>&Convert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="835"/>
- <location filename="../QMenuStrings.cpp" line="2528"/>
+ <location filename="../QMenuStrings.cpp" line="613"/>
+ <location filename="../QMenuStrings.cpp" line="3502"/>
<source>&Invert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="842"/>
+ <location filename="../QMenuStrings.cpp" line="620"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="844"/>
- <location filename="../QMenuStrings.cpp" line="2529"/>
+ <location filename="../QMenuStrings.cpp" line="622"/>
+ <location filename="../QMenuStrings.cpp" line="3503"/>
<source>&Retrograde</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="851"/>
+ <location filename="../QMenuStrings.cpp" line="629"/>
<source>Shift+Alt+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="853"/>
- <location filename="../QMenuStrings.cpp" line="2530"/>
+ <location filename="../QMenuStrings.cpp" line="631"/>
+ <location filename="../QMenuStrings.cpp" line="3504"/>
<source>Re&trograde Invert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="854"/>
+ <location filename="../QMenuStrings.cpp" line="632"/>
<source>Trigger Se&gment...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="855"/>
+ <location filename="../QMenuStrings.cpp" line="633"/>
<source>Remove &Triggers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="856"/>
- <location filename="../QMenuStrings.cpp" line="2579"/>
+ <location filename="../QMenuStrings.cpp" line="634"/>
+ <location filename="../QMenuStrings.cpp" line="3553"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="859"/>
- <location filename="../QMenuStrings.cpp" line="2582"/>
+ <location filename="../QMenuStrings.cpp" line="637"/>
+ <location filename="../QMenuStrings.cpp" line="3556"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="862"/>
- <location filename="../QMenuStrings.cpp" line="2586"/>
+ <location filename="../QMenuStrings.cpp" line="640"/>
+ <location filename="../QMenuStrings.cpp" line="3560"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="863"/>
- <location filename="../QMenuStrings.cpp" line="1035"/>
- <location filename="../QMenuStrings.cpp" line="2587"/>
- <location filename="../QMenuStrings.cpp" line="4259"/>
- <location filename="../QMenuStrings.cpp" line="4546"/>
+ <location filename="../QMenuStrings.cpp" line="641"/>
+ <location filename="../QMenuStrings.cpp" line="813"/>
+ <location filename="../QMenuStrings.cpp" line="1783"/>
+ <location filename="../QMenuStrings.cpp" line="2490"/>
+ <location filename="../QMenuStrings.cpp" line="3561"/>
<source>&Move</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="864"/>
+ <location filename="../QMenuStrings.cpp" line="642"/>
<source>Cursor Back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="871"/>
- <location filename="../QMenuStrings.cpp" line="2595"/>
+ <location filename="../QMenuStrings.cpp" line="649"/>
+ <location filename="../QMenuStrings.cpp" line="3569"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="873"/>
- <location filename="../QMenuStrings.cpp" line="2597"/>
+ <location filename="../QMenuStrings.cpp" line="651"/>
+ <location filename="../QMenuStrings.cpp" line="3571"/>
<source>Cursor Forward and &Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="880"/>
- <location filename="../QMenuStrings.cpp" line="2604"/>
+ <location filename="../QMenuStrings.cpp" line="658"/>
+ <location filename="../QMenuStrings.cpp" line="3578"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="882"/>
- <location filename="../QMenuStrings.cpp" line="2606"/>
+ <location filename="../QMenuStrings.cpp" line="660"/>
+ <location filename="../QMenuStrings.cpp" line="3580"/>
<source>Cursor Back &Bar and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="889"/>
- <location filename="../QMenuStrings.cpp" line="2613"/>
+ <location filename="../QMenuStrings.cpp" line="667"/>
+ <location filename="../QMenuStrings.cpp" line="3587"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="891"/>
- <location filename="../QMenuStrings.cpp" line="2615"/>
+ <location filename="../QMenuStrings.cpp" line="669"/>
+ <location filename="../QMenuStrings.cpp" line="3589"/>
<source>Cursor For&ward and Select</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="898"/>
- <location filename="../QMenuStrings.cpp" line="2622"/>
+ <location filename="../QMenuStrings.cpp" line="676"/>
+ <location filename="../QMenuStrings.cpp" line="3596"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="900"/>
- <location filename="../QMenuStrings.cpp" line="2624"/>
+ <location filename="../QMenuStrings.cpp" line="678"/>
+ <location filename="../QMenuStrings.cpp" line="3598"/>
<source>Set Loop &to Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="907"/>
- <location filename="../QMenuStrings.cpp" line="2631"/>
+ <location filename="../QMenuStrings.cpp" line="685"/>
+ <location filename="../QMenuStrings.cpp" line="3605"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="909"/>
- <location filename="../QMenuStrings.cpp" line="2633"/>
+ <location filename="../QMenuStrings.cpp" line="687"/>
+ <location filename="../QMenuStrings.cpp" line="3607"/>
<source>Clear L&oop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="916"/>
- <location filename="../QMenuStrings.cpp" line="2640"/>
+ <location filename="../QMenuStrings.cpp" line="694"/>
+ <location filename="../QMenuStrings.cpp" line="3614"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="918"/>
- <location filename="../QMenuStrings.cpp" line="2660"/>
+ <location filename="../QMenuStrings.cpp" line="696"/>
+ <location filename="../QMenuStrings.cpp" line="3634"/>
<source>Pre&vious Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="925"/>
- <location filename="../QMenuStrings.cpp" line="2667"/>
+ <location filename="../QMenuStrings.cpp" line="703"/>
+ <location filename="../QMenuStrings.cpp" line="3641"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="927"/>
- <location filename="../QMenuStrings.cpp" line="2669"/>
+ <location filename="../QMenuStrings.cpp" line="705"/>
+ <location filename="../QMenuStrings.cpp" line="3643"/>
<source>Ne&xt Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="934"/>
- <location filename="../QMenuStrings.cpp" line="2676"/>
+ <location filename="../QMenuStrings.cpp" line="712"/>
+ <location filename="../QMenuStrings.cpp" line="3650"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="936"/>
- <location filename="../QMenuStrings.cpp" line="1700"/>
- <location filename="../QMenuStrings.cpp" line="1748"/>
- <location filename="../QMenuStrings.cpp" line="2678"/>
- <location filename="../QMenuStrings.cpp" line="4287"/>
+ <location filename="../QMenuStrings.cpp" line="714"/>
+ <location filename="../QMenuStrings.cpp" line="1609"/>
+ <location filename="../QMenuStrings.cpp" line="1887"/>
+ <location filename="../QMenuStrings.cpp" line="2518"/>
+ <location filename="../QMenuStrings.cpp" line="3652"/>
<source>&Play</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="937"/>
- <location filename="../QMenuStrings.cpp" line="1701"/>
- <location filename="../QMenuStrings.cpp" line="1749"/>
- <location filename="../QMenuStrings.cpp" line="2685"/>
- <location filename="../QMenuStrings.cpp" line="4296"/>
+ <location filename="../QMenuStrings.cpp" line="715"/>
+ <location filename="../QMenuStrings.cpp" line="1610"/>
+ <location filename="../QMenuStrings.cpp" line="1888"/>
+ <location filename="../QMenuStrings.cpp" line="2527"/>
+ <location filename="../QMenuStrings.cpp" line="3659"/>
<source>&Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="938"/>
- <location filename="../QMenuStrings.cpp" line="2692"/>
+ <location filename="../QMenuStrings.cpp" line="716"/>
+ <location filename="../QMenuStrings.cpp" line="3666"/>
<source>Step &Back</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="945"/>
- <location filename="../QMenuStrings.cpp" line="2699"/>
+ <location filename="../QMenuStrings.cpp" line="723"/>
+ <location filename="../QMenuStrings.cpp" line="3673"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="951"/>
- <location filename="../QMenuStrings.cpp" line="2705"/>
+ <location filename="../QMenuStrings.cpp" line="729"/>
+ <location filename="../QMenuStrings.cpp" line="3679"/>
<source>Step Back (Left)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="953"/>
- <location filename="../QMenuStrings.cpp" line="2707"/>
+ <location filename="../QMenuStrings.cpp" line="731"/>
+ <location filename="../QMenuStrings.cpp" line="3681"/>
<source>Step &Forward</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="960"/>
- <location filename="../QMenuStrings.cpp" line="2714"/>
+ <location filename="../QMenuStrings.cpp" line="738"/>
+ <location filename="../QMenuStrings.cpp" line="3688"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="966"/>
- <location filename="../QMenuStrings.cpp" line="2720"/>
+ <location filename="../QMenuStrings.cpp" line="744"/>
+ <location filename="../QMenuStrings.cpp" line="3694"/>
<source>Step Forward (Right)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="968"/>
- <location filename="../QMenuStrings.cpp" line="1702"/>
- <location filename="../QMenuStrings.cpp" line="1750"/>
- <location filename="../QMenuStrings.cpp" line="2722"/>
- <location filename="../QMenuStrings.cpp" line="4305"/>
+ <location filename="../QMenuStrings.cpp" line="746"/>
+ <location filename="../QMenuStrings.cpp" line="1611"/>
+ <location filename="../QMenuStrings.cpp" line="1889"/>
+ <location filename="../QMenuStrings.cpp" line="2536"/>
+ <location filename="../QMenuStrings.cpp" line="3696"/>
<source>Re&wind</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="975"/>
- <location filename="../QMenuStrings.cpp" line="2729"/>
+ <location filename="../QMenuStrings.cpp" line="753"/>
+ <location filename="../QMenuStrings.cpp" line="3703"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="977"/>
- <location filename="../QMenuStrings.cpp" line="1703"/>
- <location filename="../QMenuStrings.cpp" line="1751"/>
- <location filename="../QMenuStrings.cpp" line="2731"/>
- <location filename="../QMenuStrings.cpp" line="4314"/>
+ <location filename="../QMenuStrings.cpp" line="755"/>
+ <location filename="../QMenuStrings.cpp" line="1612"/>
+ <location filename="../QMenuStrings.cpp" line="1890"/>
+ <location filename="../QMenuStrings.cpp" line="2545"/>
+ <location filename="../QMenuStrings.cpp" line="3705"/>
<source>&Fast Forward</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="984"/>
- <location filename="../QMenuStrings.cpp" line="2738"/>
+ <location filename="../QMenuStrings.cpp" line="762"/>
+ <location filename="../QMenuStrings.cpp" line="3712"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="986"/>
- <location filename="../QMenuStrings.cpp" line="1704"/>
- <location filename="../QMenuStrings.cpp" line="1752"/>
- <location filename="../QMenuStrings.cpp" line="2740"/>
+ <location filename="../QMenuStrings.cpp" line="764"/>
+ <location filename="../QMenuStrings.cpp" line="1613"/>
+ <location filename="../QMenuStrings.cpp" line="1891"/>
+ <location filename="../QMenuStrings.cpp" line="3714"/>
<source>Rewind to &Beginning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="987"/>
- <location filename="../QMenuStrings.cpp" line="1705"/>
- <location filename="../QMenuStrings.cpp" line="1753"/>
- <location filename="../QMenuStrings.cpp" line="2747"/>
+ <location filename="../QMenuStrings.cpp" line="765"/>
+ <location filename="../QMenuStrings.cpp" line="1614"/>
+ <location filename="../QMenuStrings.cpp" line="1892"/>
+ <location filename="../QMenuStrings.cpp" line="3721"/>
<source>Fast Forward to &End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="988"/>
- <location filename="../QMenuStrings.cpp" line="2763"/>
+ <location filename="../QMenuStrings.cpp" line="766"/>
+ <location filename="../QMenuStrings.cpp" line="3737"/>
<source>S&olo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="989"/>
- <location filename="../QMenuStrings.cpp" line="2770"/>
- <location filename="../QMenuStrings.cpp" line="4341"/>
+ <location filename="../QMenuStrings.cpp" line="767"/>
+ <location filename="../QMenuStrings.cpp" line="2572"/>
+ <location filename="../QMenuStrings.cpp" line="3744"/>
<source>Scro&ll to Follow Playback</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="996"/>
- <location filename="../QMenuStrings.cpp" line="2777"/>
- <location filename="../QMenuStrings.cpp" line="4348"/>
+ <location filename="../QMenuStrings.cpp" line="774"/>
+ <location filename="../QMenuStrings.cpp" line="2579"/>
+ <location filename="../QMenuStrings.cpp" line="3751"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="998"/>
- <location filename="../QMenuStrings.cpp" line="1707"/>
- <location filename="../QMenuStrings.cpp" line="1755"/>
- <location filename="../QMenuStrings.cpp" line="2785"/>
- <location filename="../QMenuStrings.cpp" line="4350"/>
+ <location filename="../QMenuStrings.cpp" line="776"/>
+ <location filename="../QMenuStrings.cpp" line="1616"/>
+ <location filename="../QMenuStrings.cpp" line="1894"/>
+ <location filename="../QMenuStrings.cpp" line="2581"/>
+ <location filename="../QMenuStrings.cpp" line="3759"/>
<source>P&anic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1005"/>
- <location filename="../QMenuStrings.cpp" line="1714"/>
- <location filename="../QMenuStrings.cpp" line="1762"/>
- <location filename="../QMenuStrings.cpp" line="2792"/>
- <location filename="../QMenuStrings.cpp" line="4357"/>
+ <location filename="../QMenuStrings.cpp" line="783"/>
+ <location filename="../QMenuStrings.cpp" line="1623"/>
+ <location filename="../QMenuStrings.cpp" line="1901"/>
+ <location filename="../QMenuStrings.cpp" line="2588"/>
+ <location filename="../QMenuStrings.cpp" line="3766"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1007"/>
- <location filename="../QMenuStrings.cpp" line="2800"/>
- <location filename="../QMenuStrings.cpp" line="4231"/>
+ <location filename="../QMenuStrings.cpp" line="785"/>
+ <location filename="../QMenuStrings.cpp" line="2462"/>
+ <location filename="../QMenuStrings.cpp" line="3774"/>
<source>&Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1008"/>
- <location filename="../QMenuStrings.cpp" line="2801"/>
- <location filename="../QMenuStrings.cpp" line="4232"/>
- <location filename="../QMenuStrings.cpp" line="4537"/>
+ <location filename="../QMenuStrings.cpp" line="786"/>
+ <location filename="../QMenuStrings.cpp" line="1774"/>
+ <location filename="../QMenuStrings.cpp" line="2463"/>
+ <location filename="../QMenuStrings.cpp" line="3775"/>
<source>&Select and Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1017"/>
- <location filename="../QMenuStrings.cpp" line="4241"/>
- <location filename="../QMenuStrings.cpp" line="4555"/>
+ <location filename="../QMenuStrings.cpp" line="795"/>
+ <location filename="../QMenuStrings.cpp" line="1792"/>
+ <location filename="../QMenuStrings.cpp" line="2472"/>
<source>&Draw</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1026"/>
- <location filename="../QMenuStrings.cpp" line="2820"/>
- <location filename="../QMenuStrings.cpp" line="4250"/>
- <location filename="../QMenuStrings.cpp" line="4564"/>
+ <location filename="../QMenuStrings.cpp" line="804"/>
+ <location filename="../QMenuStrings.cpp" line="1801"/>
+ <location filename="../QMenuStrings.cpp" line="2481"/>
+ <location filename="../QMenuStrings.cpp" line="3794"/>
<source>&Erase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1044"/>
+ <location filename="../QMenuStrings.cpp" line="822"/>
<source>Resi&ze</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1053"/>
- <location filename="../QMenuStrings.cpp" line="4277"/>
- <location filename="../QMenuStrings.cpp" line="4582"/>
+ <location filename="../QMenuStrings.cpp" line="831"/>
+ <location filename="../QMenuStrings.cpp" line="1819"/>
+ <location filename="../QMenuStrings.cpp" line="2508"/>
<source>S&plit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1060"/>
- <location filename="../QMenuStrings.cpp" line="1069"/>
- <location filename="../QMenuStrings.cpp" line="4284"/>
- <location filename="../QMenuStrings.cpp" line="4589"/>
+ <location filename="../QMenuStrings.cpp" line="838"/>
+ <location filename="../QMenuStrings.cpp" line="847"/>
+ <location filename="../QMenuStrings.cpp" line="1826"/>
+ <location filename="../QMenuStrings.cpp" line="2515"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1062"/>
+ <location filename="../QMenuStrings.cpp" line="840"/>
<source>&Velocity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1071"/>
- <location filename="../QMenuStrings.cpp" line="2979"/>
+ <location filename="../QMenuStrings.cpp" line="849"/>
+ <location filename="../QMenuStrings.cpp" line="3953"/>
<source>&Insert Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1072"/>
- <location filename="../QMenuStrings.cpp" line="1226"/>
- <location filename="../QMenuStrings.cpp" line="1380"/>
- <location filename="../QMenuStrings.cpp" line="2980"/>
- <location filename="../QMenuStrings.cpp" line="3134"/>
- <location filename="../QMenuStrings.cpp" line="3288"/>
+ <location filename="../QMenuStrings.cpp" line="850"/>
+ <location filename="../QMenuStrings.cpp" line="1004"/>
+ <location filename="../QMenuStrings.cpp" line="1158"/>
+ <location filename="../QMenuStrings.cpp" line="3954"/>
+ <location filename="../QMenuStrings.cpp" line="4108"/>
+ <location filename="../QMenuStrings.cpp" line="4262"/>
<source>I/do</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1079"/>
- <location filename="../QMenuStrings.cpp" line="2987"/>
+ <location filename="../QMenuStrings.cpp" line="857"/>
+ <location filename="../QMenuStrings.cpp" line="3961"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1081"/>
- <location filename="../QMenuStrings.cpp" line="1235"/>
- <location filename="../QMenuStrings.cpp" line="1389"/>
- <location filename="../QMenuStrings.cpp" line="2989"/>
- <location filename="../QMenuStrings.cpp" line="3143"/>
- <location filename="../QMenuStrings.cpp" line="3297"/>
+ <location filename="../QMenuStrings.cpp" line="859"/>
+ <location filename="../QMenuStrings.cpp" line="1013"/>
+ <location filename="../QMenuStrings.cpp" line="1167"/>
+ <location filename="../QMenuStrings.cpp" line="3963"/>
+ <location filename="../QMenuStrings.cpp" line="4117"/>
+ <location filename="../QMenuStrings.cpp" line="4271"/>
<source>I/do sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1088"/>
- <location filename="../QMenuStrings.cpp" line="2996"/>
+ <location filename="../QMenuStrings.cpp" line="866"/>
+ <location filename="../QMenuStrings.cpp" line="3970"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1090"/>
- <location filename="../QMenuStrings.cpp" line="1244"/>
- <location filename="../QMenuStrings.cpp" line="1398"/>
- <location filename="../QMenuStrings.cpp" line="2998"/>
- <location filename="../QMenuStrings.cpp" line="3152"/>
- <location filename="../QMenuStrings.cpp" line="3306"/>
+ <location filename="../QMenuStrings.cpp" line="868"/>
+ <location filename="../QMenuStrings.cpp" line="1022"/>
+ <location filename="../QMenuStrings.cpp" line="1176"/>
+ <location filename="../QMenuStrings.cpp" line="3972"/>
+ <location filename="../QMenuStrings.cpp" line="4126"/>
+ <location filename="../QMenuStrings.cpp" line="4280"/>
<source>II/re flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1097"/>
- <location filename="../QMenuStrings.cpp" line="3005"/>
- <location filename="../QMenuStrings.cpp" line="3797"/>
+ <location filename="../QMenuStrings.cpp" line="875"/>
+ <location filename="../QMenuStrings.cpp" line="2028"/>
+ <location filename="../QMenuStrings.cpp" line="3979"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1099"/>
- <location filename="../QMenuStrings.cpp" line="1253"/>
- <location filename="../QMenuStrings.cpp" line="1407"/>
- <location filename="../QMenuStrings.cpp" line="3007"/>
- <location filename="../QMenuStrings.cpp" line="3161"/>
- <location filename="../QMenuStrings.cpp" line="3315"/>
+ <location filename="../QMenuStrings.cpp" line="877"/>
+ <location filename="../QMenuStrings.cpp" line="1031"/>
+ <location filename="../QMenuStrings.cpp" line="1185"/>
+ <location filename="../QMenuStrings.cpp" line="3981"/>
+ <location filename="../QMenuStrings.cpp" line="4135"/>
+ <location filename="../QMenuStrings.cpp" line="4289"/>
<source>II/re</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1106"/>
- <location filename="../QMenuStrings.cpp" line="3014"/>
+ <location filename="../QMenuStrings.cpp" line="884"/>
+ <location filename="../QMenuStrings.cpp" line="3988"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1108"/>
- <location filename="../QMenuStrings.cpp" line="1262"/>
- <location filename="../QMenuStrings.cpp" line="1416"/>
- <location filename="../QMenuStrings.cpp" line="3016"/>
- <location filename="../QMenuStrings.cpp" line="3170"/>
- <location filename="../QMenuStrings.cpp" line="3324"/>
+ <location filename="../QMenuStrings.cpp" line="886"/>
+ <location filename="../QMenuStrings.cpp" line="1040"/>
+ <location filename="../QMenuStrings.cpp" line="1194"/>
+ <location filename="../QMenuStrings.cpp" line="3990"/>
+ <location filename="../QMenuStrings.cpp" line="4144"/>
+ <location filename="../QMenuStrings.cpp" line="4298"/>
<source>II/re sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1115"/>
- <location filename="../QMenuStrings.cpp" line="3023"/>
+ <location filename="../QMenuStrings.cpp" line="893"/>
+ <location filename="../QMenuStrings.cpp" line="3997"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1117"/>
- <location filename="../QMenuStrings.cpp" line="1271"/>
- <location filename="../QMenuStrings.cpp" line="1425"/>
- <location filename="../QMenuStrings.cpp" line="3025"/>
- <location filename="../QMenuStrings.cpp" line="3179"/>
- <location filename="../QMenuStrings.cpp" line="3333"/>
+ <location filename="../QMenuStrings.cpp" line="895"/>
+ <location filename="../QMenuStrings.cpp" line="1049"/>
+ <location filename="../QMenuStrings.cpp" line="1203"/>
+ <location filename="../QMenuStrings.cpp" line="3999"/>
+ <location filename="../QMenuStrings.cpp" line="4153"/>
+ <location filename="../QMenuStrings.cpp" line="4307"/>
<source>III/mi flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1124"/>
- <location filename="../QMenuStrings.cpp" line="3032"/>
+ <location filename="../QMenuStrings.cpp" line="902"/>
+ <location filename="../QMenuStrings.cpp" line="4006"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1126"/>
- <location filename="../QMenuStrings.cpp" line="1280"/>
- <location filename="../QMenuStrings.cpp" line="1434"/>
- <location filename="../QMenuStrings.cpp" line="3034"/>
- <location filename="../QMenuStrings.cpp" line="3188"/>
- <location filename="../QMenuStrings.cpp" line="3342"/>
+ <location filename="../QMenuStrings.cpp" line="904"/>
+ <location filename="../QMenuStrings.cpp" line="1058"/>
+ <location filename="../QMenuStrings.cpp" line="1212"/>
+ <location filename="../QMenuStrings.cpp" line="4008"/>
+ <location filename="../QMenuStrings.cpp" line="4162"/>
+ <location filename="../QMenuStrings.cpp" line="4316"/>
<source>III/mi</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1133"/>
- <location filename="../QMenuStrings.cpp" line="3041"/>
- <location filename="../QMenuStrings.cpp" line="4054"/>
- <location filename="../QMenuStrings.cpp" line="4425"/>
+ <location filename="../QMenuStrings.cpp" line="911"/>
+ <location filename="../QMenuStrings.cpp" line="1662"/>
+ <location filename="../QMenuStrings.cpp" line="2285"/>
+ <location filename="../QMenuStrings.cpp" line="4015"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1135"/>
- <location filename="../QMenuStrings.cpp" line="1289"/>
- <location filename="../QMenuStrings.cpp" line="1443"/>
- <location filename="../QMenuStrings.cpp" line="3043"/>
- <location filename="../QMenuStrings.cpp" line="3197"/>
- <location filename="../QMenuStrings.cpp" line="3351"/>
+ <location filename="../QMenuStrings.cpp" line="913"/>
+ <location filename="../QMenuStrings.cpp" line="1067"/>
+ <location filename="../QMenuStrings.cpp" line="1221"/>
+ <location filename="../QMenuStrings.cpp" line="4017"/>
+ <location filename="../QMenuStrings.cpp" line="4171"/>
+ <location filename="../QMenuStrings.cpp" line="4325"/>
<source>IV/fa</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1142"/>
- <location filename="../QMenuStrings.cpp" line="3050"/>
+ <location filename="../QMenuStrings.cpp" line="920"/>
+ <location filename="../QMenuStrings.cpp" line="4024"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1144"/>
- <location filename="../QMenuStrings.cpp" line="1298"/>
- <location filename="../QMenuStrings.cpp" line="1452"/>
- <location filename="../QMenuStrings.cpp" line="3052"/>
- <location filename="../QMenuStrings.cpp" line="3206"/>
- <location filename="../QMenuStrings.cpp" line="3360"/>
+ <location filename="../QMenuStrings.cpp" line="922"/>
+ <location filename="../QMenuStrings.cpp" line="1076"/>
+ <location filename="../QMenuStrings.cpp" line="1230"/>
+ <location filename="../QMenuStrings.cpp" line="4026"/>
+ <location filename="../QMenuStrings.cpp" line="4180"/>
+ <location filename="../QMenuStrings.cpp" line="4334"/>
<source>IV/fa sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1151"/>
- <location filename="../QMenuStrings.cpp" line="3059"/>
+ <location filename="../QMenuStrings.cpp" line="929"/>
+ <location filename="../QMenuStrings.cpp" line="4033"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1153"/>
- <location filename="../QMenuStrings.cpp" line="1307"/>
- <location filename="../QMenuStrings.cpp" line="1461"/>
- <location filename="../QMenuStrings.cpp" line="3061"/>
- <location filename="../QMenuStrings.cpp" line="3215"/>
- <location filename="../QMenuStrings.cpp" line="3369"/>
+ <location filename="../QMenuStrings.cpp" line="931"/>
+ <location filename="../QMenuStrings.cpp" line="1085"/>
+ <location filename="../QMenuStrings.cpp" line="1239"/>
+ <location filename="../QMenuStrings.cpp" line="4035"/>
+ <location filename="../QMenuStrings.cpp" line="4189"/>
+ <location filename="../QMenuStrings.cpp" line="4343"/>
<source>V/sol flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1160"/>
- <location filename="../QMenuStrings.cpp" line="3068"/>
+ <location filename="../QMenuStrings.cpp" line="938"/>
+ <location filename="../QMenuStrings.cpp" line="4042"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1162"/>
- <location filename="../QMenuStrings.cpp" line="1316"/>
- <location filename="../QMenuStrings.cpp" line="1470"/>
- <location filename="../QMenuStrings.cpp" line="3070"/>
- <location filename="../QMenuStrings.cpp" line="3224"/>
- <location filename="../QMenuStrings.cpp" line="3378"/>
+ <location filename="../QMenuStrings.cpp" line="940"/>
+ <location filename="../QMenuStrings.cpp" line="1094"/>
+ <location filename="../QMenuStrings.cpp" line="1248"/>
+ <location filename="../QMenuStrings.cpp" line="4044"/>
+ <location filename="../QMenuStrings.cpp" line="4198"/>
+ <location filename="../QMenuStrings.cpp" line="4352"/>
<source>V/sol</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1169"/>
- <location filename="../QMenuStrings.cpp" line="3077"/>
+ <location filename="../QMenuStrings.cpp" line="947"/>
+ <location filename="../QMenuStrings.cpp" line="4051"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1171"/>
- <location filename="../QMenuStrings.cpp" line="1325"/>
- <location filename="../QMenuStrings.cpp" line="1479"/>
- <location filename="../QMenuStrings.cpp" line="3079"/>
- <location filename="../QMenuStrings.cpp" line="3233"/>
- <location filename="../QMenuStrings.cpp" line="3387"/>
+ <location filename="../QMenuStrings.cpp" line="949"/>
+ <location filename="../QMenuStrings.cpp" line="1103"/>
+ <location filename="../QMenuStrings.cpp" line="1257"/>
+ <location filename="../QMenuStrings.cpp" line="4053"/>
+ <location filename="../QMenuStrings.cpp" line="4207"/>
+ <location filename="../QMenuStrings.cpp" line="4361"/>
<source>V/sol sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1178"/>
- <location filename="../QMenuStrings.cpp" line="3086"/>
+ <location filename="../QMenuStrings.cpp" line="956"/>
+ <location filename="../QMenuStrings.cpp" line="4060"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1180"/>
- <location filename="../QMenuStrings.cpp" line="1334"/>
- <location filename="../QMenuStrings.cpp" line="1488"/>
- <location filename="../QMenuStrings.cpp" line="3088"/>
- <location filename="../QMenuStrings.cpp" line="3242"/>
- <location filename="../QMenuStrings.cpp" line="3396"/>
+ <location filename="../QMenuStrings.cpp" line="958"/>
+ <location filename="../QMenuStrings.cpp" line="1112"/>
+ <location filename="../QMenuStrings.cpp" line="1266"/>
+ <location filename="../QMenuStrings.cpp" line="4062"/>
+ <location filename="../QMenuStrings.cpp" line="4216"/>
+ <location filename="../QMenuStrings.cpp" line="4370"/>
<source>VI/la flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1187"/>
- <location filename="../QMenuStrings.cpp" line="3095"/>
+ <location filename="../QMenuStrings.cpp" line="965"/>
+ <location filename="../QMenuStrings.cpp" line="4069"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1189"/>
- <location filename="../QMenuStrings.cpp" line="1343"/>
- <location filename="../QMenuStrings.cpp" line="1497"/>
- <location filename="../QMenuStrings.cpp" line="3097"/>
- <location filename="../QMenuStrings.cpp" line="3251"/>
- <location filename="../QMenuStrings.cpp" line="3405"/>
+ <location filename="../QMenuStrings.cpp" line="967"/>
+ <location filename="../QMenuStrings.cpp" line="1121"/>
+ <location filename="../QMenuStrings.cpp" line="1275"/>
+ <location filename="../QMenuStrings.cpp" line="4071"/>
+ <location filename="../QMenuStrings.cpp" line="4225"/>
+ <location filename="../QMenuStrings.cpp" line="4379"/>
<source>VI/la</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1196"/>
- <location filename="../QMenuStrings.cpp" line="3104"/>
+ <location filename="../QMenuStrings.cpp" line="974"/>
+ <location filename="../QMenuStrings.cpp" line="4078"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1198"/>
- <location filename="../QMenuStrings.cpp" line="1352"/>
- <location filename="../QMenuStrings.cpp" line="1506"/>
- <location filename="../QMenuStrings.cpp" line="3106"/>
- <location filename="../QMenuStrings.cpp" line="3260"/>
- <location filename="../QMenuStrings.cpp" line="3414"/>
+ <location filename="../QMenuStrings.cpp" line="976"/>
+ <location filename="../QMenuStrings.cpp" line="1130"/>
+ <location filename="../QMenuStrings.cpp" line="1284"/>
+ <location filename="../QMenuStrings.cpp" line="4080"/>
+ <location filename="../QMenuStrings.cpp" line="4234"/>
+ <location filename="../QMenuStrings.cpp" line="4388"/>
<source>VI/la sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1205"/>
- <location filename="../QMenuStrings.cpp" line="3113"/>
+ <location filename="../QMenuStrings.cpp" line="983"/>
+ <location filename="../QMenuStrings.cpp" line="4087"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1207"/>
- <location filename="../QMenuStrings.cpp" line="1361"/>
- <location filename="../QMenuStrings.cpp" line="1515"/>
- <location filename="../QMenuStrings.cpp" line="3115"/>
- <location filename="../QMenuStrings.cpp" line="3269"/>
- <location filename="../QMenuStrings.cpp" line="3423"/>
+ <location filename="../QMenuStrings.cpp" line="985"/>
+ <location filename="../QMenuStrings.cpp" line="1139"/>
+ <location filename="../QMenuStrings.cpp" line="1293"/>
+ <location filename="../QMenuStrings.cpp" line="4089"/>
+ <location filename="../QMenuStrings.cpp" line="4243"/>
+ <location filename="../QMenuStrings.cpp" line="4397"/>
<source>VII/ti flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1214"/>
- <location filename="../QMenuStrings.cpp" line="3122"/>
+ <location filename="../QMenuStrings.cpp" line="992"/>
+ <location filename="../QMenuStrings.cpp" line="4096"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1216"/>
- <location filename="../QMenuStrings.cpp" line="1370"/>
- <location filename="../QMenuStrings.cpp" line="1524"/>
- <location filename="../QMenuStrings.cpp" line="3124"/>
- <location filename="../QMenuStrings.cpp" line="3278"/>
- <location filename="../QMenuStrings.cpp" line="3432"/>
+ <location filename="../QMenuStrings.cpp" line="994"/>
+ <location filename="../QMenuStrings.cpp" line="1148"/>
+ <location filename="../QMenuStrings.cpp" line="1302"/>
+ <location filename="../QMenuStrings.cpp" line="4098"/>
+ <location filename="../QMenuStrings.cpp" line="4252"/>
+ <location filename="../QMenuStrings.cpp" line="4406"/>
<source>VII/ti</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1223"/>
- <location filename="../QMenuStrings.cpp" line="3131"/>
+ <location filename="../QMenuStrings.cpp" line="1001"/>
+ <location filename="../QMenuStrings.cpp" line="4105"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1225"/>
- <location filename="../QMenuStrings.cpp" line="3133"/>
+ <location filename="../QMenuStrings.cpp" line="1003"/>
+ <location filename="../QMenuStrings.cpp" line="4107"/>
<source>&Upper Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1233"/>
- <location filename="../QMenuStrings.cpp" line="3141"/>
+ <location filename="../QMenuStrings.cpp" line="1011"/>
+ <location filename="../QMenuStrings.cpp" line="4115"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1242"/>
- <location filename="../QMenuStrings.cpp" line="3150"/>
+ <location filename="../QMenuStrings.cpp" line="1020"/>
+ <location filename="../QMenuStrings.cpp" line="4124"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1251"/>
- <location filename="../QMenuStrings.cpp" line="3159"/>
+ <location filename="../QMenuStrings.cpp" line="1029"/>
+ <location filename="../QMenuStrings.cpp" line="4133"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1260"/>
- <location filename="../QMenuStrings.cpp" line="3168"/>
+ <location filename="../QMenuStrings.cpp" line="1038"/>
+ <location filename="../QMenuStrings.cpp" line="4142"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1269"/>
- <location filename="../QMenuStrings.cpp" line="3177"/>
+ <location filename="../QMenuStrings.cpp" line="1047"/>
+ <location filename="../QMenuStrings.cpp" line="4151"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1278"/>
- <location filename="../QMenuStrings.cpp" line="3186"/>
+ <location filename="../QMenuStrings.cpp" line="1056"/>
+ <location filename="../QMenuStrings.cpp" line="4160"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1296"/>
- <location filename="../QMenuStrings.cpp" line="3204"/>
- <location filename="../QMenuStrings.cpp" line="4225"/>
+ <location filename="../QMenuStrings.cpp" line="1074"/>
+ <location filename="../QMenuStrings.cpp" line="2456"/>
+ <location filename="../QMenuStrings.cpp" line="4178"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1305"/>
- <location filename="../QMenuStrings.cpp" line="3213"/>
+ <location filename="../QMenuStrings.cpp" line="1083"/>
+ <location filename="../QMenuStrings.cpp" line="4187"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1314"/>
- <location filename="../QMenuStrings.cpp" line="3222"/>
+ <location filename="../QMenuStrings.cpp" line="1092"/>
+ <location filename="../QMenuStrings.cpp" line="4196"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1323"/>
- <location filename="../QMenuStrings.cpp" line="3231"/>
- <location filename="../QMenuStrings.cpp" line="4216"/>
+ <location filename="../QMenuStrings.cpp" line="1101"/>
+ <location filename="../QMenuStrings.cpp" line="2447"/>
+ <location filename="../QMenuStrings.cpp" line="4205"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1332"/>
- <location filename="../QMenuStrings.cpp" line="3240"/>
+ <location filename="../QMenuStrings.cpp" line="1110"/>
+ <location filename="../QMenuStrings.cpp" line="4214"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1341"/>
- <location filename="../QMenuStrings.cpp" line="3249"/>
+ <location filename="../QMenuStrings.cpp" line="1119"/>
+ <location filename="../QMenuStrings.cpp" line="4223"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1359"/>
- <location filename="../QMenuStrings.cpp" line="3267"/>
+ <location filename="../QMenuStrings.cpp" line="1137"/>
+ <location filename="../QMenuStrings.cpp" line="4241"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1368"/>
- <location filename="../QMenuStrings.cpp" line="3276"/>
+ <location filename="../QMenuStrings.cpp" line="1146"/>
+ <location filename="../QMenuStrings.cpp" line="4250"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1377"/>
- <location filename="../QMenuStrings.cpp" line="3285"/>
+ <location filename="../QMenuStrings.cpp" line="1155"/>
+ <location filename="../QMenuStrings.cpp" line="4259"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1379"/>
- <location filename="../QMenuStrings.cpp" line="3287"/>
+ <location filename="../QMenuStrings.cpp" line="1157"/>
+ <location filename="../QMenuStrings.cpp" line="4261"/>
<source>&Lower Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1387"/>
- <location filename="../QMenuStrings.cpp" line="3295"/>
+ <location filename="../QMenuStrings.cpp" line="1165"/>
+ <location filename="../QMenuStrings.cpp" line="4269"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1396"/>
- <location filename="../QMenuStrings.cpp" line="3304"/>
+ <location filename="../QMenuStrings.cpp" line="1174"/>
+ <location filename="../QMenuStrings.cpp" line="4278"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1405"/>
- <location filename="../QMenuStrings.cpp" line="3313"/>
- <location filename="../QMenuStrings.cpp" line="3894"/>
+ <location filename="../QMenuStrings.cpp" line="1183"/>
+ <location filename="../QMenuStrings.cpp" line="2125"/>
+ <location filename="../QMenuStrings.cpp" line="4287"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1414"/>
- <location filename="../QMenuStrings.cpp" line="3322"/>
+ <location filename="../QMenuStrings.cpp" line="1192"/>
+ <location filename="../QMenuStrings.cpp" line="4296"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1423"/>
- <location filename="../QMenuStrings.cpp" line="3331"/>
+ <location filename="../QMenuStrings.cpp" line="1201"/>
+ <location filename="../QMenuStrings.cpp" line="4305"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1432"/>
- <location filename="../QMenuStrings.cpp" line="3340"/>
- <location filename="../QMenuStrings.cpp" line="3903"/>
+ <location filename="../QMenuStrings.cpp" line="1210"/>
+ <location filename="../QMenuStrings.cpp" line="2134"/>
+ <location filename="../QMenuStrings.cpp" line="4314"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1441"/>
- <location filename="../QMenuStrings.cpp" line="3349"/>
+ <location filename="../QMenuStrings.cpp" line="1219"/>
+ <location filename="../QMenuStrings.cpp" line="4323"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1450"/>
- <location filename="../QMenuStrings.cpp" line="3358"/>
+ <location filename="../QMenuStrings.cpp" line="1228"/>
+ <location filename="../QMenuStrings.cpp" line="4332"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1459"/>
- <location filename="../QMenuStrings.cpp" line="3367"/>
+ <location filename="../QMenuStrings.cpp" line="1237"/>
+ <location filename="../QMenuStrings.cpp" line="4341"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1468"/>
- <location filename="../QMenuStrings.cpp" line="3376"/>
+ <location filename="../QMenuStrings.cpp" line="1246"/>
+ <location filename="../QMenuStrings.cpp" line="4350"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1477"/>
- <location filename="../QMenuStrings.cpp" line="3385"/>
+ <location filename="../QMenuStrings.cpp" line="1255"/>
+ <location filename="../QMenuStrings.cpp" line="4359"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1486"/>
- <location filename="../QMenuStrings.cpp" line="3394"/>
+ <location filename="../QMenuStrings.cpp" line="1264"/>
+ <location filename="../QMenuStrings.cpp" line="4368"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1495"/>
- <location filename="../QMenuStrings.cpp" line="3403"/>
+ <location filename="../QMenuStrings.cpp" line="1273"/>
+ <location filename="../QMenuStrings.cpp" line="4377"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1504"/>
- <location filename="../QMenuStrings.cpp" line="3412"/>
- <location filename="../QMenuStrings.cpp" line="4063"/>
- <location filename="../QMenuStrings.cpp" line="4434"/>
+ <location filename="../QMenuStrings.cpp" line="1282"/>
+ <location filename="../QMenuStrings.cpp" line="1671"/>
+ <location filename="../QMenuStrings.cpp" line="2294"/>
+ <location filename="../QMenuStrings.cpp" line="4386"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1513"/>
- <location filename="../QMenuStrings.cpp" line="3421"/>
+ <location filename="../QMenuStrings.cpp" line="1291"/>
+ <location filename="../QMenuStrings.cpp" line="4395"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1522"/>
- <location filename="../QMenuStrings.cpp" line="3430"/>
- <location filename="../QMenuStrings.cpp" line="3995"/>
+ <location filename="../QMenuStrings.cpp" line="1300"/>
+ <location filename="../QMenuStrings.cpp" line="2226"/>
+ <location filename="../QMenuStrings.cpp" line="4404"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1531"/>
- <location filename="../QMenuStrings.cpp" line="3439"/>
- <location filename="../QMenuStrings.cpp" line="4045"/>
- <location filename="../QMenuStrings.cpp" line="4416"/>
+ <location filename="../QMenuStrings.cpp" line="1309"/>
+ <location filename="../QMenuStrings.cpp" line="1653"/>
+ <location filename="../QMenuStrings.cpp" line="2276"/>
+ <location filename="../QMenuStrings.cpp" line="4413"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1533"/>
- <location filename="../QMenuStrings.cpp" line="3450"/>
+ <location filename="../QMenuStrings.cpp" line="1311"/>
+ <location filename="../QMenuStrings.cpp" line="4424"/>
<source>C&hord Insert Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1540"/>
- <location filename="../QMenuStrings.cpp" line="3457"/>
+ <location filename="../QMenuStrings.cpp" line="1318"/>
+ <location filename="../QMenuStrings.cpp" line="4431"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1542"/>
- <location filename="../QMenuStrings.cpp" line="3478"/>
+ <location filename="../QMenuStrings.cpp" line="1320"/>
+ <location filename="../QMenuStrings.cpp" line="4452"/>
<source>Ste&p Recording</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1544"/>
- <location filename="../QMenuStrings.cpp" line="3480"/>
- <location filename="../QMenuStrings.cpp" line="4360"/>
+ <location filename="../QMenuStrings.cpp" line="1322"/>
+ <location filename="../QMenuStrings.cpp" line="2591"/>
+ <location filename="../QMenuStrings.cpp" line="4454"/>
<source>Rosegarden &Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3753"/>
+ <location filename="../QMenuStrings.cpp" line="2951"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../QMenuStrings.cpp" line="1984"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3754"/>
+ <location filename="../QMenuStrings.cpp" line="1985"/>
<source>Import &MIDI File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3755"/>
+ <location filename="../QMenuStrings.cpp" line="1986"/>
<source>Import &X11 Rosegarden File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3757"/>
+ <location filename="../QMenuStrings.cpp" line="1988"/>
<source>Import MusicXM&L File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3760"/>
+ <location filename="../QMenuStrings.cpp" line="1991"/>
<source>Merge &MIDI File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3761"/>
+ <location filename="../QMenuStrings.cpp" line="1992"/>
<source>Merge &X11 Rosegarden File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3763"/>
+ <location filename="../QMenuStrings.cpp" line="1994"/>
<source>Merge MusicXM&L File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3765"/>
+ <location filename="../QMenuStrings.cpp" line="1996"/>
<source>Export Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3766"/>
+ <location filename="../QMenuStrings.cpp" line="1997"/>
<source>Export &LilyPond File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3767"/>
+ <location filename="../QMenuStrings.cpp" line="1998"/>
<source>Export &MIDI File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3768"/>
+ <location filename="../QMenuStrings.cpp" line="1999"/>
<source>Export &Csound Score File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3769"/>
+ <location filename="../QMenuStrings.cpp" line="2000"/>
<source>Export M&up File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3770"/>
+ <location filename="../QMenuStrings.cpp" line="2001"/>
<source>Export Music&XML File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3790"/>
+ <location filename="../QMenuStrings.cpp" line="2021"/>
<source>Save &as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3976"/>
+ <location filename="../QMenuStrings.cpp" line="2207"/>
<source>Fit Existing Beats to Beat Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4029"/>
- <location filename="../QMenuStrings.cpp" line="4400"/>
+ <location filename="../QMenuStrings.cpp" line="1637"/>
+ <location filename="../QMenuStrings.cpp" line="2260"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4143"/>
+ <location filename="../QMenuStrings.cpp" line="2374"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1554"/>
- <location filename="../QMenuStrings.cpp" line="3490"/>
- <location filename="../QMenuStrings.cpp" line="4370"/>
+ <location filename="../QMenuStrings.cpp" line="1332"/>
+ <location filename="../QMenuStrings.cpp" line="2601"/>
+ <location filename="../QMenuStrings.cpp" line="4464"/>
<source>&Bug Reporting Guidelines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1556"/>
- <location filename="../QMenuStrings.cpp" line="3492"/>
- <location filename="../QMenuStrings.cpp" line="4372"/>
+ <location filename="../QMenuStrings.cpp" line="1334"/>
+ <location filename="../QMenuStrings.cpp" line="2603"/>
+ <location filename="../QMenuStrings.cpp" line="4466"/>
<source>About &Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1557"/>
- <location filename="../QMenuStrings.cpp" line="3493"/>
- <location filename="../QMenuStrings.cpp" line="4373"/>
+ <location filename="../QMenuStrings.cpp" line="1335"/>
+ <location filename="../QMenuStrings.cpp" line="2604"/>
+ <location filename="../QMenuStrings.cpp" line="4467"/>
<source>&Support Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1559"/>
- <location filename="../QMenuStrings.cpp" line="3495"/>
- <location filename="../QMenuStrings.cpp" line="4377"/>
+ <location filename="../QMenuStrings.cpp" line="1337"/>
+ <location filename="../QMenuStrings.cpp" line="2608"/>
+ <location filename="../QMenuStrings.cpp" line="4469"/>
<source>Tools Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1562"/>
- <location filename="../QMenuStrings.cpp" line="3685"/>
+ <location filename="../QMenuStrings.cpp" line="1340"/>
+ <location filename="../QMenuStrings.cpp" line="4659"/>
<source>Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1699"/>
- <location filename="../QMenuStrings.cpp" line="1747"/>
- <location filename="../QMenuStrings.cpp" line="4286"/>
+ <location filename="../QMenuStrings.cpp" line="1608"/>
+ <location filename="../QMenuStrings.cpp" line="1886"/>
+ <location filename="../QMenuStrings.cpp" line="2517"/>
<source>T&ransport</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1706"/>
- <location filename="../QMenuStrings.cpp" line="1754"/>
- <location filename="../QMenuStrings.cpp" line="4323"/>
+ <location filename="../QMenuStrings.cpp" line="1615"/>
+ <location filename="../QMenuStrings.cpp" line="1893"/>
+ <location filename="../QMenuStrings.cpp" line="2554"/>
<source>&Record</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1764"/>
+ <location filename="../QMenuStrings.cpp" line="1903"/>
<source>&Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1765"/>
+ <location filename="../QMenuStrings.cpp" line="1904"/>
<source>Number of Stereo &Inputs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1766"/>
+ <location filename="../QMenuStrings.cpp" line="1905"/>
<source>&1 Input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1767"/>
+ <location filename="../QMenuStrings.cpp" line="1906"/>
<source>&2 Inputs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1768"/>
+ <location filename="../QMenuStrings.cpp" line="1907"/>
<source>&4 Inputs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1769"/>
+ <location filename="../QMenuStrings.cpp" line="1908"/>
<source>&8 Inputs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1770"/>
+ <location filename="../QMenuStrings.cpp" line="1909"/>
<source>1&6 Inputs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1771"/>
+ <location filename="../QMenuStrings.cpp" line="1910"/>
<source>&Number of Submasters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1772"/>
+ <location filename="../QMenuStrings.cpp" line="1911"/>
<source>No Submasters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1773"/>
+ <location filename="../QMenuStrings.cpp" line="1912"/>
<source>&2 Submasters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1774"/>
+ <location filename="../QMenuStrings.cpp" line="1913"/>
<source>&4 Submasters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1775"/>
+ <location filename="../QMenuStrings.cpp" line="1914"/>
<source>&8 Submasters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1776"/>
+ <location filename="../QMenuStrings.cpp" line="1915"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1777"/>
+ <location filename="../QMenuStrings.cpp" line="1916"/>
<source>&0dB Law (Basic Balance Control)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1778"/>
+ <location filename="../QMenuStrings.cpp" line="1917"/>
<source>-&3dB Law (Constant Power)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1779"/>
+ <location filename="../QMenuStrings.cpp" line="1918"/>
<source>-&6dB Law (Reduced Center)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1780"/>
+ <location filename="../QMenuStrings.cpp" line="1919"/>
<source>&Alternate -3dB Law (Constant Power, 0dB Center)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1781"/>
+ <location filename="../QMenuStrings.cpp" line="1920"/>
<source>Show &Audio Faders</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1782"/>
+ <location filename="../QMenuStrings.cpp" line="1921"/>
<source>Show &Synth Faders</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1783"/>
+ <location filename="../QMenuStrings.cpp" line="1922"/>
<source>Show Audio Su&bmasters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1784"/>
+ <location filename="../QMenuStrings.cpp" line="1923"/>
<source>Show &Plugin Buttons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1785"/>
+ <location filename="../QMenuStrings.cpp" line="1924"/>
<source>Show &Unassigned Faders</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1799"/>
+ <location filename="../QMenuStrings.cpp" line="1829"/>
<source>Switch to Inserting Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1800"/>
+ <location filename="../QMenuStrings.cpp" line="1830"/>
<source>Collapse Rests After Erase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1811"/>
+ <location filename="../QMenuStrings.cpp" line="2784"/>
<source>P&rint Preview...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1812"/>
- <location filename="../QMenuStrings.cpp" line="3802"/>
+ <location filename="../QMenuStrings.cpp" line="2033"/>
+ <location filename="../QMenuStrings.cpp" line="2785"/>
<source>&Print...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1868"/>
+ <location filename="../QMenuStrings.cpp" line="2841"/>
<source>C&ut and Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1875"/>
+ <location filename="../QMenuStrings.cpp" line="2848"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1877"/>
+ <location filename="../QMenuStrings.cpp" line="2850"/>
<source>Pa&ste...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1884"/>
+ <location filename="../QMenuStrings.cpp" line="2857"/>
<source>Alt+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1886"/>
+ <location filename="../QMenuStrings.cpp" line="2859"/>
<source>De&lete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1895"/>
+ <location filename="../QMenuStrings.cpp" line="2868"/>
<source>&Move to Staff Above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1896"/>
+ <location filename="../QMenuStrings.cpp" line="2869"/>
<source>&Move to Staff Above...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1897"/>
+ <location filename="../QMenuStrings.cpp" line="2870"/>
<source>Move to Staff &Below</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1898"/>
+ <location filename="../QMenuStrings.cpp" line="2871"/>
<source>Move to Staff &Below...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1899"/>
+ <location filename="../QMenuStrings.cpp" line="2872"/>
<source>Select from Sta&rt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1900"/>
+ <location filename="../QMenuStrings.cpp" line="2873"/>
<source>Select to &End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1901"/>
+ <location filename="../QMenuStrings.cpp" line="2874"/>
<source>Select Whole St&aff</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1910"/>
+ <location filename="../QMenuStrings.cpp" line="2883"/>
<source>Clear Select&ion</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1938"/>
- <location filename="../QMenuStrings.cpp" line="3934"/>
+ <location filename="../QMenuStrings.cpp" line="2165"/>
+ <location filename="../QMenuStrings.cpp" line="2911"/>
<source>&Preferences...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1940"/>
+ <location filename="../QMenuStrings.cpp" line="2913"/>
<source>Note &Font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1941"/>
+ <location filename="../QMenuStrings.cpp" line="2914"/>
<source>Si&ze</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1942"/>
+ <location filename="../QMenuStrings.cpp" line="2915"/>
<source>S&pacing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1943"/>
+ <location filename="../QMenuStrings.cpp" line="2916"/>
<source>&Layout Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1944"/>
+ <location filename="../QMenuStrings.cpp" line="2917"/>
<source>&Linear Layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1945"/>
+ <location filename="../QMenuStrings.cpp" line="2918"/>
<source>&Continuous Page Layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1946"/>
+ <location filename="../QMenuStrings.cpp" line="2919"/>
<source>&Multiple Page Layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1947"/>
+ <location filename="../QMenuStrings.cpp" line="2920"/>
<source>Open L&yric Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1950"/>
- <location filename="../QMenuStrings.cpp" line="3939"/>
+ <location filename="../QMenuStrings.cpp" line="2170"/>
+ <location filename="../QMenuStrings.cpp" line="2923"/>
<source>Show T&ools Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1951"/>
+ <location filename="../QMenuStrings.cpp" line="2924"/>
<source>Show &Accidentals Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1952"/>
+ <location filename="../QMenuStrings.cpp" line="2925"/>
<source>Show Cle&fs Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1953"/>
+ <location filename="../QMenuStrings.cpp" line="2926"/>
<source>Show &Marks Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1954"/>
+ <location filename="../QMenuStrings.cpp" line="2927"/>
<source>Show &Group Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1955"/>
+ <location filename="../QMenuStrings.cpp" line="2928"/>
<source>Show &Symbols Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1956"/>
- <location filename="../QMenuStrings.cpp" line="3942"/>
+ <location filename="../QMenuStrings.cpp" line="2173"/>
+ <location filename="../QMenuStrings.cpp" line="2929"/>
<source>Show Trans&port Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1957"/>
+ <location filename="../QMenuStrings.cpp" line="2930"/>
<source>Show &Layout Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1958"/>
+ <location filename="../QMenuStrings.cpp" line="2931"/>
<source>Show La&yer Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1959"/>
+ <location filename="../QMenuStrings.cpp" line="2932"/>
<source>Show &Rulers Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1960"/>
+ <location filename="../QMenuStrings.cpp" line="2933"/>
<source>Show &Duration Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1965"/>
+ <location filename="../QMenuStrings.cpp" line="2938"/>
<source>Show Ra&w Note Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1970"/>
+ <location filename="../QMenuStrings.cpp" line="2943"/>
<source>Show &Track Headers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1971"/>
+ <location filename="../QMenuStrings.cpp" line="2944"/>
<source>Show &Annotations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1972"/>
+ <location filename="../QMenuStrings.cpp" line="2945"/>
<source>Show Lily&Pond Directives</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1973"/>
+ <location filename="../QMenuStrings.cpp" line="2946"/>
<source>Dump staves (debug)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1974"/>
+ <location filename="../QMenuStrings.cpp" line="2947"/>
<source>Dump BarDataMap (debug)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1983"/>
- <location filename="../QMenuStrings.cpp" line="4074"/>
- <location filename="../QMenuStrings.cpp" line="4445"/>
+ <location filename="../QMenuStrings.cpp" line="1682"/>
+ <location filename="../QMenuStrings.cpp" line="2305"/>
+ <location filename="../QMenuStrings.cpp" line="2957"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1984"/>
+ <location filename="../QMenuStrings.cpp" line="2958"/>
<source>Add Cle&f Change...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1987"/>
+ <location filename="../QMenuStrings.cpp" line="2961"/>
<source>Add Pedal &Press</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1988"/>
+ <location filename="../QMenuStrings.cpp" line="2962"/>
<source>Add Pedal &Release</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1992"/>
- <location filename="../QMenuStrings.cpp" line="4103"/>
+ <location filename="../QMenuStrings.cpp" line="2334"/>
+ <location filename="../QMenuStrings.cpp" line="2966"/>
<source>&Convert Notation for...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1919"/>
+ <location filename="../QMenuStrings.cpp" line="2892"/>
<source>Search and Selec&t</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1961"/>
+ <location filename="../QMenuStrings.cpp" line="2934"/>
<source>Show &Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1993"/>
+ <location filename="../QMenuStrings.cpp" line="2967"/>
<source>Add &Layer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2000"/>
+ <location filename="../QMenuStrings.cpp" line="2974"/>
<source>Ctrl+Alt++</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2003"/>
+ <location filename="../QMenuStrings.cpp" line="2977"/>
<source>N&ote</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2004"/>
+ <location filename="../QMenuStrings.cpp" line="2978"/>
<source>Mar&ks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2005"/>
+ <location filename="../QMenuStrings.cpp" line="2979"/>
<source>Add &Accent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2006"/>
+ <location filename="../QMenuStrings.cpp" line="2980"/>
<source>Add T&enuto</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2007"/>
+ <location filename="../QMenuStrings.cpp" line="2981"/>
<source>Add Sta&ccato</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2008"/>
+ <location filename="../QMenuStrings.cpp" line="2982"/>
<source>Add &Staccatissimo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2009"/>
+ <location filename="../QMenuStrings.cpp" line="2983"/>
<source>Add &Marcato</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2010"/>
+ <location filename="../QMenuStrings.cpp" line="2984"/>
<source>Add &Open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2011"/>
+ <location filename="../QMenuStrings.cpp" line="2985"/>
<source>Add &Stopped</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2012"/>
+ <location filename="../QMenuStrings.cpp" line="2986"/>
<source>Add S&forzando</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2013"/>
+ <location filename="../QMenuStrings.cpp" line="2987"/>
<source>Add R&inforzando</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2014"/>
+ <location filename="../QMenuStrings.cpp" line="2988"/>
<source>Add Tri&ll</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2015"/>
+ <location filename="../QMenuStrings.cpp" line="2989"/>
<source>Add &Turn</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2016"/>
+ <location filename="../QMenuStrings.cpp" line="2990"/>
<source>Add M&ordent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2017"/>
+ <location filename="../QMenuStrings.cpp" line="2991"/>
<source>Add I&nverted Mordent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2018"/>
+ <location filename="../QMenuStrings.cpp" line="2992"/>
<source>Add Long Mordent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2019"/>
+ <location filename="../QMenuStrings.cpp" line="2993"/>
<source>Add Lon&g Inverted Mordent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2020"/>
+ <location filename="../QMenuStrings.cpp" line="2994"/>
<source>Add &Up-Bow</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2021"/>
+ <location filename="../QMenuStrings.cpp" line="2995"/>
<source>Add &Down-Bow</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2022"/>
+ <location filename="../QMenuStrings.cpp" line="2996"/>
<source>Add &Harmonic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2023"/>
+ <location filename="../QMenuStrings.cpp" line="2997"/>
<source>Add &Pause</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2024"/>
+ <location filename="../QMenuStrings.cpp" line="2998"/>
<source>Add Te&xt Mark...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2025"/>
+ <location filename="../QMenuStrings.cpp" line="2999"/>
<source>&Remove All Marks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2026"/>
+ <location filename="../QMenuStrings.cpp" line="3000"/>
<source>&Ornaments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2027"/>
+ <location filename="../QMenuStrings.cpp" line="3001"/>
<source>Trigger &Ornament...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2028"/>
+ <location filename="../QMenuStrings.cpp" line="3002"/>
<source>&Remove Ornament...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2029"/>
+ <location filename="../QMenuStrings.cpp" line="3003"/>
<source>Ma&ke Ornament...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2034"/>
+ <location filename="../QMenuStrings.cpp" line="3008"/>
<source>&Fingerings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2035"/>
+ <location filename="../QMenuStrings.cpp" line="3009"/>
<source>&Remove Fingerings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2036"/>
+ <location filename="../QMenuStrings.cpp" line="3010"/>
<source>Add Fingering &0 (Thumb)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2043"/>
+ <location filename="../QMenuStrings.cpp" line="3017"/>
<source>Alt+0</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2045"/>
+ <location filename="../QMenuStrings.cpp" line="3019"/>
<source>Add Fingering &1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2052"/>
+ <location filename="../QMenuStrings.cpp" line="3026"/>
<source>Alt+1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2054"/>
+ <location filename="../QMenuStrings.cpp" line="3028"/>
<source>Add Fingering &2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2061"/>
+ <location filename="../QMenuStrings.cpp" line="3035"/>
<source>Alt+2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2063"/>
+ <location filename="../QMenuStrings.cpp" line="3037"/>
<source>Add Fingering &3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2070"/>
+ <location filename="../QMenuStrings.cpp" line="3044"/>
<source>Alt+3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2072"/>
+ <location filename="../QMenuStrings.cpp" line="3046"/>
<source>Add Fingering &4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2079"/>
+ <location filename="../QMenuStrings.cpp" line="3053"/>
<source>Alt+4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2081"/>
+ <location filename="../QMenuStrings.cpp" line="3055"/>
<source>Add Fingering &5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2088"/>
+ <location filename="../QMenuStrings.cpp" line="3062"/>
<source>Alt+5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2090"/>
+ <location filename="../QMenuStrings.cpp" line="3064"/>
<source>&Add Fingering +</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2097"/>
+ <location filename="../QMenuStrings.cpp" line="3071"/>
<source>Alt+9</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2099"/>
+ <location filename="../QMenuStrings.cpp" line="3073"/>
<source>Add Other &Fingering...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2100"/>
+ <location filename="../QMenuStrings.cpp" line="3074"/>
<source>S&lashes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2101"/>
+ <location filename="../QMenuStrings.cpp" line="3075"/>
<source>&None</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2102"/>
+ <location filename="../QMenuStrings.cpp" line="3076"/>
<source>&1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2103"/>
+ <location filename="../QMenuStrings.cpp" line="3077"/>
<source>&2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2104"/>
+ <location filename="../QMenuStrings.cpp" line="3078"/>
<source>&3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2105"/>
+ <location filename="../QMenuStrings.cpp" line="3079"/>
<source>&4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2106"/>
+ <location filename="../QMenuStrings.cpp" line="3080"/>
<source>&5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2107"/>
+ <location filename="../QMenuStrings.cpp" line="3081"/>
<source>&Cycle Slashes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2114"/>
+ <location filename="../QMenuStrings.cpp" line="3088"/>
<source>/</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2116"/>
+ <location filename="../QMenuStrings.cpp" line="3090"/>
<source>Note &Style</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2117"/>
+ <location filename="../QMenuStrings.cpp" line="3091"/>
<source>Classical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2118"/>
+ <location filename="../QMenuStrings.cpp" line="3092"/>
<source>Cross</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2119"/>
+ <location filename="../QMenuStrings.cpp" line="3093"/>
<source>Mensural</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2120"/>
+ <location filename="../QMenuStrings.cpp" line="3094"/>
<location filename="../InstrumentStrings.cpp" line="286"/>
<source>Triangle</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2121"/>
- <location filename="../QMenuStrings.cpp" line="2829"/>
+ <location filename="../QMenuStrings.cpp" line="3095"/>
+ <location filename="../QMenuStrings.cpp" line="3803"/>
<source>&Accidentals</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2122"/>
+ <location filename="../QMenuStrings.cpp" line="3096"/>
<source>&Restore Accidentals</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2123"/>
+ <location filename="../QMenuStrings.cpp" line="3097"/>
<source>Respell with Dou&ble Flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2124"/>
+ <location filename="../QMenuStrings.cpp" line="3098"/>
<source>Respell with &Flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2125"/>
+ <location filename="../QMenuStrings.cpp" line="3099"/>
<source>Respell with &Natural</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2126"/>
+ <location filename="../QMenuStrings.cpp" line="3100"/>
<source>Respell with &Sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2127"/>
+ <location filename="../QMenuStrings.cpp" line="3101"/>
<source>Respell with Do&uble Sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2128"/>
+ <location filename="../QMenuStrings.cpp" line="3102"/>
<source>Use &Cautionary Accidentals</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2129"/>
+ <location filename="../QMenuStrings.cpp" line="3103"/>
<source>Cancel C&autionary Accidentals</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2130"/>
+ <location filename="../QMenuStrings.cpp" line="3104"/>
<source>Stem &Up</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2137"/>
+ <location filename="../QMenuStrings.cpp" line="3111"/>
<source>Ctrl+PgUp</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2139"/>
+ <location filename="../QMenuStrings.cpp" line="3113"/>
<source>Stem &Down</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2146"/>
+ <location filename="../QMenuStrings.cpp" line="3120"/>
<source>Ctrl+PgDown</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2148"/>
+ <location filename="../QMenuStrings.cpp" line="3122"/>
<source>&Restore Stems</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="668"/>
- <location filename="../QMenuStrings.cpp" line="2149"/>
+ <location filename="../QMenuStrings.cpp" line="446"/>
+ <location filename="../QMenuStrings.cpp" line="3123"/>
<source>&Phrase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2150"/>
+ <location filename="../QMenuStrings.cpp" line="3124"/>
<source>&Make Chord</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2151"/>
+ <location filename="../QMenuStrings.cpp" line="3125"/>
<source>&Beam Group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2158"/>
+ <location filename="../QMenuStrings.cpp" line="3132"/>
<source>Ctrl+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2160"/>
+ <location filename="../QMenuStrings.cpp" line="3134"/>
<source>&Auto-Beam</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2167"/>
+ <location filename="../QMenuStrings.cpp" line="3141"/>
<source>Ctrl+Alt+B</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2169"/>
+ <location filename="../QMenuStrings.cpp" line="3143"/>
<source>&Unbeam</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2176"/>
+ <location filename="../QMenuStrings.cpp" line="3150"/>
<source>Ctrl+U</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2178"/>
+ <location filename="../QMenuStrings.cpp" line="3152"/>
<source>Tupl&et...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2185"/>
- <location filename="../QMenuStrings.cpp" line="4153"/>
+ <location filename="../QMenuStrings.cpp" line="2384"/>
+ <location filename="../QMenuStrings.cpp" line="3159"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2187"/>
+ <location filename="../QMenuStrings.cpp" line="3161"/>
<source>&Triplet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2194"/>
+ <location filename="../QMenuStrings.cpp" line="3168"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2196"/>
+ <location filename="../QMenuStrings.cpp" line="3170"/>
<source>U&ntuplet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2197"/>
+ <location filename="../QMenuStrings.cpp" line="3171"/>
<source>Add S&lur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2204"/>
+ <location filename="../QMenuStrings.cpp" line="3178"/>
<source>)</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2206"/>
+ <location filename="../QMenuStrings.cpp" line="3180"/>
<source>Add P&hrasing Slur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2213"/>
+ <location filename="../QMenuStrings.cpp" line="3187"/>
<source>Ctrl+)</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2215"/>
+ <location filename="../QMenuStrings.cpp" line="3189"/>
<source>Slur &Position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2216"/>
+ <location filename="../QMenuStrings.cpp" line="3190"/>
<source>&Restore Slur Positions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2217"/>
+ <location filename="../QMenuStrings.cpp" line="3191"/>
<source>Slur &Above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2218"/>
+ <location filename="../QMenuStrings.cpp" line="3192"/>
<source>Slur &Below</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="669"/>
- <location filename="../QMenuStrings.cpp" line="2219"/>
+ <location filename="../QMenuStrings.cpp" line="447"/>
+ <location filename="../QMenuStrings.cpp" line="3193"/>
<source>T&ie</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="676"/>
- <location filename="../QMenuStrings.cpp" line="2226"/>
+ <location filename="../QMenuStrings.cpp" line="454"/>
+ <location filename="../QMenuStrings.cpp" line="3200"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="678"/>
- <location filename="../QMenuStrings.cpp" line="2228"/>
+ <location filename="../QMenuStrings.cpp" line="456"/>
+ <location filename="../QMenuStrings.cpp" line="3202"/>
<source>&Untie</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2237"/>
+ <location filename="../QMenuStrings.cpp" line="3211"/>
<source>Tie &Position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2238"/>
+ <location filename="../QMenuStrings.cpp" line="3212"/>
<source>&Restore Tie Position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2239"/>
+ <location filename="../QMenuStrings.cpp" line="3213"/>
<source>Tie &Above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2240"/>
+ <location filename="../QMenuStrings.cpp" line="3214"/>
<source>Tie &Below</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2241"/>
+ <location filename="../QMenuStrings.cpp" line="3215"/>
<source>Add &Crescendo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2248"/>
+ <location filename="../QMenuStrings.cpp" line="3222"/>
<source><</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2250"/>
+ <location filename="../QMenuStrings.cpp" line="3224"/>
<source>Add &Decescendo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2257"/>
+ <location filename="../QMenuStrings.cpp" line="3231"/>
<source>></source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2259"/>
+ <location filename="../QMenuStrings.cpp" line="3233"/>
<source>Add Trill With &Line</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2260"/>
+ <location filename="../QMenuStrings.cpp" line="3234"/>
<source>&Octaves</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2261"/>
+ <location filename="../QMenuStrings.cpp" line="3235"/>
<source>&Add Double-Octave Up</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2262"/>
+ <location filename="../QMenuStrings.cpp" line="3236"/>
<source>Add Octave &Up</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2263"/>
+ <location filename="../QMenuStrings.cpp" line="3237"/>
<source>Add Octave &Down</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2264"/>
+ <location filename="../QMenuStrings.cpp" line="3238"/>
<source>Add Double &Octave Down</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2265"/>
+ <location filename="../QMenuStrings.cpp" line="3239"/>
<source>&Figuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2266"/>
+ <location filename="../QMenuStrings.cpp" line="3240"/>
<source>Make &Parameter Chord</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2267"/>
+ <location filename="../QMenuStrings.cpp" line="3241"/>
<source>Mark Selection as &Figuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2270"/>
+ <location filename="../QMenuStrings.cpp" line="3244"/>
<source>R&ests</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2271"/>
+ <location filename="../QMenuStrings.cpp" line="3245"/>
<source>&Normalize Rests</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2278"/>
- <location filename="../QMenuStrings.cpp" line="3750"/>
+ <location filename="../QMenuStrings.cpp" line="1981"/>
+ <location filename="../QMenuStrings.cpp" line="3252"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2280"/>
+ <location filename="../QMenuStrings.cpp" line="3254"/>
<source>&Collapse Rests</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2281"/>
+ <location filename="../QMenuStrings.cpp" line="3255"/>
<source>&Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="735"/>
- <location filename="../QMenuStrings.cpp" line="2289"/>
+ <location filename="../QMenuStrings.cpp" line="513"/>
+ <location filename="../QMenuStrings.cpp" line="3263"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2291"/>
+ <location filename="../QMenuStrings.cpp" line="3265"/>
<source>Tie Notes at &Barlines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2292"/>
+ <location filename="../QMenuStrings.cpp" line="3266"/>
<source>Split-and-Tie Overlapping &Chords</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2293"/>
+ <location filename="../QMenuStrings.cpp" line="3267"/>
<source>Cycle &Dots</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2300"/>
+ <location filename="../QMenuStrings.cpp" line="3274"/>
<source>Ctrl+.</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2302"/>
+ <location filename="../QMenuStrings.cpp" line="3276"/>
<source>Cycle Dots With&out Duration Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2309"/>
+ <location filename="../QMenuStrings.cpp" line="3283"/>
<source>Ctrl+Alt+.</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2311"/>
+ <location filename="../QMenuStrings.cpp" line="3285"/>
<source>Double Whole Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2318"/>
+ <location filename="../QMenuStrings.cpp" line="3292"/>
<source>Ctrl+5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2320"/>
+ <location filename="../QMenuStrings.cpp" line="3294"/>
<source>Whole Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2327"/>
+ <location filename="../QMenuStrings.cpp" line="3301"/>
<source>Ctrl+1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2329"/>
+ <location filename="../QMenuStrings.cpp" line="3303"/>
<source>Half Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2336"/>
+ <location filename="../QMenuStrings.cpp" line="3310"/>
<source>Ctrl+2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2338"/>
+ <location filename="../QMenuStrings.cpp" line="3312"/>
<source>Quarter Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2345"/>
+ <location filename="../QMenuStrings.cpp" line="3319"/>
<source>Ctrl+4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2347"/>
+ <location filename="../QMenuStrings.cpp" line="3321"/>
<source>Eighth Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2354"/>
+ <location filename="../QMenuStrings.cpp" line="3328"/>
<source>Ctrl+8</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2356"/>
+ <location filename="../QMenuStrings.cpp" line="3330"/>
<source>Sixteenth Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2363"/>
+ <location filename="../QMenuStrings.cpp" line="3337"/>
<source>Ctrl+6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2365"/>
+ <location filename="../QMenuStrings.cpp" line="3339"/>
<source>Thirty-Second Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2372"/>
+ <location filename="../QMenuStrings.cpp" line="3346"/>
<source>Ctrl+3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2374"/>
+ <location filename="../QMenuStrings.cpp" line="3348"/>
<source>Sixty-Fourth Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2381"/>
+ <location filename="../QMenuStrings.cpp" line="3355"/>
<source>Ctrl+0</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2383"/>
+ <location filename="../QMenuStrings.cpp" line="3357"/>
<source>Double Whole Note (Without Duration Change)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2390"/>
+ <location filename="../QMenuStrings.cpp" line="3364"/>
<source>Ctrl+Alt+5</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2392"/>
+ <location filename="../QMenuStrings.cpp" line="3366"/>
<source>Whole Note (Without Duration Change)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2399"/>
+ <location filename="../QMenuStrings.cpp" line="3373"/>
<source>Ctrl+Alt+1</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2401"/>
+ <location filename="../QMenuStrings.cpp" line="3375"/>
<source>Half Note (Without Duration Change)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2408"/>
+ <location filename="../QMenuStrings.cpp" line="3382"/>
<source>Ctrl+Alt+2</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2410"/>
+ <location filename="../QMenuStrings.cpp" line="3384"/>
<source>Quarter Note (Without Duration Change)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2417"/>
+ <location filename="../QMenuStrings.cpp" line="3391"/>
<source>Ctrl+Alt+4</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2419"/>
+ <location filename="../QMenuStrings.cpp" line="3393"/>
<source>Eighth Note (Without Duration Change)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2426"/>
+ <location filename="../QMenuStrings.cpp" line="3400"/>
<source>Ctrl+Alt+8</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2428"/>
+ <location filename="../QMenuStrings.cpp" line="3402"/>
<source>Sixteenth Note (Without Duration Change)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2435"/>
+ <location filename="../QMenuStrings.cpp" line="3409"/>
<source>Ctrl+Alt+6</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2437"/>
+ <location filename="../QMenuStrings.cpp" line="3411"/>
<source>Thirty-Second Note (Without Duration Change)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2444"/>
+ <location filename="../QMenuStrings.cpp" line="3418"/>
<source>Ctrl+Alt+3</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2446"/>
+ <location filename="../QMenuStrings.cpp" line="3420"/>
<source>Sixty-Fourth Note (Without Duration Change)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2453"/>
+ <location filename="../QMenuStrings.cpp" line="3427"/>
<source>Ctrl+Alt+0</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2465"/>
+ <location filename="../QMenuStrings.cpp" line="3439"/>
<source>Fi&x Notation Quantization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2466"/>
+ <location filename="../QMenuStrings.cpp" line="3440"/>
<source>Remo&ve Notation Quantization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2467"/>
+ <location filename="../QMenuStrings.cpp" line="3441"/>
<source>&Interpret...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2468"/>
+ <location filename="../QMenuStrings.cpp" line="3442"/>
<source>Rescale</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2527"/>
+ <location filename="../QMenuStrings.cpp" line="3501"/>
<source>Convert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2531"/>
+ <location filename="../QMenuStrings.cpp" line="3505"/>
<source>Ve&locities</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2550"/>
+ <location filename="../QMenuStrings.cpp" line="3524"/>
<source>Set Event &Velocities</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2551"/>
+ <location filename="../QMenuStrings.cpp" line="3525"/>
<source>&Fine Positioning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2552"/>
+ <location filename="../QMenuStrings.cpp" line="3526"/>
<source>&Restore Positions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2553"/>
+ <location filename="../QMenuStrings.cpp" line="3527"/>
<source>Push &Left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2554"/>
+ <location filename="../QMenuStrings.cpp" line="3528"/>
<source>&Push Right</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2555"/>
+ <location filename="../QMenuStrings.cpp" line="3529"/>
<source>Push &Up</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2556"/>
+ <location filename="../QMenuStrings.cpp" line="3530"/>
<source>Push &Down</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2557"/>
+ <location filename="../QMenuStrings.cpp" line="3531"/>
<source>Fine Ti&ming</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2567"/>
- <location filename="../QMenuStrings.cpp" line="4117"/>
+ <location filename="../QMenuStrings.cpp" line="2348"/>
+ <location filename="../QMenuStrings.cpp" line="3541"/>
<source>Jog &Right</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2576"/>
+ <location filename="../QMenuStrings.cpp" line="3550"/>
<source>&Visibility</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2577"/>
+ <location filename="../QMenuStrings.cpp" line="3551"/>
<source>Make &Invisible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2578"/>
+ <location filename="../QMenuStrings.cpp" line="3552"/>
<source>Make &Visible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2588"/>
+ <location filename="../QMenuStrings.cpp" line="3562"/>
<source>Cursor back and Se&lect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2642"/>
+ <location filename="../QMenuStrings.cpp" line="3616"/>
<source>Next Staff &Up</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2649"/>
+ <location filename="../QMenuStrings.cpp" line="3623"/>
<source>Alt+Up</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2651"/>
+ <location filename="../QMenuStrings.cpp" line="3625"/>
<source>Next Staff &Down</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2658"/>
+ <location filename="../QMenuStrings.cpp" line="3632"/>
<source>Alt+Down</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2683"/>
+ <location filename="../QMenuStrings.cpp" line="3657"/>
<source>Play</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2690"/>
+ <location filename="../QMenuStrings.cpp" line="3664"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2745"/>
- <location filename="../QMenuStrings.cpp" line="4381"/>
+ <location filename="../QMenuStrings.cpp" line="2612"/>
+ <location filename="../QMenuStrings.cpp" line="3719"/>
<source>Rewind to Beginning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2752"/>
- <location filename="../QMenuStrings.cpp" line="4390"/>
+ <location filename="../QMenuStrings.cpp" line="2621"/>
+ <location filename="../QMenuStrings.cpp" line="3726"/>
<source>Fast Forward to End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2768"/>
+ <location filename="../QMenuStrings.cpp" line="3742"/>
<source>Solo the Active Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2783"/>
+ <location filename="../QMenuStrings.cpp" line="3757"/>
<source>Scroll to Follow Playback</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2798"/>
+ <location filename="../QMenuStrings.cpp" line="3772"/>
<source>Panic! (Ctrl+Alt+P)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2811"/>
+ <location filename="../QMenuStrings.cpp" line="3785"/>
<source>Draw &Notes and Rests</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2830"/>
+ <location filename="../QMenuStrings.cpp" line="3804"/>
<source>&No Accidental</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2831"/>
+ <location filename="../QMenuStrings.cpp" line="3805"/>
<source>&Follow Previous Accidental</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2832"/>
+ <location filename="../QMenuStrings.cpp" line="3806"/>
<source>&Sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2833"/>
+ <location filename="../QMenuStrings.cpp" line="3807"/>
<source>F&lat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2834"/>
+ <location filename="../QMenuStrings.cpp" line="3808"/>
<source>N&atural</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2835"/>
+ <location filename="../QMenuStrings.cpp" line="3809"/>
<source>&Double Sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2836"/>
+ <location filename="../QMenuStrings.cpp" line="3810"/>
<source>D&ouble Flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2837"/>
+ <location filename="../QMenuStrings.cpp" line="3811"/>
<source>&Clefs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2838"/>
+ <location filename="../QMenuStrings.cpp" line="3812"/>
<source>&Treble Clef</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2839"/>
+ <location filename="../QMenuStrings.cpp" line="3813"/>
<source>&Alto Clef</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2840"/>
+ <location filename="../QMenuStrings.cpp" line="3814"/>
<source>Te&nor Clef</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2841"/>
+ <location filename="../QMenuStrings.cpp" line="3815"/>
<source>&Bass Clef</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2842"/>
+ <location filename="../QMenuStrings.cpp" line="3816"/>
<source>S&ymbols</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2843"/>
+ <location filename="../QMenuStrings.cpp" line="3817"/>
<source>Add &Segno</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2844"/>
+ <location filename="../QMenuStrings.cpp" line="3818"/>
<source>Add &Coda</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2845"/>
+ <location filename="../QMenuStrings.cpp" line="3819"/>
<source>Add &Breath mark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2846"/>
+ <location filename="../QMenuStrings.cpp" line="3820"/>
<source>&Text</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2853"/>
+ <location filename="../QMenuStrings.cpp" line="3827"/>
<source>F8</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2855"/>
+ <location filename="../QMenuStrings.cpp" line="3829"/>
<source>&Guitar Chord</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2862"/>
+ <location filename="../QMenuStrings.cpp" line="3836"/>
<source>F9</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2864"/>
+ <location filename="../QMenuStrings.cpp" line="3838"/>
<source>&Durations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2865"/>
+ <location filename="../QMenuStrings.cpp" line="3839"/>
<source>&Double Whole Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2874"/>
+ <location filename="../QMenuStrings.cpp" line="3848"/>
<source>&Whole Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2883"/>
+ <location filename="../QMenuStrings.cpp" line="3857"/>
<source>&Half Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2892"/>
+ <location filename="../QMenuStrings.cpp" line="3866"/>
<source>&Quarter Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2901"/>
+ <location filename="../QMenuStrings.cpp" line="3875"/>
<source>&Eighth Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2910"/>
+ <location filename="../QMenuStrings.cpp" line="3884"/>
<source>&Sixteenth note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2919"/>
+ <location filename="../QMenuStrings.cpp" line="3893"/>
<source>&Thirty-Second Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2928"/>
+ <location filename="../QMenuStrings.cpp" line="3902"/>
<source>Sixty-&Fourth Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2937"/>
+ <location filename="../QMenuStrings.cpp" line="3911"/>
<source>D&otted Whole Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2938"/>
+ <location filename="../QMenuStrings.cpp" line="3912"/>
<source>Dotted Ha&lf Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2939"/>
+ <location filename="../QMenuStrings.cpp" line="3913"/>
<source>Dotted Q&uarter Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2940"/>
+ <location filename="../QMenuStrings.cpp" line="3914"/>
<source>Dotted E&ighth Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2941"/>
+ <location filename="../QMenuStrings.cpp" line="3915"/>
<source>Dotted Si&xteenth Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2942"/>
+ <location filename="../QMenuStrings.cpp" line="3916"/>
<source>Dotted Thirt&y-Second Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3730"/>
+ <location filename="../QMenuStrings.cpp" line="1343"/>
<source>Switch To &Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2950"/>
- <location filename="../QMenuStrings.cpp" line="2959"/>
+ <location filename="../QMenuStrings.cpp" line="3924"/>
+ <location filename="../QMenuStrings.cpp" line="3933"/>
<source>Y</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3731"/>
+ <location filename="../QMenuStrings.cpp" line="1344"/>
<source>Switch To &Rests</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3732"/>
+ <location filename="../QMenuStrings.cpp" line="1345"/>
<source>To&ggle Dot On</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2968"/>
- <location filename="../QMenuStrings.cpp" line="2977"/>
+ <location filename="../QMenuStrings.cpp" line="3942"/>
+ <location filename="../QMenuStrings.cpp" line="3951"/>
<source>.</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3733"/>
+ <location filename="../QMenuStrings.cpp" line="1346"/>
<source>To&ggle Dot Off</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3441"/>
+ <location filename="../QMenuStrings.cpp" line="4415"/>
<source>Insert Rest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="493"/>
+ <location filename="../QMenuStrings.cpp" line="271"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="502"/>
+ <location filename="../QMenuStrings.cpp" line="280"/>
<source>Nothing to &Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="857"/>
- <location filename="../QMenuStrings.cpp" line="2580"/>
+ <location filename="../QMenuStrings.cpp" line="635"/>
+ <location filename="../QMenuStrings.cpp" line="3554"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="858"/>
- <location filename="../QMenuStrings.cpp" line="2581"/>
+ <location filename="../QMenuStrings.cpp" line="636"/>
+ <location filename="../QMenuStrings.cpp" line="3555"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="860"/>
- <location filename="../QMenuStrings.cpp" line="2583"/>
+ <location filename="../QMenuStrings.cpp" line="638"/>
+ <location filename="../QMenuStrings.cpp" line="3557"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1553"/>
- <location filename="../QMenuStrings.cpp" line="3489"/>
+ <location filename="../QMenuStrings.cpp" line="1331"/>
+ <location filename="../QMenuStrings.cpp" line="4463"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1823"/>
- <location filename="../QMenuStrings.cpp" line="3824"/>
- <location filename="../QMenuStrings.cpp" line="4375"/>
- <location filename="../QMenuStrings.cpp" line="4454"/>
+ <location filename="../QMenuStrings.cpp" line="1691"/>
+ <location filename="../QMenuStrings.cpp" line="2055"/>
+ <location filename="../QMenuStrings.cpp" line="2606"/>
+ <location filename="../QMenuStrings.cpp" line="2796"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1832"/>
- <location filename="../QMenuStrings.cpp" line="3833"/>
- <location filename="../QMenuStrings.cpp" line="4376"/>
- <location filename="../QMenuStrings.cpp" line="4463"/>
+ <location filename="../QMenuStrings.cpp" line="1700"/>
+ <location filename="../QMenuStrings.cpp" line="2064"/>
+ <location filename="../QMenuStrings.cpp" line="2607"/>
+ <location filename="../QMenuStrings.cpp" line="2805"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1937"/>
+ <location filename="../QMenuStrings.cpp" line="2910"/>
<source>&Guess Beats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1985"/>
+ <location filename="../QMenuStrings.cpp" line="2959"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2002"/>
+ <location filename="../QMenuStrings.cpp" line="2976"/>
<source>Unadopt an Adopted Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2030"/>
+ <location filename="../QMenuStrings.cpp" line="3004"/>
<source>&Edit Ornament as Notation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2031"/>
+ <location filename="../QMenuStrings.cpp" line="3005"/>
<source>&Show Expansion of Ornament</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2032"/>
+ <location filename="../QMenuStrings.cpp" line="3006"/>
<source>Skip This Part of Ornament (&Mask Tied Note)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2033"/>
+ <location filename="../QMenuStrings.cpp" line="3007"/>
<source>Don't Skip This Part (&Unmask Tied Note)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2268"/>
+ <location filename="../QMenuStrings.cpp" line="3242"/>
<source>Mark Selection as Auto-Generated</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2584"/>
+ <location filename="../QMenuStrings.cpp" line="3558"/>
<source>Insert &Expression Controller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2810"/>
+ <location filename="../QMenuStrings.cpp" line="3784"/>
<source>Select but Don't Follow Ties</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2943"/>
+ <location filename="../QMenuStrings.cpp" line="3917"/>
<source>Switch to &Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2952"/>
+ <location filename="../QMenuStrings.cpp" line="3926"/>
<source>Switch to &Rests</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2961"/>
+ <location filename="../QMenuStrings.cpp" line="3935"/>
<source>To&ggle Dot on</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2970"/>
+ <location filename="../QMenuStrings.cpp" line="3944"/>
<source>To&ggle Dot off</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3448"/>
- <location filename="../QMenuStrings.cpp" line="3964"/>
+ <location filename="../QMenuStrings.cpp" line="2195"/>
+ <location filename="../QMenuStrings.cpp" line="4422"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3459"/>
+ <location filename="../QMenuStrings.cpp" line="4433"/>
<source>Triplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3466"/>
- <location filename="../QMenuStrings.cpp" line="4656"/>
+ <location filename="../QMenuStrings.cpp" line="120"/>
+ <location filename="../QMenuStrings.cpp" line="4440"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3468"/>
+ <location filename="../QMenuStrings.cpp" line="4442"/>
<source>Tuplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3475"/>
+ <location filename="../QMenuStrings.cpp" line="4449"/>
<source>;</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3477"/>
+ <location filename="../QMenuStrings.cpp" line="4451"/>
<source>Grace Insert &Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3497"/>
+ <location filename="../QMenuStrings.cpp" line="4471"/>
<source>Duration Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3502"/>
+ <location filename="../QMenuStrings.cpp" line="4476"/>
<source>Double Whole Note (5)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3508"/>
+ <location filename="../QMenuStrings.cpp" line="4482"/>
<source>Whole Note (1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3514"/>
+ <location filename="../QMenuStrings.cpp" line="4488"/>
<source>Half Note (2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3520"/>
+ <location filename="../QMenuStrings.cpp" line="4494"/>
<source>Quarter Note (4)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3526"/>
+ <location filename="../QMenuStrings.cpp" line="4500"/>
<source>Eighth Note (8)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3532"/>
+ <location filename="../QMenuStrings.cpp" line="4506"/>
<source>Sixteenth Note (6)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3538"/>
+ <location filename="../QMenuStrings.cpp" line="4512"/>
<source>Thirty-Second Note (3)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3544"/>
+ <location filename="../QMenuStrings.cpp" line="4518"/>
<source>Sixty-Fourth Note (0)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3550"/>
+ <location filename="../QMenuStrings.cpp" line="4524"/>
<source>Dotted Double Whole Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3556"/>
+ <location filename="../QMenuStrings.cpp" line="4530"/>
<source>Dotted Whole Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3562"/>
+ <location filename="../QMenuStrings.cpp" line="4536"/>
<source>Dotted Half Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3568"/>
+ <location filename="../QMenuStrings.cpp" line="4542"/>
<source>Dotted Quarter Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3574"/>
+ <location filename="../QMenuStrings.cpp" line="4548"/>
<source>Dotted Eighth Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3580"/>
+ <location filename="../QMenuStrings.cpp" line="4554"/>
<source>Dotted Sixteenth Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3586"/>
+ <location filename="../QMenuStrings.cpp" line="4560"/>
<source>Dotted Thirty-Second Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3592"/>
+ <location filename="../QMenuStrings.cpp" line="4566"/>
<source>Double Whole Rest (5)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3598"/>
+ <location filename="../QMenuStrings.cpp" line="4572"/>
<source>Whole Rest (1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3604"/>
+ <location filename="../QMenuStrings.cpp" line="4578"/>
<source>Half Rest (2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3610"/>
+ <location filename="../QMenuStrings.cpp" line="4584"/>
<source>Quarter Rest (4)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3616"/>
+ <location filename="../QMenuStrings.cpp" line="4590"/>
<source>Eighth Rest (8)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3622"/>
+ <location filename="../QMenuStrings.cpp" line="4596"/>
<source>Sixteenth Rest (6)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3628"/>
+ <location filename="../QMenuStrings.cpp" line="4602"/>
<source>Thirty-Second Rest (3)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3634"/>
+ <location filename="../QMenuStrings.cpp" line="4608"/>
<source>Sixty-Fourth Rest (0)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3640"/>
+ <location filename="../QMenuStrings.cpp" line="4614"/>
<source>Dotted Double Whole Rest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3646"/>
+ <location filename="../QMenuStrings.cpp" line="4620"/>
<source>Dotted Whole Rest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3652"/>
+ <location filename="../QMenuStrings.cpp" line="4626"/>
<source>Dotted Half Rest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3658"/>
+ <location filename="../QMenuStrings.cpp" line="4632"/>
<source>Dotted Quarter Rest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3664"/>
+ <location filename="../QMenuStrings.cpp" line="4638"/>
<source>Dotted Eighth Rest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3670"/>
+ <location filename="../QMenuStrings.cpp" line="4644"/>
<source>Dotted Sixteenth Rest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3676"/>
+ <location filename="../QMenuStrings.cpp" line="4650"/>
<source>Dotted Thirty-Second Rest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3678"/>
+ <location filename="../QMenuStrings.cpp" line="4652"/>
<source>Clefs Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3679"/>
+ <location filename="../QMenuStrings.cpp" line="4653"/>
<source>Accidentals Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3680"/>
+ <location filename="../QMenuStrings.cpp" line="4654"/>
<source>Symbols Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3681"/>
+ <location filename="../QMenuStrings.cpp" line="4655"/>
<source>Marks Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3682"/>
+ <location filename="../QMenuStrings.cpp" line="4656"/>
<source>Group Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3683"/>
+ <location filename="../QMenuStrings.cpp" line="4657"/>
<source>Layout Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3684"/>
+ <location filename="../QMenuStrings.cpp" line="4658"/>
<source>Layer Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3716"/>
+ <location filename="../QMenuStrings.cpp" line="239"/>
<source>Switch to Insert Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3718"/>
+ <location filename="../QMenuStrings.cpp" line="241"/>
<source>Collapse Rests</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3719"/>
+ <location filename="../QMenuStrings.cpp" line="242"/>
<source>Respell as Flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3720"/>
+ <location filename="../QMenuStrings.cpp" line="243"/>
<source>Respell as Sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3721"/>
+ <location filename="../QMenuStrings.cpp" line="244"/>
<source>Respell as Natural</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3722"/>
+ <location filename="../QMenuStrings.cpp" line="245"/>
<source>Collapse Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3723"/>
+ <location filename="../QMenuStrings.cpp" line="246"/>
<source>Interpret</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3724"/>
+ <location filename="../QMenuStrings.cpp" line="247"/>
<source>Move to Staff Above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3725"/>
+ <location filename="../QMenuStrings.cpp" line="248"/>
<source>Move to Staff Below</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3726"/>
+ <location filename="../QMenuStrings.cpp" line="249"/>
<source>Make Invisible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3727"/>
+ <location filename="../QMenuStrings.cpp" line="250"/>
<source>Make Visible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3734"/>
+ <location filename="../QMenuStrings.cpp" line="1347"/>
<source>Auto-Beam when appropriate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3735"/>
+ <location filename="../QMenuStrings.cpp" line="1348"/>
<source>No Accidental</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3736"/>
+ <location filename="../QMenuStrings.cpp" line="1349"/>
<source>Follow Previous Accidental</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3737"/>
+ <location filename="../QMenuStrings.cpp" line="1350"/>
<source>Sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3738"/>
+ <location filename="../QMenuStrings.cpp" line="1351"/>
<source>Flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3739"/>
+ <location filename="../QMenuStrings.cpp" line="1352"/>
<source>Natural</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3740"/>
+ <location filename="../QMenuStrings.cpp" line="1353"/>
<source>Double Sharp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3741"/>
+ <location filename="../QMenuStrings.cpp" line="1354"/>
<source>Double Flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3743"/>
+ <location filename="../QMenuStrings.cpp" line="1974"/>
<source>&New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3752"/>
+ <location filename="../QMenuStrings.cpp" line="1983"/>
<source>&Import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3756"/>
+ <location filename="../QMenuStrings.cpp" line="1987"/>
<source>Import &Hydrogen file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3758"/>
+ <location filename="../QMenuStrings.cpp" line="1989"/>
<source>&Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3759"/>
+ <location filename="../QMenuStrings.cpp" line="1990"/>
<source>Merge &File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3762"/>
+ <location filename="../QMenuStrings.cpp" line="1993"/>
<source>Merge &Hydrogen file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3764"/>
+ <location filename="../QMenuStrings.cpp" line="1995"/>
<source>&Export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3771"/>
+ <location filename="../QMenuStrings.cpp" line="2002"/>
<source>&Open...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3778"/>
+ <location filename="../QMenuStrings.cpp" line="2009"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3780"/>
+ <location filename="../QMenuStrings.cpp" line="2011"/>
<source>Open &Recent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3799"/>
+ <location filename="../QMenuStrings.cpp" line="2030"/>
<source>Save as &Template...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3800"/>
+ <location filename="../QMenuStrings.cpp" line="2031"/>
<source>Re&vert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3801"/>
+ <location filename="../QMenuStrings.cpp" line="2032"/>
<source>Prin&t Preview...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3803"/>
+ <location filename="../QMenuStrings.cpp" line="2034"/>
<source>Manage A&udio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3804"/>
+ <location filename="../QMenuStrings.cpp" line="2035"/>
<source>Play&list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3814"/>
+ <location filename="../QMenuStrings.cpp" line="2045"/>
<source>&Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3821"/>
+ <location filename="../QMenuStrings.cpp" line="2052"/>
<source>Ctrl+Q</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3869"/>
+ <location filename="../QMenuStrings.cpp" line="2100"/>
<source>Paste as &Links</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3876"/>
+ <location filename="../QMenuStrings.cpp" line="2107"/>
<source>Ctrl+Alt+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3887"/>
+ <location filename="../QMenuStrings.cpp" line="2118"/>
<source>Cut &Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3896"/>
+ <location filename="../QMenuStrings.cpp" line="2127"/>
<source>Cop&y Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3905"/>
+ <location filename="../QMenuStrings.cpp" line="2136"/>
<source>Pa&ste Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3912"/>
- <location filename="../QMenuStrings.cpp" line="4753"/>
+ <location filename="../QMenuStrings.cpp" line="2143"/>
+ <location filename="../QMenuStrings.cpp" line="2756"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3914"/>
+ <location filename="../QMenuStrings.cpp" line="2145"/>
<source>&Insert Range...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3921"/>
+ <location filename="../QMenuStrings.cpp" line="2152"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3923"/>
+ <location filename="../QMenuStrings.cpp" line="2154"/>
<source>Paste Tempos and Time Signatures</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3924"/>
+ <location filename="../QMenuStrings.cpp" line="2155"/>
<source>Clear Range of Tempos</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3925"/>
+ <location filename="../QMenuStrings.cpp" line="2156"/>
<source>Select &All Segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3936"/>
+ <location filename="../QMenuStrings.cpp" line="2167"/>
<source>Document P&roperties...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3940"/>
+ <location filename="../QMenuStrings.cpp" line="2171"/>
<source>Show Trac&ks Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3941"/>
+ <location filename="../QMenuStrings.cpp" line="2172"/>
<source>Show &Editors Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3943"/>
+ <location filename="../QMenuStrings.cpp" line="2174"/>
<source>Show &Zoom Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3945"/>
+ <location filename="../QMenuStrings.cpp" line="2176"/>
<source>Show Playback Position R&uler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3946"/>
+ <location filename="../QMenuStrings.cpp" line="2177"/>
<source>Show Cho&rd Name Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3947"/>
+ <location filename="../QMenuStrings.cpp" line="2178"/>
<source>Show Te&mpo Ruler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3948"/>
+ <location filename="../QMenuStrings.cpp" line="2179"/>
<source>Show Tra&nsport</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3955"/>
+ <location filename="../QMenuStrings.cpp" line="2186"/>
<source>T</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3957"/>
+ <location filename="../QMenuStrings.cpp" line="2188"/>
<source>Show Special &Parameters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3966"/>
+ <location filename="../QMenuStrings.cpp" line="2197"/>
<source>Show Segment Pre&views</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3967"/>
+ <location filename="../QMenuStrings.cpp" line="2198"/>
<source>Sh&ow Segment Labels</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3968"/>
+ <location filename="../QMenuStrings.cpp" line="2199"/>
<source>Show Track &Labels</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3973"/>
+ <location filename="../QMenuStrings.cpp" line="2204"/>
<source>&Open Tempo and Time Signature Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3974"/>
+ <location filename="../QMenuStrings.cpp" line="2205"/>
<source>Set &Tempo to Audio Segment Duration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3975"/>
+ <location filename="../QMenuStrings.cpp" line="2206"/>
<source>Set Tempos from &Beat Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3977"/>
+ <location filename="../QMenuStrings.cpp" line="2208"/>
<source>Change &Composition Start and End...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3978"/>
+ <location filename="../QMenuStrings.cpp" line="2209"/>
<source>Edit Mar&kers...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="1926"/>
- <location filename="../QMenuStrings.cpp" line="3985"/>
+ <location filename="../QMenuStrings.cpp" line="2216"/>
+ <location filename="../QMenuStrings.cpp" line="2899"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3987"/>
+ <location filename="../QMenuStrings.cpp" line="2218"/>
<source>Edit Document P&roperties...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="3988"/>
+ <location filename="../QMenuStrings.cpp" line="2219"/>
<source>&Set Quick Marker at Playback Position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2754"/>
- <location filename="../QMenuStrings.cpp" line="3997"/>
+ <location filename="../QMenuStrings.cpp" line="2228"/>
+ <location filename="../QMenuStrings.cpp" line="3728"/>
<source>&Jump to Quick Marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="2761"/>
- <location filename="../QMenuStrings.cpp" line="4004"/>
+ <location filename="../QMenuStrings.cpp" line="2235"/>
+ <location filename="../QMenuStrings.cpp" line="3735"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4006"/>
+ <location filename="../QMenuStrings.cpp" line="2237"/>
<source>&Studio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4007"/>
+ <location filename="../QMenuStrings.cpp" line="2238"/>
<source>&Audio Mixer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4008"/>
+ <location filename="../QMenuStrings.cpp" line="2239"/>
<source>MIDI Mi&xer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4009"/>
+ <location filename="../QMenuStrings.cpp" line="2240"/>
<source>Manage MIDI &Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4010"/>
+ <location filename="../QMenuStrings.cpp" line="2241"/>
<source>Manage S&ynth Plugins</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4011"/>
+ <location filename="../QMenuStrings.cpp" line="2242"/>
<source>Manage &Metronome</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4012"/>
+ <location filename="../QMenuStrings.cpp" line="2243"/>
<source>Modify MIDI &Filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4013"/>
+ <location filename="../QMenuStrings.cpp" line="2244"/>
<source>MIDI &Thru Routing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4014"/>
+ <location filename="../QMenuStrings.cpp" line="2245"/>
<source>&Reset MIDI Network</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4015"/>
+ <location filename="../QMenuStrings.cpp" line="2246"/>
<source>Im&port Studio from File...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4016"/>
+ <location filename="../QMenuStrings.cpp" line="2247"/>
<source>&Import Default Studio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4017"/>
+ <location filename="../QMenuStrings.cpp" line="2248"/>
<source>&Save Current Document as Default Studio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4019"/>
+ <location filename="../QMenuStrings.cpp" line="2250"/>
<source>Toggle Repeat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4026"/>
+ <location filename="../QMenuStrings.cpp" line="2257"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4036"/>
- <location filename="../QMenuStrings.cpp" line="4407"/>
+ <location filename="../QMenuStrings.cpp" line="1644"/>
+ <location filename="../QMenuStrings.cpp" line="2267"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4083"/>
- <location filename="../QMenuStrings.cpp" line="4535"/>
+ <location filename="../QMenuStrings.cpp" line="1772"/>
+ <location filename="../QMenuStrings.cpp" line="2314"/>
<source>R&elabel...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4093"/>
- <location filename="../QMenuStrings.cpp" line="4526"/>
+ <location filename="../QMenuStrings.cpp" line="1763"/>
+ <location filename="../QMenuStrings.cpp" line="2324"/>
<source>Repe&at Last Quantize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4104"/>
+ <location filename="../QMenuStrings.cpp" line="2335"/>
<source>Stretch &or Squash...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4105"/>
+ <location filename="../QMenuStrings.cpp" line="2336"/>
<source>Create &Anacrusis...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4126"/>
- <location filename="../QMenuStrings.cpp" line="4508"/>
+ <location filename="../QMenuStrings.cpp" line="1745"/>
+ <location filename="../QMenuStrings.cpp" line="2357"/>
<source>Join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4133"/>
- <location filename="../QMenuStrings.cpp" line="4515"/>
+ <location filename="../QMenuStrings.cpp" line="1752"/>
+ <location filename="../QMenuStrings.cpp" line="2364"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4135"/>
+ <location filename="../QMenuStrings.cpp" line="2366"/>
<source>&Split</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4136"/>
+ <location filename="../QMenuStrings.cpp" line="2367"/>
<source>&Split on Silence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4137"/>
+ <location filename="../QMenuStrings.cpp" line="2368"/>
<source>Split by &Pitch...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4138"/>
+ <location filename="../QMenuStrings.cpp" line="2369"/>
<source>Split by &Recording Source...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4139"/>
+ <location filename="../QMenuStrings.cpp" line="2370"/>
<source> Split &at Time...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4140"/>
+ <location filename="../QMenuStrings.cpp" line="2371"/>
<source>Turn Re&peats into Copies</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4141"/>
+ <location filename="../QMenuStrings.cpp" line="2372"/>
<source>Turn Li&nks into Copies</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4142"/>
+ <location filename="../QMenuStrings.cpp" line="2373"/>
<source>E&xpand Block Chord Segments by Figuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4144"/>
+ <location filename="../QMenuStrings.cpp" line="2375"/>
<source>Manage Tri&ggered Segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4145"/>
+ <location filename="../QMenuStrings.cpp" line="2376"/>
<source>Trac&ks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4146"/>
+ <location filename="../QMenuStrings.cpp" line="2377"/>
<source>Add &Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4155"/>
+ <location filename="../QMenuStrings.cpp" line="2386"/>
<source>&Add Tracks...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4162"/>
+ <location filename="../QMenuStrings.cpp" line="2393"/>
<source>Ctrl+Shift+T</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4164"/>
+ <location filename="../QMenuStrings.cpp" line="2395"/>
<source>D&elete Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4171"/>
+ <location filename="../QMenuStrings.cpp" line="2402"/>
<source>Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4173"/>
+ <location filename="../QMenuStrings.cpp" line="2404"/>
<source>Move Track &Down</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4182"/>
+ <location filename="../QMenuStrings.cpp" line="2413"/>
<source>Mo&ve Track Up</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4191"/>
+ <location filename="../QMenuStrings.cpp" line="2422"/>
<source>Select &Next Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4200"/>
+ <location filename="../QMenuStrings.cpp" line="2431"/>
<source>Select &Previous Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4209"/>
+ <location filename="../QMenuStrings.cpp" line="2440"/>
<source>Mute or Unmute Tra&ck</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4218"/>
+ <location filename="../QMenuStrings.cpp" line="2449"/>
<source>Arm &or Un-arm Track for Record</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4227"/>
+ <location filename="../QMenuStrings.cpp" line="2458"/>
<source>&Unmute all Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4228"/>
+ <location filename="../QMenuStrings.cpp" line="2459"/>
<source>&Mute all Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4229"/>
+ <location filename="../QMenuStrings.cpp" line="2460"/>
<source>Set &Instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4230"/>
+ <location filename="../QMenuStrings.cpp" line="2461"/>
<source>&Remap Instruments...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4268"/>
- <location filename="../QMenuStrings.cpp" line="4573"/>
+ <location filename="../QMenuStrings.cpp" line="1810"/>
+ <location filename="../QMenuStrings.cpp" line="2499"/>
<source>&Resize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4294"/>
+ <location filename="../QMenuStrings.cpp" line="2525"/>
<source>Ctrl+Enter, Enter, Media Play, Ctrl+Return</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4303"/>
+ <location filename="../QMenuStrings.cpp" line="2534"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4312"/>
+ <location filename="../QMenuStrings.cpp" line="2543"/>
<source>PgUp, Media Previous</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4321"/>
+ <location filename="../QMenuStrings.cpp" line="2552"/>
<source>PgDown, Media Next</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4330"/>
+ <location filename="../QMenuStrings.cpp" line="2561"/>
<source>Media Record</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4332"/>
+ <location filename="../QMenuStrings.cpp" line="2563"/>
<source>P&unch in Record</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4339"/>
+ <location filename="../QMenuStrings.cpp" line="2570"/>
<source>Space</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4369"/>
+ <location filename="../QMenuStrings.cpp" line="2600"/>
<source>&Rosegarden Tutorials</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4374"/>
+ <location filename="../QMenuStrings.cpp" line="2605"/>
<source>Main Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4378"/>
+ <location filename="../QMenuStrings.cpp" line="2609"/>
<source>Tracks Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4379"/>
+ <location filename="../QMenuStrings.cpp" line="2610"/>
<source>Editors Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4388"/>
+ <location filename="../QMenuStrings.cpp" line="2619"/>
<source>Home</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4397"/>
+ <location filename="../QMenuStrings.cpp" line="2628"/>
<source>End</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4594"/>
+ <location filename="../QMenuStrings.cpp" line="2676"/>
<source>Insert Tempo Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4595"/>
+ <location filename="../QMenuStrings.cpp" line="2677"/>
<source>Insert Tempo Change at Playback Position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4596"/>
+ <location filename="../QMenuStrings.cpp" line="2678"/>
<source>Delete Tempo Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4597"/>
+ <location filename="../QMenuStrings.cpp" line="2679"/>
<source>Ramp Tempo to Next Tempo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4598"/>
+ <location filename="../QMenuStrings.cpp" line="2680"/>
<source>Un-Ramp Tempo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4599"/>
+ <location filename="../QMenuStrings.cpp" line="2681"/>
<source>Edit Tempo...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4600"/>
+ <location filename="../QMenuStrings.cpp" line="2682"/>
<source>Edit Time Signature...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4601"/>
+ <location filename="../QMenuStrings.cpp" line="2683"/>
<source>Open Tempo and Time Signature Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4667"/>
+ <location filename="../QMenuStrings.cpp" line="131"/>
<source>&Edit Item</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4676"/>
+ <location filename="../QMenuStrings.cpp" line="140"/>
<source>Select &All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4685"/>
+ <location filename="../QMenuStrings.cpp" line="149"/>
<source>&Clear Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4694"/>
+ <location filename="../QMenuStrings.cpp" line="158"/>
<source>&Preferences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4699"/>
+ <location filename="../QMenuStrings.cpp" line="163"/>
<source>Show &Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4700"/>
+ <location filename="../QMenuStrings.cpp" line="164"/>
<source>Hide St&atusbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="4746"/>
+ <location filename="../QMenuStrings.cpp" line="2749"/>
<source>Pa&ste as New Triggered Segment</source>
<translation type="unfinished"></translation>
</message>
@@ -10882,8 +10890,54 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/segment/UpdateFigurationCommand.cpp" line="27"/>
- <source>Update Figurations</source>
+ <location filename="../../src/commands/segment/UpdateFigurationCommand.cpp" line="27"/>
+ <source>Update Figurations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="641"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="810"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="852"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="858"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="863"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="2732"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="2743"/>
+ <source>warning: bar too short, padding with rests</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -10901,7 +10955,7 @@
</message>
<message>
<location filename="../../src/gui/dialogs/AboutDialog.cpp" line="54"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -10963,72 +11017,72 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="108"/>
<source>Can't add identical overlapping indications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="221"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="242"/>
<source>Add S&lur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="223"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="244"/>
<source>Add &Phrasing Slur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="225"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="246"/>
<source>Add Double-Octave Up</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="227"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="248"/>
<source>Add Octave &Up</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="229"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="250"/>
<source>Add Octave &Down</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="231"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="252"/>
<source>Add Double Octave Down</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="236"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="257"/>
<source>Add &Crescendo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="238"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="259"/>
<source>Add &Decrescendo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="240"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="261"/>
<source>Add &Glissando</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="242"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="263"/>
<source>Add Tri&ll With Line</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="244"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="265"/>
<source>Add Parameter Chord</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="246"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="267"/>
<source>Add Figuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="249"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="270"/>
<source>Add &%1%2</source>
<translation type="unfinished"></translation>
</message>
@@ -11476,7 +11530,7 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="85"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
@@ -11486,14 +11540,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="200"/>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="378"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="203"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="389"/>
<source><no synth></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="203"/>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="382"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="206"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="393"/>
<source><no plugin></source>
<translation type="unfinished"></translation>
</message>
@@ -11695,104 +11749,104 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="282"/>
<source>Audio Mixer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="305"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="314"/>
<source>Record input source</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="315"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="324"/>
<source>Output destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="328"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="477"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="337"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="478"/>
<source>Pan</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="336"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="337"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="484"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="345"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="346"/>
<location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="485"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="486"/>
<source>Audio level</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="344"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="353"/>
<source>Mono or stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="352"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="361"/>
<source>Arm recording</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="363"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="496"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="639"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="696"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="881"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="372"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="497"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="645"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="702"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="887"/>
<source><none></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="365"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="498"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="374"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="499"/>
<source>Click to load an audio plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="376"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="385"/>
<source>Click to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="392"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="401"/>
<source>Audio %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="401"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="410"/>
<source>Synth %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="410"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="419"/>
<source>Click the button above to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="506"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="507"/>
<source>Sub %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="547"/>
<location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="548"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="549"/>
<source>Audio master output level</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="550"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="551"/>
<source>Master</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="640"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="697"/>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="882"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="646"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="703"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="888"/>
<source><no plugin></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="1728"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="1708"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -12371,78 +12425,78 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1232"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1238"/>
<source>Really delete this key mapping?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1284"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1290"/>
<source>Really delete all banks for </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1567"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1573"/>
<source>Import Banks from Device in File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1568"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1574"/>
<source>Rosegarden Device files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1569"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1575"/>
<source>Rosegarden files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1570"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1576"/>
<source>Sound fonts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1571"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1577"/>
<source>LinuxSampler configuration files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1572"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1578"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1590"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1596"/>
<source>Some internal error: cannot locate selected device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1600"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1606"/>
<source>Some internal error: no device selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1762"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1768"/>
<source>Export Device as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1784"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1790"/>
<source>You have specified a directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1794"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1800"/>
<source>The specified file exists. Overwrite?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1823"/>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1827"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1829"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1833"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1864"/>
+ <location filename="../../src/gui/studio/BankEditorDialog.cpp" line="1870"/>
<source>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</source>
<translation type="unfinished"></translation>
</message>
@@ -12555,6 +12609,120 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="74"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="85"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="93"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="94"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="95"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="96"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="302"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="490"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="302"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="490"/>
+ <source> </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="302"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="490"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="622"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="302"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="490"/>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="622"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="336"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="488"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="617"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="619"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="637"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="641"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="645"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="649"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="653"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="657"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="89"/>
@@ -12878,7 +13046,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="276"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
@@ -13103,7 +13271,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="330"/>
<source>Velocity</source>
<translation type="unfinished"></translation>
</message>
@@ -13119,27 +13287,28 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="284"/>
<source>Unsupported Event Type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="298"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="294"/>
<source>Pitch Bend</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="303"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="299"/>
<source>Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="445"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="437"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="459"/>
<source>Insert Line of Controllers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="585"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="578"/>
<source>Controller Event Number</source>
<translation type="unfinished"></translation>
</message>
@@ -13147,7 +13316,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="63"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
@@ -13157,12 +13326,12 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/edit/CopyCommand.cpp" line="56"/>
+ <location filename="../../src/commands/edit/CopyCommand.cpp" line="57"/>
<source>(copied)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/edit/CopyCommand.cpp" line="64"/>
+ <location filename="../../src/commands/edit/CopyCommand.cpp" line="65"/>
<source>Copy Range</source>
<translation type="unfinished"></translation>
</message>
@@ -13227,7 +13396,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="51"/>
<source>Cu&t</source>
<translation type="unfinished"></translation>
</message>
@@ -13291,19 +13460,19 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="73"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="72"/>
<source>[ No port ]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="802"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="813"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="829"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="792"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="803"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="819"/>
<source>New Device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="926"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="916"/>
<source>http://rosegardenmusic.com/wiki/doc:device-manager-en</source>
<translation type="unfinished"></translation>
</message>
@@ -15234,7 +15403,7 @@ Example text from file:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterBox.cpp" line="153"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterBox.cpp" line="129"/>
<source>Track</source>
<translation type="unfinished"></translation>
</message>
@@ -15242,7 +15411,7 @@ Example text from file:</source>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -15621,55 +15790,6 @@ Example text from file:</source>
</message>
</context>
<context>
- <name>Rosegarden::LilyPondExporter</name>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="630"/>
- <source>LilyPond does not allow spaces or backslashes in filenames.
-
-Would you like to use
-
- %1
-
- instead?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="641"/>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="810"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="852"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="858"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="863"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="2686"/>
- <source>warning: overlong bar truncated here</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="2697"/>
- <source>warning: bar too short, padding with rests</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Rosegarden::LilyPondOptionsDialog</name>
<message>
<location filename="../../src/gui/dialogs/LilyPondOptionsDialog.cpp" line="64"/>
@@ -16372,97 +16492,92 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="139"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="142"/>
<source><qt>Set the MIDI bank from which to select programs</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="165"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="168"/>
<source><qt>Set the MIDI program or "patch"</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="191"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="194"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="111"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="114"/>
<source><qt><p>Check this to tell Rosegarden that this is a percussion instrument. This allows you access to any percussion key maps and drum kits you may have configured in the studio</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="204"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="207"/>
<source><qt><p><i>Auto</i>, allocate channel automatically; <i>Fixed</i>, fix channel to instrument number</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="117"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="120"/>
<source>Bank</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="176"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="179"/>
<source>Variation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="150"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="153"/>
<source>Program</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="104"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="107"/>
<source>Percussion</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="124"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="127"/>
<source><qt>Send bank select</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="157"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="160"/>
<source><qt>Send program change</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="183"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="186"/>
<source><qt>Send bank select for variation</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="202"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="205"/>
<source>Channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="214"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="217"/>
<source>Auto</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="215"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="218"/>
<source>Fixed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="225"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="228"/>
<source><qt>Use program changes from an external source to manipulate these controls (only valid for the currently-active track) [Shift + P]</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="223"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="226"/>
<source>Receive external</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="300"/>
- <source>[ %1 ]</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="300"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="314"/>
<source>No connection</source>
<translation type="unfinished"></translation>
</message>
@@ -16686,6 +16801,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="81"/>
@@ -16889,47 +17013,47 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="304"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="305"/>
<source>Copy and Move Event</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="306"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="307"/>
<source>Copy and Move Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="310"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="311"/>
<source>Move Event</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="312"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="313"/>
<source>Move Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="413"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="414"/>
<source>Click and drag to move a note; hold Ctrl as well to copy it</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="415"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="416"/>
<source>Click and drag to copy a note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="419"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="420"/>
<source>Click and drag to move selected notes; hold Ctrl as well to copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="421"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="422"/>
<source>Click and drag to copy selected notes</source>
<translation type="unfinished"></translation>
</message>
@@ -17053,12 +17177,12 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixVelocity.cpp" line="257"/>
+ <location filename="../../src/gui/editors/matrix/MatrixVelocity.cpp" line="260"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixVelocity.cpp" line="259"/>
+ <location filename="../../src/gui/editors/matrix/MatrixVelocity.cpp" line="262"/>
<source>Click and drag to scale velocity of note</source>
<translation type="unfinished"></translation>
</message>
@@ -17133,64 +17257,58 @@ Double-click to open the marker editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1116"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1118"/>
<source>Trigger Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1126"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1128"/>
<source>Remove Triggers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1347"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1349"/>
<source>Estimated time signature shown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1435"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1437"/>
<source>Transpose</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1436"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1438"/>
<source>By number of semitones: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1552"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1554"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1559"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1561"/>
<source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1566"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1568"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1579"/>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1734"/>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1829"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1581"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1830"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1734"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1829"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="1830"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="2211"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="2212"/>
<source>Estimated key signature shown</source>
<translation type="unfinished"></translation>
</message>
@@ -17198,32 +17316,32 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="194"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="196"/>
<source>Zoom</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="210"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="212"/>
<source>Horizontal Zoom</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="222"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="224"/>
<source>Vertical Zoom</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="235"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="237"/>
<source>Reset Zoom</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1329"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1366"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1330"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="1367"/>
<source><qt>Segment: "%1"<br>Track: %2 "%3"</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -17341,22 +17459,22 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="129"/>
<source>MIDI Mixer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="157"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="169"/>
<source>Volume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="162"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="174"/>
<source>Instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="692"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="691"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation type="unfinished"></translation>
</message>
@@ -17653,305 +17771,305 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="52"/>
<location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="53"/>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="54"/>
<source>Notation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="80"/>
<source>Default layout mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="86"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="85"/>
<source>Linear layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="87"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="86"/>
<source>Continuous page layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="88"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="87"/>
<source>Multiple page layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="96"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="95"/>
<source>Default spacing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="109"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="108"/>
<source>%1 % (normal)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="121"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="120"/>
<source>Show track headers (linear layout only)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="128"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="127"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="129"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="128"/>
<source>When needed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="130"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="129"/>
<source>Always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="138"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="137"/>
<source>"Always" and "Never" mean what they usually mean
"When needed" means "when staves are too many to all fit in the current window"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="151"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="150"/>
<source>Show non-notation events as question marks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="162"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="161"/>
<source>Show notation-quantized notes in a different color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="173"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="172"/>
<source>Show "invisible" events in grey</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="184"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="183"/>
<source>Show notes outside suggested playable range in red</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="195"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="194"/>
<source>Highlight superimposed notes with a halo effect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="209"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="208"/>
<source>When recording MIDI, split-and-tie long notes at barlines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="225"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="224"/>
<source>Layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="238"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="237"/>
<source>Default note style for new notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="270"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="269"/>
<source>When inserting notes...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="278"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="277"/>
<source>Split notes into ties to make durations match</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="279"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="278"/>
<source>Ignore existing durations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="289"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="288"/>
<source>Auto-beam on insert when appropriate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="302"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="301"/>
<source>Tie notes at barlines automatically</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="316"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="315"/>
<source>Collapse rests after erase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="328"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="327"/>
<source>Default paste type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="352"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="351"/>
<source>Editing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="364"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="363"/>
<source>Accidentals in one octave...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="367"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="366"/>
<source>Affect only that octave</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="368"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="367"/>
<source>Require cautionaries in other octaves</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="369"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="368"/>
<source>Affect all subsequent octaves</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="377"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="376"/>
<source>Accidentals in one bar...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="380"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="379"/>
<source>Affect only that bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="381"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="380"/>
<source>Require cautionary resets in following bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="382"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="381"/>
<source>Require explicit resets in following bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="390"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="389"/>
<source>Key signature cancellation style</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="393"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="392"/>
<source>Cancel only when entering C major or A minor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="394"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="393"/>
<source>Cancel whenever removing sharps or flats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="395"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="394"/>
<source>Cancel always</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="406"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="405"/>
<source>Accidentals</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="417"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="416"/>
<source>Notation font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="423"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="422"/>
<source>View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="444"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="443"/>
<source>Origin:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="448"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="447"/>
<source>Copyright:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="452"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="451"/>
<source>Mapped by:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="456"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="455"/>
<source>Type:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="482"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="481"/>
<source>Font size for single-staff views</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="491"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="490"/>
<source>Font size for multi-staff views</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="509"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="508"/>
<source>Text font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="521"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="520"/>
<source>Sans-serif font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="534"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="533"/>
<source>Font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="551"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="550"/>
<source>Show repeated segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="564"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="563"/>
<source>Allow direct edition of repeated segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="577"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="576"/>
<source>Hide redundant clefs and keys</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="590"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="589"/>
<source>Distribute verses among repeated segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="605"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="604"/>
<source>Segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="632"/>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="712"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="631"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="711"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="704"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="703"/>
<source>%1 (smooth)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="706"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="705"/>
<source>%1 (jaggy)</source>
<translation type="unfinished"></translation>
</message>
@@ -18209,350 +18327,344 @@ This is a bug (the program would previously have crashed by now)</source>
<context>
<name>Rosegarden::NotationView</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="871"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="874"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1025"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1028"/>
<source>Note &Font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1053"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1056"/>
<source>Si&ze</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1065"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1068"/>
<source>%n pixel(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1073"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1076"/>
<source>S&pacing</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1164"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1167"/>
<source> %n event(s) selected </source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1167"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1170"/>
<source> No selection </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1215"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1220"/>
<source> Font: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1250"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1423"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1475"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1532"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1558"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1583"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1686"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1742"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2640"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3369"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4199"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4468"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1255"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1428"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1480"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1537"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1563"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1588"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1691"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1749"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2649"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3379"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4490"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1250"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1255"/>
<source>Unknown font "%1", using default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1258"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1263"/>
<source> Size: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1282"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1287"/>
<source> Spacing: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1411"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1416"/>
<source>LilyPond Preview Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1412"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1417"/>
<source>LilyPond preview options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1433"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1438"/>
<source>Printing with LilyPond...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1451"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1456"/>
<source>Previewing with LilyPond...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1476"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1481"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1532"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1537"/>
<source>Unknown font action %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1558"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1563"/>
<source>Unknown font size action %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1583"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1588"/>
<source>Unknown spacing action %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1655"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1660"/>
<source>Can't paste multiple Segments into one</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1688"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1744"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1693"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1751"/>
<source>Couldn't paste at this point.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1689"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1745"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1695"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1753"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1708"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1715"/>
<source>Clipboard is empty</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1712"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1719"/>
<source>Inserting clipboard contents...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1885"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1894"/>
<source>Raising velocities...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1896"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="1905"/>
<source>Lowering velocities...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2640"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2649"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2644"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="2653"/>
<source>Inserting note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3033"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3042"/>
<source>Ornament track %1 bar %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3035"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3044"/>
<source>Ornament bar %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3073"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3082"/>
<source>Use Ornament</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3084"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3093"/>
<source>Remove Ornaments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3120"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3129"/>
<source>Edit ornament inline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3147"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3156"/>
<source>Show ornament expansion</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3180"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3189"/>
<source>Unadopt Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3296"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3305"/>
<source>Estimated key signature shown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3353"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3362"/>
<source>Sustain</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3369"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3379"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3538"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3548"/>
<source>Estimated time signature shown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3686"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3716"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3693"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3723"/>
<source>%1%2 - All Segments - Notation</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3699"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3729"/>
<source>%1%2 - %n Segment(s) - Notation</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3819"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3849"/>
<source>Tuplet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3820"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3850"/>
<source>Chord</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3821"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3851"/>
<source>Grace</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3828"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3832"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3836"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3858"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3862"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3866"/>
<source>%1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3983"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4013"/>
<source>Transpose</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="3984"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4014"/>
<source>By number of semitones: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4199"/>
- <source>Can't insert note: No note duration selected</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4363"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4385"/>
<source>Time: %1 (%2.%3s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4441"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4463"/>
<source>http://rosegardenmusic.com/wiki/doc:notation-en</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4448"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4470"/>
<source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4455"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4477"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4555"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4577"/>
<source>Move Events to Staff Above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4556"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4578"/>
<source>Move Events to Staff Below</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4635"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4657"/>
<source>Edit Generated region mark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4659"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4681"/>
<source>Updated tags for aborted edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4713"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4735"/>
<source>Edit Text Event</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4761"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4783"/>
<source>Normalizing rests...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4774"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4796"/>
<source>Collapsing notes...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4952"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4962"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4974"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4984"/>
<source>Adding dot...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4977"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="4999"/>
<source>Set Note Type...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="5001"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="5023"/>
<source>Set Note Type notation only...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="5021"/>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="5043"/>
<source>Cycling slashes...</source>
<translation type="unfinished"></translation>
</message>
@@ -18585,13 +18697,13 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1741"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1742"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1773"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1774"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1743"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="1775"/>
<source><qt>Segment: "%1"<br>Track: %2 "%3"</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -19682,7 +19794,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="109"/>
- <location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="249"/>
+ <location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="227"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
@@ -19752,7 +19864,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="255"/>
+ <location filename="../../src/gui/widgets/QuantizeParameters.cpp" line="233"/>
<source>Full quantize</source>
<translation type="unfinished"></translation>
</message>
@@ -20083,15 +20195,15 @@ There may be some incompatibilities with the file format.</source>
<location filename="../../src/document/RosegardenDocument.cpp" line="593"/>
<location filename="../../src/document/RosegardenDocument.cpp" line="638"/>
<location filename="../../src/document/RosegardenDocument.cpp" line="680"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1068"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1716"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1741"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1744"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1781"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1791"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1820"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1833"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2853"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1085"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1743"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1768"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1771"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1808"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1818"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1847"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1860"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2880"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
@@ -20172,102 +20284,107 @@ Please select any you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1201"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1213"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1225"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1212"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1236"/>
<source>Failure in temporary file handling for file '%1': %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1230"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1254"/>
<source>Failed to rename temporary output file '%1' to desired output file '%2'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1417"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1444"/>
<source>Error while writing on '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1471"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1498"/>
<source>Could not open file '%1' for writing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1716"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1743"/>
<source>File load cancelled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1741"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1768"/>
<source><h3>Audio and plugins not available</h3><p>This composition uses audio files or plugins, but Rosegarden is currently running without audio because the JACK audio server was not available on startup.</p><p>Please exit Rosegarden, start the JACK audio server and re-start Rosegarden if you wish to load this complete composition.</p><p><b>WARNING:</b> If you re-save this composition, all audio and plugin data and settings in it will be lost.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1744"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1771"/>
<source><h3>Audio and plugins not available</h3><p>This composition uses audio files or plugins, but you are running a version of Rosegarden that was compiled without audio support.</p><p><b>WARNING:</b> If you re-save this composition from this version of Rosegarden, all audio and plugin data and settings in it will be lost.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1781"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1808"/>
<source><h3>Incorrect audio sample rate</h3><p>This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).</p><p>Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.</p><p>Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1791"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1818"/>
<source><h3>Inconsistent audio sample rates</h3><p>This composition contains audio files at more than one sample rate.</p><p>Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.</p><p>Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1792"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1819"/>
<source>Inconsistent sample rates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1806"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1833"/>
<source><h3>Plugins not found</h3><p>The following audio plugins could not be loaded:</p><ul></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1814"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1841"/>
<source><li>%1 (from %2)</li></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="1828"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="1855"/>
<source>This file contains one or more old element types that are now deprecated.
Support for these elements may disappear in future versions of Rosegarden.
We recommend you re-save this file from this version of Rosegarden to ensure that it can still be re-loaded in future versions.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="3048"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="3076"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="3049"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="3077"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2478"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2505"/>
<source>Insert Recorded MIDI</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2605"/>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2689"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2632"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2716"/>
<source>(recorded)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/document/RosegardenDocument.cpp" line="2838"/>
+ <location filename="../../src/document/RosegardenDocument.cpp" line="2865"/>
<source>Generating audio preview...</source>
<translation type="unfinished"></translation>
</message>
@@ -20275,78 +20392,78 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="303"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="403"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="739"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="778"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="919"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="996"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1760"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1763"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1824"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1830"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1849"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="292"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="392"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="728"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="767"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="908"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="985"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1742"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1745"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1806"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1812"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1831"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="403"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="551"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="739"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="778"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="919"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="392"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="540"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="728"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="767"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="908"/>
<source>No non-audio segments selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="558"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="547"/>
<source>Pitch Tracker can only contain 1 segment.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="997"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="986"/>
<source>You've not yet defined an audio editor for Rosegarden to use.
See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1761"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1743"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1764"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1746"/>
<source>Cannot add dropped file. This version of rosegarden was not built with audio support.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1792"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1774"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1802"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1784"/>
<source>Adding audio file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1823"/>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1829"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1805"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1811"/>
<source>Can't add dropped file. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1836"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1818"/>
<source>Generating audio preview...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1848"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="1830"/>
<source>Try copying this file to a directory where you have write permission and re-add it</source>
<translation type="unfinished"></translation>
</message>
@@ -20389,467 +20506,467 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="945"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="934"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1018"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1006"/>
<source> Zoom: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1161"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1335"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1826"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2297"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1145"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1316"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1830"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2301"/>
<source>%1 - %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1226"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1538"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1625"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1786"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1788"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1933"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1951"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2061"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2120"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2123"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2213"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2221"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2229"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2286"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2289"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2567"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2584"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2608"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2633"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3018"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3044"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3885"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3924"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3976"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4012"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4134"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4280"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4316"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4351"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4523"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4559"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4594"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4911"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5167"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5171"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5207"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5253"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5287"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5321"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5387"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5429"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5477"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5594"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5616"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5641"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5654"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5676"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5734"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5736"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5770"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6590"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6686"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6808"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6821"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8059"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8218"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8236"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8239"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8249"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8291"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1207"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1542"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1629"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1790"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1792"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1937"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1955"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2065"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2124"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2127"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2217"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2225"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2233"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2290"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2293"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2571"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2588"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2612"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2637"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3022"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3048"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3889"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3928"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3980"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4016"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4135"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4278"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4314"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4349"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4521"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4557"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4592"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4909"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5165"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5169"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5205"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5246"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5280"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5314"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5380"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5422"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5470"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5587"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5609"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5634"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5647"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5669"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5727"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5729"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5763"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6583"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6679"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6801"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6814"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8029"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8168"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8186"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8189"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8199"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8241"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1523"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1527"/>
<source>File "%1" does not exist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1528"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1532"/>
<source>File "%1" is actually a directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1536"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1540"/>
<source>You do not have read permission for "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1626"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1630"/>
<source>An auto-save file for this document has been found
Do you want to open it instead ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1773"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6588"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1777"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6581"/>
<source>Untitled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1786"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2120"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2286"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1790"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2124"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2290"/>
<source>Could not save document at %1
Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1788"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2123"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2289"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1792"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2127"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2293"/>
<source>Could not save document at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1854"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1858"/>
<source>Opening a new application window...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1865"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1869"/>
<source>Creating new document...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1895"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1899"/>
<source>%1%2 - %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1931"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1935"/>
<source>Malformed URL
%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1951"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2061"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3924"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3976"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4012"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4280"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4316"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4523"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4559"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8291"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1955"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2065"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3928"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3980"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4016"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4278"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4314"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4521"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4557"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8241"/>
<source>Cannot open file %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1980"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2086"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="1984"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2090"/>
<source>Opening file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2006"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2041"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2010"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2045"/>
<source>Open File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2007"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8277"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2011"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8227"/>
<source>All supported files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2008"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2042"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2257"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2012"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2046"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2261"/>
<source>Rosegarden files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2009"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3958"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3994"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2013"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3962"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3998"/>
<source>MIDI files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2010"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2043"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2263"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3907"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3959"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3995"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4263"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4299"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4506"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4542"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5187"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5226"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5265"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5299"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5333"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5446"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8278"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2014"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2047"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2267"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3911"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3963"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3999"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4261"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4297"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4504"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4540"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5185"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5224"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5258"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5292"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5326"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5439"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8228"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2103"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2107"/>
<source>Saving file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2214"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2218"/>
<source><qt>Sorry.<br>"%1" is not a valid filename.</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2222"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2226"/>
<source>You have specified a folder/directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2230"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2234"/>
<source>The specified file exists. Overwrite?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2253"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2257"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2255"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2259"/>
<source> as a template </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2257"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2261"/>
<source>Rosegarden templates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2263"/>
<source>Save as template...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2263"/>
<source>Save as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2313"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2317"/>
<source>Closing file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2326"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2330"/>
<source>Exiting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2338"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2342"/>
<source>Cutting selection...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2350"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2354"/>
<source>Copying selection to clipboard...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2361"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2365"/>
<source>Clipboard is empty</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2364"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2368"/>
<source>Inserting clipboard contents...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2463"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2467"/>
<source>Duration of empty range to insert</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2567"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2584"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2571"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2588"/>
<source>This function needs no more than one segment to be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2608"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2612"/>
<source>Can't join Audio segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2634"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2638"/>
<source>Can't expand Audio segments with figuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2694"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2698"/>
<source>rescaling an audio file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2712"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2716"/>
<source>Rescaling audio file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2730"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2734"/>
<source>Generating audio preview...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2763"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5602"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2767"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5595"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2764"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2768"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2835"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2839"/>
<source>Jog Selection</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2979"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3013"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="2983"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3017"/>
<source>Split %n Segment(s) at Time</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3019"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3023"/>
<source>Split time is not within a selected segment.
No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3045"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3049"/>
<source><qt><p>In order to create anacrusis, at least one of the segments in your selection must start at the beginning of the composition.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3054"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3058"/>
<source>Anacrusis Amount</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3069"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3073"/>
<source>Create Anacrusis</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3079"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3142"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3083"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3146"/>
<source>Set Segment Start Times</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3080"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3143"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3084"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3147"/>
<source>Set Segment Start Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3099"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3103"/>
<source>Insert Corrected Tempo and Time Signature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3110"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3114"/>
<source>Remove Original Tempo and Time Signature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3132"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3136"/>
<source>Segment Start Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3176"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3180"/>
<source>Segment Duration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3189"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3193"/>
<source>Set Segment Durations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3190"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3194"/>
<source>Set Segment Duration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3301"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6243"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3305"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6236"/>
<source>Set Global Tempo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3374"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3378"/>
<source>Toggle the toolbar...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3385"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3389"/>
<source>Toggle the tools toolbar...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3396"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3400"/>
<source>Toggle the tracks toolbar...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3407"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3411"/>
<source>Toggle the editor toolbar...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3418"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3422"/>
<source>Toggle the transport toolbar...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3429"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3433"/>
<source>Toggle the zoom toolbar...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3440"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3459"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3444"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3463"/>
<source>Toggle the Transport</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3574"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3578"/>
<source>Toggle the statusbar...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3642"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3646"/>
<source>The join tool isn't implemented yet. Instead please highlight the segments you want to join and then use the menu option:
Segments->Collapse Segments.
@@ -20857,404 +20974,404 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3645"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3649"/>
<source>Join tool not yet implemented</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3886"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3890"/>
<source>Revert modified document to previous saved version?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3905"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3909"/>
<source>Import Rosegarden Project File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3906"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5186"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3910"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5184"/>
<source>Rosegarden Project files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3957"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3961"/>
<source>Open MIDI File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3993"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="3997"/>
<source>Merge MIDI File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4120"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4121"/>
<source>Importing MIDI file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4159"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4157"/>
<source>Calculating notation...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4212"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4210"/>
<source>Calculate Notation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4261"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4297"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4295"/>
<source>Open X11 Rosegarden File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4262"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4298"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4260"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4296"/>
<source>X11 Rosegarden files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4331"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4329"/>
<source>Importing X11 Rosegarden file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4352"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4350"/>
<source>Can't load X11 Rosegarden file. It appears to be corrupted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4504"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4540"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4502"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4538"/>
<source>Open MusicXML File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4574"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4572"/>
<source>Importing MusicXML file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4595"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4593"/>
<source>Can't load MusicXML file:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5167"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5165"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5171"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5169"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5183"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5181"/>
<source>Exporting Rosegarden Project file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5188"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5227"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5266"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5300"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5334"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5447"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5186"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5225"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5293"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5327"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5440"/>
<source>Export as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5207"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5205"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5222"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5238"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5220"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5236"/>
<source>Exporting MIDI file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5225"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5223"/>
<source>Standard MIDI files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5253"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5287"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5321"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5477"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5246"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5280"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5314"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5470"/>
<source>Export failed. The file could not be opened for writing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5261"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5277"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5254"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5270"/>
<source>Exporting Csound score file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5264"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5257"/>
<source>Csound files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5295"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5310"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5288"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5303"/>
<source>Exporting Mup file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5298"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5291"/>
<source>Mup files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5329"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5414"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5322"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5407"/>
<source>Exporting LilyPond file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5332"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5325"/>
<source>LilyPond files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5346"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5339"/>
<source>Printing with LilyPond...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5362"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5355"/>
<source>Previewing LilyPond file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5387"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5380"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5405"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5398"/>
<source>LilyPond Preview Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5406"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5399"/>
<source>LilyPond preview options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5442"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5463"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5435"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5456"/>
<source>Exporting MusicXML file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4505"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4541"/>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5445"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4503"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="4539"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5438"/>
<source>XML files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5603"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5596"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5644"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5637"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5645"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="5638"/>
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before you start to record audio.
Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6147"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6140"/>
<source>Move playback pointer to time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6161"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6154"/>
<source>%1%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6229"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6222"/>
<source>Replace Tempo Change at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6259"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6252"/>
<source>Set Global and Default Tempo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6282"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6275"/>
<source>Move Tempo Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6317"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6310"/>
<source>new marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6318"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6311"/>
<source>no description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6594"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6587"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6808"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6801"/>
<source>Sequencer failed to add audio file %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6821"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6814"/>
<source>Sequencer failed to remove audio file id %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6882"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6875"/>
<source>Modify Segment label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6884"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6877"/>
<source>Modify Segments label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6886"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6879"/>
<source>Relabelling selection...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6899"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6892"/>
<source>Input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6899"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="6892"/>
<source>Enter new label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="7995"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="7965"/>
<source>Play List</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8032"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8002"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8039"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8009"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8046"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8016"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8164"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8114"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8218"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8168"/>
<source>Are you sure you want to save this as your default studio?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8224"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8174"/>
<source>Saving current document as default studio...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8236"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8186"/>
<source>Could not auto-save document at %1
Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8239"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8189"/>
<source>Could not auto-save document at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8249"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8199"/>
<source>Are you sure you want to import your default studio and lose the current one?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8276"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8226"/>
<source>Import Studio from File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8325"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8275"/>
<source>Import Studio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8543"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8493"/>
<source><h3>Newer version available</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8544"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8494"/>
<source><p>You are using version %1. Version %2 is now available.</p><p>Please consult the <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Rosegarden website</a> for more information.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8654"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8604"/>
<source><h3>Invalid audio path</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8655"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8605"/>
<source><p>You will not be able to record audio or drag and drop audio files onto Rosegarden until you correct this in <b>View -> Document Properties -> Audio</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8659"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8609"/>
<source><h3>Created audio path</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8660"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8610"/>
<source><qt><p>Rosegarden created the audio path "%1" to use for audio recording, and to receive dropped audio files.</p><p>If you wish to use a different path, change this in <b>View -> Document Properties -> Audio</b>.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8666"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8616"/>
<source><qt><p>The audio path "%1" did not exist, and could not be created.</p>%2</qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8671"/>
+ <location filename="../../src/gui/application/RosegardenMainWindow.cpp" line="8621"/>
<source><qt><p>The audio path "%1" exists, but is not writable.</p>%2</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -21267,12 +21384,12 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/widgets/Rotary.cpp" line="506"/>
+ <location filename="../../src/gui/widgets/Rotary.cpp" line="504"/>
<source>Select a new value</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/widgets/Rotary.cpp" line="507"/>
+ <location filename="../../src/gui/widgets/Rotary.cpp" line="505"/>
<source>Enter a new value</source>
<translation type="unfinished"></translation>
</message>
@@ -21319,7 +21436,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="44"/>
<source>Change Segment Color...</source>
<translation type="unfinished"></translation>
</message>
@@ -21362,7 +21479,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="105"/>
<source>Click on a segment to delete it</source>
<translation type="unfinished"></translation>
</message>
@@ -21395,7 +21512,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="48"/>
<source>&Join</source>
<translation type="unfinished"></translation>
</message>
@@ -21403,7 +21520,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="45"/>
<source>Re&label...</source>
<translation type="unfinished"></translation>
</message>
@@ -21440,22 +21557,22 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="176"/>
<source>Move Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="177"/>
<source>Move Segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="228"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="258"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="342"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="334"/>
<source>Click and drag to move a segment</source>
<translation type="unfinished"></translation>
</message>
@@ -21650,17 +21767,17 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="284"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="294"/>
<source>Record or drop audio here</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="290"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="300"/>
<source>Click and drag to draw an empty segment. Control+Alt click and drag to draw in overlap mode.</source>
<translation type="unfinished"></translation>
</message>
@@ -21731,54 +21848,54 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="162"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="153"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="163"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before rescaling an audio file.
Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="172"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="182"/>
<source>Rescaling audio file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="182"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="192"/>
<source>Generating audio preview...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="235"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="246"/>
<source>Resize Segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="274"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="290"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="280"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="297"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="282"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="299"/>
<source>Hold Ctrl to rescale contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="396"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="408"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="398"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="410"/>
<source>Click and drag to rescale segment</source>
<translation type="unfinished"></translation>
</message>
@@ -21786,54 +21903,54 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="81"/>
<source>Click and drag to select segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="247"/>
- <source>Move Segment(s)</source>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="288"/>
+ <source>Move %n Segment(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="401"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="429"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="509"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="549"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="526"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="566"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="528"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="568"/>
<source>Click and drag to rescale segment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="533"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="573"/>
<source>Click and drag to move segments; hold Ctrl as well to copy them; Ctrl + Alt for linked copies</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="535"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="575"/>
<source>Click and drag to copy segments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="539"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="579"/>
<source>Click and drag to move segment; hold Ctrl as well to copy it; Ctrl + Alt for a linked copy; double-click to edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="541"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="581"/>
<source>Click and drag to copy segment</source>
<translation type="unfinished"></translation>
</message>
@@ -21905,15 +22022,10 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="169"/>
- <source>Click on a segment to split it in two</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -22028,103 +22140,103 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SequenceManager</name>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="926"/>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1076"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="928"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1078"/>
<source>The JACK Audio subsystem has failed or it has stopped Rosegarden from processing audio.
Please restart Rosegarden to continue working with audio.
Quitting other running applications may improve Rosegarden's performance.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="932"/>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1085"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="934"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1087"/>
<source>The JACK Audio subsystem has stopped Rosegarden from processing audio, probably because of a processing overload.
An attempt to restart the audio service has been made, but some problems may remain.
Quitting other running applications may improve Rosegarden's performance.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="943"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="945"/>
<source>Out of processor power for real-time audio processing. Cannot continue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="969"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="971"/>
<source>A serious error has occurred in the ALSA MIDI subsystem. It may not be possible to continue sequencing. Please check console output for more information.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="995"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="997"/>
<source>JACK Audio subsystem is losing sample frames.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1013"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1015"/>
<source>Failed to read audio data from disk in time to service the audio subsystem.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1017"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1019"/>
<source>Failed to write audio data to disk fast enough to service the audio subsystem.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1021"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1023"/>
<source>The audio mixing subsystem is failing to keep up.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1025"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1027"/>
<source>The audio subsystem is failing to keep up.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1029"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1031"/>
<source>Unknown sequencer failure mode!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1069"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1071"/>
<source><h3>System timer resolution is too low!</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1104"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1106"/>
<source><p>Rosegarden was unable to find a high-resolution timing source for MIDI performance.</p><p>This may mean you are using a Linux system with the kernel timer resolution set too low. Please contact your Linux distributor for more information.</p><p>Some Linux distributors already provide low latency kernels, see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/low-latency_kernels">Rosegarden website</a> for instructions.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1129"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1131"/>
<source><p>Rosegarden was unable to find a high-resolution timing source for MIDI performance.</p><p>You may be able to solve this problem by loading the RTC timer kernel module. To do this, try running <b>sudo modprobe snd-rtctimer</b> in a terminal window and then restarting Rosegarden.</p><p>Alternatively, check whether your Linux distributor provides a multimedia-optimized kernel. See the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/low-latency_kernels">Rosegarden website</a> for notes about this.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1239"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1241"/>
<source><h3>Sequencer engine unavailable!</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1240"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1242"/>
<source><p>Both MIDI and Audio subsystems have failed to initialize.</p><p>If you wish to run with no sequencer by design, then use "rosegarden --nosequencer" to avoid seeing this error in the future. Otherwise, we recommend that you repair your system configuration and start Rosegarden again.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1242"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1244"/>
<source><h3>MIDI sequencing unavailable!</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1243"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1245"/>
<source><p>The MIDI subsystem has failed to initialize.</p><p>You may continue without the sequencer, but we suggest closing Rosegarden, running "modprobe snd-seq-midi" as root, and starting Rosegarden again. If you wish to run with no sequencer by design, then use "rosegarden --nosequencer" to avoid seeing this error in the future.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1260"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1262"/>
<source><h3>Audio sequencing and synth plugins unavailable!</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1261"/>
+ <location filename="../../src/gui/seqmanager/SequenceManager.cpp" line="1263"/>
<source><p>Rosegarden could not connect to the JACK audio server. This probably means that Rosegarden was unable to start the audio server due to a problem with your configuration, your system installation, or both.</p><p>If you want to be able to play or record audio files or use plugins, we suggest that you exit Rosegarden and use the JACK Control utility (qjackctl) to try different settings until you arrive at a configuration that permits JACK to start. You may also need to install a realtime kernel, edit your system security configuration, and so on. Unfortunately, this is an extremely complex subject.</p><p> Once you establish a working JACK configuration, Rosegarden will be able to start the audio server automatically in the future.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -23624,27 +23736,27 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="264"/>
<source><no instrument></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="192"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="201"/>
<source><untitled audio></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="194"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="203"/>
<source><untitled></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="1010"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="1052"/>
<source>Mute track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="1028"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="1070"/>
<source>Record on this track</source>
<translation type="unfinished"></translation>
</message>
@@ -23652,36 +23764,36 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="709"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="575"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="746"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="598"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="771"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="624"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="1002"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="943"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="1003"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="944"/>
<source>Rosegarden cannot accept dropped files of this type.</source>
<translation type="unfinished"></translation>
</message>
@@ -23722,383 +23834,399 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="91"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="92"/>
<source>Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="92"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="93"/>
<source>Track Parameters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="140"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="792"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="141"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="801"/>
<source><untitled></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="147"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="148"/>
<source>Playback parameters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="163"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="205"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="164"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="206"/>
<source>Device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="167"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="168"/>
<source><qt><p>Choose the device this track will use for playback.</p><p>Click <img src=":pixmaps/toolbar/manage-midi-devices.xpm"> to connect this device to a useful output if you do not hear sound</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="175"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="176"/>
<source>Instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="180"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="181"/>
<source><qt><p>Choose the instrument this track will use for playback. (Configure the instrument in <b>Instrument Parameters</b>).</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="191"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="192"/>
<source>Recording filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="210"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="211"/>
<source><qt><p>This track will only record Audio/MIDI from the selected device, filtering anything else out</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="217"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="218"/>
<source>Channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="222"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="223"/>
<source><qt><p>This track will only record Audio/MIDI from the selected channel, filtering anything else out</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="233"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="234"/>
<source>Staff export options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="252"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="253"/>
<source>Notation size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="257"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="258"/>
<source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="259"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="260"/>
<source>Normal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="260"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="261"/>
<source>Small</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="261"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="262"/>
<source>Tiny</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="268"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="269"/>
<source>Bracket type:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="273"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="274"/>
<source><qt><p>Bracket staffs in LilyPond<br>(fragile, use with caution)</p><qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="275"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="276"/>
<source>-----</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="276"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="277"/>
<source>[----</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="277"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="278"/>
<source>----]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="278"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="279"/>
<source>[---]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="279"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="280"/>
<source>{----</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="280"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="281"/>
<source>----}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="281"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="282"/>
<source>{[---</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="282"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="283"/>
<source>---]}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="291"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="292"/>
<source>Create segments with</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="304"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="305"/>
<source>Preset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="308"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="309"/>
<source><none></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="315"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="316"/>
<source>Load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="317"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="318"/>
<source><qt><p>Load a segment parameters preset from our comprehensive database of real-world instruments.</p><p>When you create new segments, they will have these parameters at the moment of creation. To use these parameters on existing segments (eg. to convert an existing part in concert pitch for playback on a Bb trumpet) use <b>Segments -> Convert notation for</b> in the notation editor.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="323"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="324"/>
<source>Clef</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="328"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="329"/>
<source><qt><p>New segments will be created with this clef inserted at the beginning</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="330"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="331"/>
<source>treble</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="331"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="332"/>
<source>bass</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="332"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="333"/>
<source>crotales</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="333"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="334"/>
<source>xylophone</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="334"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="335"/>
<source>guitar</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="335"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="336"/>
<source>contrabass</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="336"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="337"/>
<source>celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="337"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="338"/>
<source>old celesta</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="338"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="339"/>
<source>french</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="339"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="340"/>
<source>soprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="340"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="341"/>
<source>mezzosoprano</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="341"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="342"/>
<source>alto</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="342"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="343"/>
<source>tenor</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="343"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="344"/>
<source>baritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="344"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="345"/>
<source>varbaritone</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="345"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="346"/>
<source>subbass</source>
+ <comment>Clef name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="353"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="354"/>
<source>Transpose</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="358"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="359"/>
<source><qt><p>New segments will be created with this transpose property set</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="374"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="375"/>
<source>Pitch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="378"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="379"/>
<source>Lowest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="382"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="392"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="383"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="393"/>
<source>---</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="384"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="385"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="388"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="389"/>
<source>Highest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="394"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="395"/>
<source><qt><p>Choose the highest suggested playable note, using a staff</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="405"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="406"/>
<source>Color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="410"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="411"/>
<source><qt><p>New segments will be created using this color</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="596"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="597"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="605"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="606"/>
<source>Audio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="611"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="628"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="620"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="637"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="685"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="689"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="694"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="698"/>
<source> %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="796"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="805"/>
<source>[ Track %1 - %2 ]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1043"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1052"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1059"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1068"/>
<source>Add New Color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1091"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1100"/>
<source>New Color Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1092"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1101"/>
<source>Enter new name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1094"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1103"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1126"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1135"/>
<source>Highest playable note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1148"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1157"/>
<source>Lowest playable note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1207"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1216"/>
<source>Rosegarden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1207"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1216"/>
<source>The instrument preset database is corrupt. Check your installation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1251"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="1260"/>
<source>Segment</source>
<translation type="unfinished"></translation>
</message>
diff --git a/data/locale/ru.ts b/data/locale/ru.ts
index 3184d51..efc8aca 100644
--- a/data/locale/ru.ts
+++ b/data/locale/ru.ts
@@ -331,23 +331,23 @@
<translation type="unfinished">Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ файл шрифтовой карты '%1'</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&Файл</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>&Добавить звуковой файл...</translation>
</message>
@@ -357,37 +357,37 @@
<translation>&ÐкÑпортировать звуковой файл...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>&Закрыть</translation>
</message>
<message>
- <location line="-4676"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Правка</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>&Выгрузить звуковой файл</translation>
</message>
@@ -407,135 +407,131 @@
<translation>Удалить &неиÑпользуемые звуковые файлы...</translation>
</message>
<message>
- <location line="+5"/>
- <location line="+59"/>
+ <location line="-1682"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>&Справка</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">&Урок по Rosegarden</translation>
- </message>
- <message>
- <location line="-3206"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3121"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>Ру&ководÑтво по Ñообщению об ошибках</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>&О Rosegarden</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>ÐžÐ±Ñ‰Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ</translation>
</message>
<message>
- <location line="-3402"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-4258"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>&Копировать</translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>Ð’ÑÑ‚&авить</translation>
</message>
<message>
- <location line="-4369"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2802"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Выделение</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Ð’Ñтавка нот</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>ЛаÑтик</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>Со&хранить</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="-1382"/>
<source>&Insert Event</source>
<translation>&Ð’Ñтавить Ñобытие</translation>
</message>
@@ -555,103 +551,103 @@
<translation>&РаÑширенный редактор Ñобытий</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>&Вырезать</translation>
</message>
<message>
- <location line="-4197"/>
- <location line="+281"/>
+ <location line="-2480"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>&СнÑÑ‚ÑŒ выделение</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1363"/>
+ <location line="-1114"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>&Фильтровать выделение</translation>
</message>
<message>
- <location line="-1641"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-2742"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Вид</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>&Музыкальное времÑ</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>&Реальное времÑ</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation type="unfinished">&Грубое времÑ</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Сег&мент</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>&Открыть в редакторе...</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>&Матричный редактор</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>&Ðотный редактор</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>О &Qt</translation>
</message>
<message>
- <location line="-619"/>
+ <location line="-2482"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -726,13 +722,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
- <location line="+371"/>
+ <location line="-570"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-257"/>
+ <location line="+114"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -743,44 +739,44 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+406"/>
+ <location line="-2361"/>
<source>Hide St&atusbar</source>
<translation>&Строка ÑоÑтоÑниÑ</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Панель «ДейÑтвиÑ»</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Панель «ВремÑ»</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>ТранÑпорт</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Панель «МаÑштаб»</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -830,7 +826,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Ð’Ñтавить маркер</translation>
</message>
@@ -850,42 +846,42 @@
<translation>Изменить маркер</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2747"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Перемещение</translation>
</message>
<message>
- <location line="-1279"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4706"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>РиÑование</translation>
</message>
<message>
- <location line="-1252"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4697"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Смена размера</translation>
</message>
<message>
- <location line="-1133"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4641"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>&Удалить</translation>
</message>
<message>
- <location line="-4082"/>
+ <location line="-1755"/>
<source>&Grid</source>
<translation>&Сетка</translation>
</message>
@@ -906,370 +902,370 @@
</message>
<message>
<location line="+41"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&КомпозициÑ</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Добавить Ñмену &темпа...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>Добавить &Ñмену размера...</translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Редактор &Ñобытий</translation>
</message>
<message>
- <location line="-3737"/>
- <location line="+1570"/>
+ <location line="-2477"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>Коррек&циÑ</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Квантование</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>&Квантовать...</translation>
</message>
<message>
- <location line="-3798"/>
+ <location line="-2933"/>
<source>&Legato</source>
<translation>&Легато</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>Объединить ноты Ñ &одинаковой выÑотой тона</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>СмеÑтить в&лево</translation>
</message>
<message>
- <location line="-3353"/>
- <location line="+1777"/>
+ <location line="-2999"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>У&величить Ñилу нажатиÑ</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>Уме&ньшить Ñилу нажатиÑ</translation>
</message>
<message>
- <location line="-1767"/>
+ <location line="-2963"/>
<source>Set Event &Velocities...</source>
<translation>&УÑтановить Ñилу нажатиÑ...</translation>
</message>
<message>
<location line="+2"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>&В половину меньше</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>&УдвоеннаÑ</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>&РаÑÑ‚Ñнуть или Ñжать...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>&ТранÑпозициÑ</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>Полутоном &выше</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>Полутоном &ниже</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>&Октавой выше</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>&Октавой ниже</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>&ТранÑпонировать по полутонам...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>&ТранÑпонировать на интервал...</translation>
</message>
<message>
- <location line="-3701"/>
- <location line="+1693"/>
+ <location line="-2887"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>&Инвертировать</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>&Ракоход («Крабий канон»)</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>&Инвертированный ракоход</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>&Переключаемые Ñегменты...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>&ИнÑтрументы</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>&Выделение и правка</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>&РиÑование</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>&ЛаÑтик</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Перемещение</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>С&мена размера</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>&Разделение</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>&Сила нажатиÑ</translation>
</message>
<message>
<location line="-189"/>
- <location line="+1724"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>ПеремеÑтить курÑор &вперёд и выбрать ноту</translation>
</message>
<message>
- <location line="-1688"/>
- <location line="+1724"/>
+ <location line="-2884"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>СнÑÑ‚ÑŒ п&етлю</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>&ТранÑпорт</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>&ВоÑпроизвеÑти</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&ОÑтановить</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>Перемотать &назад</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Перемотать &вперёд</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Перемотать к &началу</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Перемотать к &концу</translation>
</message>
<message>
- <location line="-1758"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2954"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>&Прокручивать по ходу воÑпроизведениÑ</translation>
</message>
<message>
- <location line="-3116"/>
- <location line="+1908"/>
+ <location line="-2741"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>&Октавой выше</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>&Режим ввода аккордов</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>&ÐŸÐ¾ÑˆÐ°Ð³Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>&Панели</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>&Линейки</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation type="unfinished">Линейка а&ккордов</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation type="unfinished">Линейка &темпа</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>ИнÑтрументы</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>&ЗапиÑать</translation>
</message>
<message>
- <location line="-2558"/>
+ <location line="-650"/>
<source>Number of Stereo &Inputs</source>
<translation>КоличеÑтво Ñтерео&входов</translation>
</message>
@@ -1294,7 +1290,7 @@
<translation>Показать &неназначенные фейдеры</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+917"/>
<source>C&ut and Close</source>
<translation>В&ырезать и закрыть</translation>
</message>
@@ -1374,21 +1370,21 @@
<translation>Показывать &заголовки дорожек</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Редактор &перкуÑÑии</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>Добавить Ñмену &ключа...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Добавить Ñмену &тональноÑти...</translation>
</message>
@@ -1403,13 +1399,13 @@
<translation>Добавить &отпуÑкание педали</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>ПерепиÑать партитуру &длÑ...</translation>
</message>
<message>
- <location line="-1260"/>
+ <location line="+851"/>
<source>Add &Segno</source>
<translation>Добавить Ñ&Ñньо</translation>
</message>
@@ -1429,310 +1425,310 @@
<translation>Ð&оты</translation>
</message>
<message>
- <location line="-1963"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2894"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="-4666"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-2620"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation>F1</translation>
</message>
<message>
- <location line="-4686"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-4368"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2701"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2595"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4380"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2604"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4365"/>
+ <location line="-2765"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4392"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-2671"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location line="-4420"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="-2823"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation>Delete</translation>
</message>
<message>
- <location line="-4270"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-2728"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4428"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-3873"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4206"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-2674"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4401"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-2725"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4120"/>
- <location line="+1363"/>
+ <location line="-2540"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1563"/>
- <location line="+36"/>
+ <location line="-2871"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation>F2</translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3923"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation>F5</translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4706"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation>F3</translation>
</message>
<message>
- <location line="-4163"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4697"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation>F4</translation>
</message>
<message>
- <location line="-4026"/>
- <location line="+4120"/>
+ <location line="-4605"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Delete, Ctrl+D</translation>
</message>
<message>
- <location line="-3804"/>
- <location line="+1724"/>
+ <location line="+316"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>Ð’Ñтавить поÑледовательноÑÑ‚ÑŒ Ñдвига в&Ñ‹Ñоты тона...</translation>
</message>
<message>
- <location line="-2000"/>
- <location line="+2350"/>
+ <location line="-3196"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation>0</translation>
</message>
<message>
- <location line="-2340"/>
- <location line="+2331"/>
+ <location line="-3536"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2321"/>
- <location line="+2312"/>
+ <location line="-3517"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2302"/>
- <location line="+2293"/>
+ <location line="-3498"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation>8</translation>
</message>
<message>
- <location line="-2283"/>
- <location line="+2274"/>
+ <location line="-3479"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2264"/>
- <location line="+2255"/>
+ <location line="-3460"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2246"/>
- <location line="+2237"/>
+ <location line="-3442"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2228"/>
- <location line="+2219"/>
+ <location line="-3424"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation>&ДейÑтвиÑ</translation>
</message>
@@ -1743,118 +1739,118 @@
</message>
<message>
<location line="+7"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>Добавить линейку &контроллера</translation>
</message>
<message>
- <location line="-1284"/>
- <location line="+1550"/>
+ <location line="-2479"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2723"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation>=</translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation>+</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation>-</translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Left</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Right</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Up</translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Down</translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation>Up</translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation>Down</translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Up</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Down</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Alt+I</translation>
@@ -1867,679 +1863,679 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Left</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Right</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>КурÑор на такт &назад и выделить</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Left</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>КурÑор на такт впер&ёд и выделить</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Right</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+;</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgUp</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgDown</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation>Left</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation>Right</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Left</translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Right</translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation>Pause</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation>F7</translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I/до</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>I/до диез</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II/ре бемоль</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II/ре</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation></translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II/ре диез</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III/ми бемоль</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III/ми</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV/фа</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV/фа диез</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V/Ñоль бемоль</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V/Ñоль</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V/Ñоль диез</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI/Ð»Ñ Ð±ÐµÐ¼Ð¾Ð»ÑŒ</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI/лÑ</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI/Ð»Ñ Ð´Ð¸ÐµÐ·</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII/Ñи бемоль</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII/Ñи</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation>L</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+E</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation>R</translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Shift+R</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation>U</translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+I</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+I</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation>O</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation>Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+X</translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation>X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Shift+X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation>V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Shift+V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation>N</translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+M</translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation>M</translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation>H</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2516"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -2564,7 +2560,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+929"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Shift+X</translation>
@@ -2611,14 +2607,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="+4"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-1269"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2452"/>
+ <location line="+10"/>
<source>Add &Layer</source>
<translation>Добавить &Ñлой</translation>
</message>
@@ -2759,7 +2760,7 @@
<translation>&Пометки</translation>
</message>
<message>
- <location line="-1511"/>
+ <location line="-2707"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -2770,51 +2771,51 @@
</message>
<message>
<location line="+355"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1030"/>
- <location line="+1936"/>
+ <location line="-2226"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2526"/>
+ <location line="+105"/>
<source>&Guess Beats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+48"/>
+ <location line="+49"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -3035,8 +3036,8 @@
<translation>&ВоÑÑтановить направление штилей</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>Фр&аза</translation>
</message>
@@ -3074,14 +3075,14 @@
<translation>Ctrl+U</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="-1966"/>
+ <location line="+2"/>
<source>&Triplet</source>
<translation>&Триоль</translation>
</message>
@@ -3129,15 +3130,15 @@
<translation>Легато Ñ&низу</translation>
</message>
<message>
- <location line="-1542"/>
- <location line="+1550"/>
+ <location line="-2738"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation>~</translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1550"/>
+ <location line="-2744"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>&Разлиговать ноты</translation>
</message>
@@ -3209,14 +3210,14 @@
<translation>&Ðормализовать паузы</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+N</translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation>&Объединить паузы</translation>
</message>
@@ -3226,8 +3227,8 @@
<translation>&Ðоты</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+=</translation>
@@ -3386,13 +3387,13 @@
<translation>Т&очный тайминг</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>СмеÑтить в&право</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>&ВидимоÑÑ‚ÑŒ</translation>
</message>
@@ -3500,7 +3501,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+760"/>
+ <location line="-2601"/>
<source>Switch To &Notes</source>
<translation>&Ðоты</translation>
</message>
@@ -3520,25 +3521,25 @@
<translation>В&ыключить точки</translation>
</message>
<message>
- <location line="-2662"/>
- <location line="+1908"/>
+ <location line="-497"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>&Ð’Ñтавить ноту</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>&Октавой ниже</translation>
</message>
<message>
- <location line="-1337"/>
- <location line="+1989"/>
+ <location line="-2091"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>&ИнÑтрументы</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>&Знаки альтерации</translation>
</message>
@@ -3558,23 +3559,23 @@
<translation>&Группировка</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>&ТранÑпорт</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>О&блик</translation>
</message>
<message>
- <location line="+1989"/>
+ <location line="-753"/>
<source>Show Cho&rd Name Ruler</source>
<translation type="unfinished">Показать линейку Ñ Ð¸Ð¼ÐµÐ½Ð°Ð¼Ð¸ а&ккордов</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation type="unfinished">Показать линейку &иÑполнÑемых нот</translation>
</message>
@@ -3589,7 +3590,7 @@
<translation>Показывать д&ирективы Lilypond</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>Ключи</translation>
</message>
@@ -3609,12 +3610,12 @@
<translation>Пометки</translation>
</message>
<message>
- <location line="-3023"/>
+ <location line="-4219"/>
<source>Show T&ransport Toolbar</source>
<translation>&ТранÑпорт</translation>
</message>
<message>
- <location line="+2184"/>
+ <location line="+3380"/>
<source>S&ymbols</source>
<translation>Сим&волы</translation>
</message>
@@ -3629,61 +3630,61 @@
<translation>ÐотоноÑец ни&же</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>&Предыдущий Ñегмент</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>&Следующий Ñегмент</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>Шаг &назад</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>Шаг &вперёд</translation>
</message>
<message>
- <location line="-748"/>
+ <location line="-749"/>
<source>Show &Rulers Toolbar</source>
<translation>&Линейки</translation>
</message>
<message>
- <location line="-415"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-1610"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>&РуководÑтво по Rosegarden</translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>Параметры...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="-826"/>
<source>Cursor Back and Se&lect</source>
<translation>КурÑор &назад и выделить ноту</translation>
</message>
<message>
- <location line="+1074"/>
- <location line="+1996"/>
+ <location line="+1523"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>&Параметры</translation>
</message>
<message>
- <location line="-2983"/>
- <location line="+1754"/>
+ <location line="-2182"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>Шаг назад (влево)</translation>
</message>
@@ -3693,13 +3694,13 @@
<translation>ВоÑпроизвеÑти</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>Шаг вперёд (вправо)</translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation>&ДейÑтвие</translation>
</message>
@@ -3719,12 +3720,12 @@
<translation>Справка</translation>
</message>
<message>
- <location line="+1906"/>
+ <location line="+1078"/>
<source>Show La&yer Toolbar</source>
<translation>С&лои</translation>
</message>
<message>
- <location line="+732"/>
+ <location line="+733"/>
<source>Stop</source>
<translation>Стоп</translation>
</message>
@@ -3915,7 +3916,7 @@
<translation>Панель Ñлоёв</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Ð’Ñтавка</translation>
</message>
@@ -3970,7 +3971,7 @@
<translation>Сделать видимым</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Ðвтогруппировка при возможноÑти</translation>
</message>
@@ -3990,7 +3991,7 @@
<translation>Бекар</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+622"/>
<source>&New</source>
<translation>&Создать</translation>
</message>
@@ -4000,14 +4001,6 @@
<translation>&Импортировать</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Импортировать файл &проекта Rosegarden...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Импортировать ф&айл MIDI...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>Импортировать фай&л Hydrogen...</translation>
@@ -4023,10 +4016,6 @@
<translation>Объединить Ñ &файлом...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Объединить Ñ Ñ„&айлом MIDI...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Объединить Ñ Ñ„Ð°Ð¹&лом Hydrogen...</translation>
@@ -4037,39 +4026,11 @@
<translation>&ÐкÑпортировать</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">ÐкÑпортировать файл &проекта Rosegarden...</translation>
- </message>
- <message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Ð&кÑпортировать в файл LilyPond...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">ÐкÑпортировать в Ñ„&айл MIDI...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">ÐкÑпортировать в &партитуру Csound...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">ÐкÑпортировать в фа&йл Mup...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Ð&кÑпортировать в файл Music&XML...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>&Открыть...</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Сохранить &как...</translation>
- </message>
- <message>
<location line="+29"/>
<source>Re&vert</source>
<translation>&ВоÑÑтановить</translation>
@@ -4301,13 +4262,13 @@
<translation>П&ерераÑпределить инÑтрументы...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>&Смена размера</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation>ЗапиÑать &врезкой</translation>
</message>
@@ -4357,14 +4318,14 @@
<translation>Показывать м&етки дорожек</translation>
</message>
<message>
- <location line="-2411"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-864"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>&Поддержать Rosegarden</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-1858"/>
<source>Tracks Toolbar</source>
<translation>Панель «Дорожки»</translation>
</message>
@@ -4374,7 +4335,7 @@
<translation>Панель «Правка»</translation>
</message>
<message>
- <location line="+215"/>
+ <location line="+66"/>
<source>Insert Tempo Change</source>
<translation>Ð’Ñтавить Ñмену темпа</translation>
</message>
@@ -4414,7 +4375,7 @@
<translation>Открыть редактор темпа и размера</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>&Изменить</translation>
</message>
@@ -4429,25 +4390,11 @@
<translation>&Параметры</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>Ð’Ñтавить как &новый переключаемый Ñегмент</translation>
</message>
<message>
- <source>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.
-Not enough space was found.
-If you want to paste anyway, consider using one of the other paste types from the "Paste..." option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</source>
- <translation type="obsolete">Ограниченный ÑпоÑоб вÑтавки требует доÑтаточного
-количеÑтва Ñвободного диÑкового проÑтранÑтва
-Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð²Ñех вÑтавлÑемых Ñобытий.
-Ð’ наÑтоÑщий момент диÑкового поÑтранÑтва не хватает..
-ЕÑли вам вÑÑ‘ равно необходимо вÑтавить данные,
-иÑпользуйте любой другой тип вÑтавки
-из меню "Правка". Ð’Ñ‹ также можете Ñменить
-Ñтандартный тип вÑтавки Ñ ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ð¾Ð¹
-на какую-либо другую.</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NoteFont.cpp" line="+58"/>
<source>No sizes listed for font "%1"</source>
<translation type="unfinished"></translation>
@@ -4468,7 +4415,7 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>БаÑ</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2626"/>
+ <location filename="../QMenuStrings.cpp" line="+345"/>
<location filename="../InstrumentStrings.cpp" line="-74"/>
<source>Triangle</source>
<translation>Треугольник</translation>
@@ -4505,8 +4452,8 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Ð¡Ñ‚Ð°Ð±Ð¸Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð·Ð°</translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+721"/>
<location filename="../../src/base/Studio.cpp" line="+58"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+707"/>
<location filename="../AutoloadStrings.cpp" line="-700"/>
<source>Audio</source>
<translation>Звук</translation>
@@ -4517,43 +4464,38 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>ÐеизвеÑтно</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2072"/>
+ <location filename="../QMenuStrings.cpp" line="-1245"/>
<source>Play Preview</source>
<translation>ВоÑпроизвеÑти фрагмент</translation>
</message>
<message>
- <location line="+26"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-1763"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>Ðет &отменÑемых дейÑтвий</translation>
</message>
<message>
- <location line="-4645"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2636"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>Ðет &возвращаемых дейÑтвий</translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-1292"/>
<source>&Select All</source>
<translation>Ð’&ыделить вÑÑ‘</translation>
</message>
@@ -4568,12 +4510,12 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>УÑтановить &длительноÑÑ‚ÑŒ Ñегмента...</translation>
</message>
<message>
- <location line="+1670"/>
+ <location line="+1461"/>
<source>Show &Symbols Toolbar</source>
<translation>Показать панель Ñи&мволов</translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>ДлительноÑти</translation>
</message>
@@ -4583,12 +4525,7 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Символы</translation>
</message>
<message>
- <source>Enter, Media Play, Ctrl+Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Enter, Media Play, Ctrl+Return</translation>
- </message>
- <message>
- <location line="+623"/>
+ <location line="-2120"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
<translation>Insert, Media Stop</translation>
@@ -4635,20 +4572,12 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>End</translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>&Показать панель</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">Ðет &отменÑемых дейÑтвий</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Ðет &возвращаемых дейÑтвий</translation>
- </message>
- <message>
- <location line="-4152"/>
+ <location line="+162"/>
<source>Select &All Events</source>
<translation>Ð’&ыделить вÑе ÑобытиÑ</translation>
</message>
@@ -4713,15 +4642,15 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>&ИнÑтрументы</translation>
</message>
<message>
- <location line="-365"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="+4"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>&Строка ÑоÑтоÑниÑ</translation>
</message>
<message>
- <location line="-3259"/>
+ <location line="-2447"/>
<source>&Repeat Last Quantize</source>
<translation>Повторить поÑледнее &квантование</translation>
</message>
@@ -4751,51 +4680,51 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Удалить п&ереключатели</translation>
</message>
<message>
- <location line="+1733"/>
+ <location line="+2929"/>
<source>Cursor back and Se&lect</source>
<translation>КурÑор &назад и выделить ноту</translation>
</message>
<message>
- <location line="-1688"/>
- <location line="+1724"/>
+ <location line="-2884"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>Сделать &петлю из выделениÑ</translation>
</message>
<message>
- <location line="-1636"/>
- <location line="+1775"/>
+ <location line="-2832"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>Со&ло</translation>
</message>
<message>
- <location line="-1765"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2961"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>Па&ника</translation>
</message>
<message>
- <location line="-3685"/>
- <location line="+1302"/>
+ <location line="-3316"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>Показать линейку &Ñилы нажатиÑ</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Показать линейку &выÑоты тона</translation>
</message>
<message>
- <location line="-406"/>
- <location line="+2123"/>
+ <location line="-1601"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Линейки</translation>
</message>
<message>
- <location line="-1921"/>
+ <location line="-2756"/>
<source>&Settings</source>
<translation>Пара&метры</translation>
</message>
@@ -4855,7 +4784,7 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Показывать &аудиоÑубмикÑÑ‹</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="-93"/>
<source>Switch to Inserting Tool</source>
<translation>Ð’Ñтавка</translation>
</message>
@@ -4865,13 +4794,13 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Объединить паузы поÑле удалениÑ</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>&Печать...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>ПроÑ&мотр печати...</translation>
</message>
@@ -4886,7 +4815,7 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>ПеремеÑтить в нотоноÑец &ниже</translation>
</message>
<message>
- <location line="+110"/>
+ <location line="+111"/>
<source>Add Sta&ccato</source>
<translation>Добавить Ñта&ккато</translation>
</message>
@@ -5071,8 +5000,8 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Добавить &фразировочную лигу</translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>&СвÑÐ·ÑƒÑŽÑ‰Ð°Ñ Ð»Ð¸Ð³Ð°</translation>
</message>
@@ -5242,31 +5171,31 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Ð’Ñтавить паузу</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+516"/>
+ <location line="-2220"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation>P</translation>
</message>
<message>
- <location line="-505"/>
+ <location line="+11"/>
<source>Triplet Insert Mo&de</source>
<translation>Режим ввода &триолей</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1190"/>
+ <location line="-4313"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location line="-1179"/>
+ <location line="+11"/>
<source>Grace Insert &Mode</source>
<translation>Режим ввода &форшлагов</translation>
</message>
<message>
- <location line="+258"/>
+ <location line="-3103"/>
<source>No Accidental</source>
<translation>Без знака альтерации</translation>
</message>
@@ -5286,15 +5215,7 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Дубль-бемоль</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Импортировать файл Rosegarden Ð´Ð»Ñ &X11...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Объединить Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð¼ Rosegarden Ð´Ð»Ñ &X11...</translation>
- </message>
- <message>
- <location line="+37"/>
+ <location line="+655"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+O</translation>
@@ -5337,13 +5258,13 @@ If you want to paste anyway, consider using one of the other paste types from th
</message>
<message>
<location line="+7"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location line="-839"/>
+ <location line="-611"/>
<source>&Insert Range...</source>
<translation>Ð’ÑÑ‚&авить облаÑÑ‚ÑŒ...</translation>
</message>
@@ -5365,32 +5286,32 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Открыть &редактор темпа и размера</translation>
</message>
<message>
- <location line="-2047"/>
- <location line="+2059"/>
+ <location line="+12"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-680"/>
<source>&Set Quick Marker at Playback Position</source>
<translation>Ð’Ñтавить &быÑтрый маркер в точку воÑпроизведениÑ</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>Перейти к б&Ñ‹Ñтрому маркеру</translation>
</message>
<message>
- <location line="-1236"/>
- <location line="+1243"/>
+ <location line="-1493"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-1496"/>
<source>MIDI Mi&xer</source>
<translation>М&икшер MIDI</translation>
</message>
@@ -5406,62 +5327,58 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Открыть в редакторе по &умолчанию</translation>
- </message>
- <message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>Ввод</translation>
</message>
<message>
- <location line="-324"/>
- <location line="+452"/>
+ <location line="-495"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>Изменить &метку...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>Повторить поÑледнее &квантование</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>&РаÑÑ‚Ñнуть или Ñжать...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>УÑтановить &Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>УÑтановить &длительноÑÑ‚ÑŒ...</translation>
</message>
<message>
- <location line="+19"/>
- <location line="+382"/>
+ <location line="-1219"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Объединить</translation>
</message>
<message>
- <location line="-375"/>
- <location line="+382"/>
+ <location line="-605"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="-376"/>
+ <location line="+6"/>
<source> Split &at Time...</source>
<translation>Разделить по &времени...</translation>
</message>
@@ -5493,15 +5410,15 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Вк&лючить или отключить запиÑываемоÑÑ‚ÑŒ</translation>
</message>
<message>
- <location line="-3927"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2015"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>&ОÑÐ½Ð¾Ð²Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="-724"/>
<source>Sh&ow Segment Labels</source>
<translation>Показывать &метки Ñегментов</translation>
</message>
@@ -5511,19 +5428,19 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>ОÑÐ½Ð¾Ð²Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1636"/>
+ <location line="+7"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Перемотать в начало</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Перемотать в конец</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="-3577"/>
<source>&Clear Selection</source>
<translation>&СнÑÑ‚ÑŒ выделение</translation>
</message>
@@ -8456,9 +8373,9 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation><нет></translation>
</message>
<message>
- <location filename="../../src/base/Studio.cpp" line="+3"/>
<location filename="../../src/sound/AlsaDriver.cpp" line="-37"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/base/Studio.cpp" line="+3"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>Виртуальный инÑтрумент</translation>
@@ -10594,9 +10511,9 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10611,10 +10528,10 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>Контроллер %1 — %2 %3</translation>
</message>
@@ -10629,7 +10546,7 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Добро пожаловать!</translation>
</message>
@@ -10737,45 +10654,53 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
- <source>Invalid event code found</source>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation type="unfinished"></translation>
</message>
@@ -10875,7 +10800,7 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
@@ -10928,10 +10853,6 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation type="unfinished"></translation>
</message>
<message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
<location filename="../../src/base/figuration/SegmentFigData.cpp" line="+53"/>
<source>Replace segment contents</source>
<translation type="unfinished"></translation>
@@ -10942,39 +10863,91 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Figuration Source Segment</source>
- <translation type="unfinished"></translation>
+ <location line="+2"/>
+ <source>Figuration Source Segment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Generated Segment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Segment of unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/base/parameterpattern/RelativeRamp.cpp" line="+30"/>
+ <source>Relative Ramp - modify existing %1 values linearly</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Increase first value this much: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Increase last value this much: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/commands/segment/UpdateFigurationCommand.cpp" line="+27"/>
+ <source>Update Figurations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Ð’ Lilypond недопуÑтимы пробелы и обратные черты в именах файлов.
+
+Ð’Ñ‹ хотите иÑпользовать
+
+ %1
+
+ вмеÑто них?</translation>
</message>
<message>
- <location line="+2"/>
- <source>Generated Segment</source>
- <translation type="unfinished"></translation>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Ðе удалоÑÑŒ выполнить ÑкÑпорт. Файл не мог быть открыт Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи.</translation>
</message>
<message>
- <location line="+1"/>
- <source>Segment of unknown type</source>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/base/parameterpattern/RelativeRamp.cpp" line="+30"/>
- <source>Relative Ramp - modify existing %1 values linearly</source>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <source>Increase first value this much: </source>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Increase last value this much: </source>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/commands/segment/UpdateFigurationCommand.cpp" line="+27"/>
- <source>Update Figurations</source>
- <translation type="unfinished"></translation>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">Предупреждение: Ñлишком длинный такт здеÑÑŒ урезан</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">Предупреждение: Ñлишком короткий такт был заполнен паузами.</translation>
</message>
</context>
<context>
@@ -10991,17 +10964,9 @@ If you want to paste anyway, consider using one of the other paste types from th
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>ÐвторÑкие права 2000-2010 команда разработчиков Rosegarden </p><p>ВерÑиÑ: %1 ВерÑÐ¸Ñ Qt: %2<br>Ключ Ñборки: %3</p><p>Rosegarden был Ñоздан Ð´Ð»Ñ Ð²Ð°Ñ Ð¼ÐµÐ¶Ð´ÑƒÐ½Ð°Ñ€Ð¾Ð´Ð½Ð¾Ð¹ командой разработчиков. Полный ÑпиÑок учаÑтников проекта вы можете получить по <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">Ñтому</a> адреÑу.<br>Более Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Rosegarden еÑÑ‚ÑŒ на <a style="color:gold" href="http://www.rosegardenmusic.com">Ñайте программы</a>.</p><p>ЛицензиÑ: GNU General Public License Version 2</p> {2000-2011 ?} {1 ?} {2<?} {3<?} {2<?}</translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>ÐвторÑкие права 2000-2010 команда разработчиков Rosegarden </p><p>ВерÑиÑ: %1 ВерÑÐ¸Ñ Qt: %2<br>Ключ Ñборки: %3</p><p>Rosegarden был Ñоздан Ð´Ð»Ñ Ð²Ð°Ñ Ð¼ÐµÐ¶Ð´ÑƒÐ½Ð°Ñ€Ð¾Ð´Ð½Ð¾Ð¹ командой разработчиков. Полный ÑпиÑок учаÑтников проекта вы можете получить по <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">Ñтому</a> адреÑу.<br>Более Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Rosegarden еÑÑ‚ÑŒ на <a style="color:gold" href="http://www.rosegardenmusic.com">Ñайте программы</a>.</p><p>ЛицензиÑ: GNU General Public License Version 2</p></translation>
- </message>
</context>
<context>
<name>Rosegarden::ActionCommandArgumentQuerier</name>
@@ -11061,12 +11026,12 @@ If you want to paste anyway, consider using one of the other paste types from th
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation type="unfinished">Добавить &легато</translation>
</message>
@@ -11574,24 +11539,24 @@ If you want to paste anyway, consider using one of the other paste types from th
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Щёлкните Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ñтого инÑтрумента</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><нет вирт. инÑтрумента></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><нет Ñффекта></translation>
</message>
@@ -11639,10 +11604,6 @@ If you want to paste anyway, consider using one of the other paste types from th
<translation>Файл</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><нет звуковых файлов></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Сохранить файл как</translation>
@@ -11808,7 +11769,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Звуковой микшер</translation>
</message>
@@ -11824,20 +11785,20 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Панорама</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>ГромкоÑÑ‚ÑŒ звука</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Моно или Ñтерео</translation>
</message>
@@ -11848,21 +11809,21 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><ничего></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation type="unfinished">Щёлкните Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ звукового Ñффекта</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation type="unfinished">Щёлкните Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ñтого инÑтрумента</translation>
</message>
@@ -11882,7 +11843,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation type="unfinished">Суб %1</translation>
</message>
@@ -11898,14 +11859,14 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">Общий</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><нет Ñффекта></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</translation>
</message>
@@ -12466,7 +12427,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation><новый банк %1></translation>
</message>
<message>
- <location line="+508"/>
+ <location line="+514"/>
<source>Some internal error: no device selected</source>
<translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: не выбрано уÑтройÑтво</translation>
</message>
@@ -12482,7 +12443,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</translation>
</message>
<message>
- <location line="-774"/>
+ <location line="-780"/>
<source><new bank></source>
<translation><новый банк></translation>
</message>
@@ -12502,7 +12463,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>ДейÑтвительно удалить Ñтот банк?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>ДейÑтвительно удалить Ñту компоновку?</translation>
</message>
@@ -12670,6 +12631,120 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -12993,7 +13068,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13218,7 +13293,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Сила нажатиÑ</translation>
</message>
@@ -13234,7 +13309,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Ðеподдерживаемый тип Ñобытий</translation>
</message>
@@ -13249,12 +13324,13 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð»ÐµÑ€Ð°</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation type="unfinished">Ðомер ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð»ÐµÑ€Ð°:</translation>
</message>
@@ -13262,7 +13338,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>&Копировать</translation>
</message>
@@ -13272,7 +13348,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>(отрывок)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(Ñкопировано)</translation>
</message>
@@ -13342,7 +13418,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>&Вырезать</translation>
</message>
@@ -13382,10 +13458,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Команда воÑÑоединениÑ</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>Удалить диапазон</translation>
@@ -13410,12 +13482,12 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation>[ Ðет порта ]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -14044,46 +14116,10 @@ This could cause problems if it overrides a different computed value later on.</
<translation type="unfinished">Образец</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Бемоль - уÑтановить значение %1</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Переменный — уÑтановить %1 в макÑ. или мин. значение на переменных ÑобытиÑÑ…</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Крещендо - уÑтановить повышение %1 от мин до макÑ</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">ДиминуÑндо - уÑтановить %1 Ñ Ð¿Ð¾Ð½Ð¸Ð¶ÐµÐ½Ð¸ÐµÐ¼ от макÑ. до мин.</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Звон - уÑтановить %1 чередующимÑÑ Ð¾Ñ‚ макÑ. до мин. Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ c угаÑанием до нулÑ</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>Значение</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Первое значение</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Второе значение</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Ðизкое значение</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Ð’Ñ‹Ñокое значение</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14478,22 +14514,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>СкачиваетÑÑ %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Ðе удалоÑÑŒ ÑоединитьÑÑ Ñ Ñервером FTP</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Ðе удалоÑÑŒ авторизоватьÑÑ</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Ðе удалоÑÑŒ Ñменить каталог</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">Скачивание Ñ FTP прервано</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Скачивание отменено</translation>
@@ -14822,10 +14842,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>Adobe Acrobat Reader (неÑвободное)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation type="unfinished"></translation>
@@ -14836,10 +14852,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>Утилита печати</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">KPrinter (KDE 3)</translation>
- </message>
- <message>
<location line="+5"/>
<source>Gtk-LP (GNOME)</source>
<translation>Gtk-LP (GNOME)</translation>
@@ -15421,7 +15433,7 @@ Example text from file:</source>
<translation>Параметры инÑтрумента</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Дорожка</translation>
</message>
@@ -15429,7 +15441,7 @@ Example text from file:</source>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -15822,7 +15834,6 @@ Example text from file:</source>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15830,7 +15841,7 @@ Would you like to use
%1
instead?</source>
- <translation>Ð’ Lilypond недопуÑтимы пробелы и обратные черты в именах файлов.
+ <translation type="obsolete">Ð’ Lilypond недопуÑтимы пробелы и обратные черты в именах файлов.
Ð’Ñ‹ хотите иÑпользовать
@@ -15839,39 +15850,16 @@ Would you like to use
вмеÑто них?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">Ðе удалоÑÑŒ выполнить ÑкÑпорт. Файл не мог быть открыт Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Ðе удалоÑÑŒ выполнить ÑкÑпорт. Файл не мог быть открыт Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>Предупреждение: Ñлишком длинный такт здеÑÑŒ урезан</translation>
+ <translation type="obsolete">Предупреждение: Ñлишком длинный такт здеÑÑŒ урезан</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>Предупреждение: Ñлишком короткий такт был заполнен паузами.</translation>
+ <translation type="obsolete">Предупреждение: Ñлишком короткий такт был заполнен паузами.</translation>
</message>
</context>
<context>
@@ -15902,10 +15890,6 @@ Would you like to use
<translation type="unfinished"></translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Выделенные дорожки</translation>
- </message>
- <message>
<location line="+16"/>
<source>Compatibility level</source>
<translation>Уровень ÑовмеÑтимоÑти</translation>
@@ -16585,7 +16569,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -16670,12 +16654,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>Получать извне</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Ðет ÑвÑзи</translation>
</message>
@@ -16899,6 +16878,15 @@ delay at the start of playback due to the amount of data being transmitted.</sou
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17102,12 +17090,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Ðажмите Shift, чтобы отключить прилипание к Ñетке долей</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Скопировать и перемеÑтить Ñобытие</translation>
</message>
@@ -17266,7 +17254,7 @@ Double-click to open the marker editor.</source>
<translation>Смена Ñил нажатиÑ</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation type="unfinished">Щелкните и перетащите курÑор мыши Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð¾Ñ‚</translation>
</message>
@@ -17279,12 +17267,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished">ÐеизвеÑтное дейÑтвие %1 при вÑтавке ноты</translation>
</message>
<message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation type="unfinished"><без имени></translation>
</message>
@@ -17348,7 +17336,7 @@ Double-click to open the marker editor.</source>
<translation>Выкл</translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation type="unfinished"></translation>
</message>
@@ -17364,8 +17352,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -17375,7 +17362,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">РаÑÑчитанные ключевые знаки альтерации отображены вверху</translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation type="unfinished">ВычиÑленные ключевые знаки альтерации показаны вверху</translation>
</message>
@@ -17390,10 +17377,6 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">По чиÑлу полутонов:</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">УÑтановить Ñилу нажатиÑ</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation type="unfinished">Переключаемый Ñегмент</translation>
@@ -17404,20 +17387,15 @@ Double-click to open the marker editor.</source>
<translation>Удалить переключатели</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>Матричный редактор</translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Ðевозможно вÑтавить ноту: не выбрана длительноÑÑ‚ÑŒ Ñетки</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>МаÑштаб</translation>
</message>
@@ -17437,7 +17415,7 @@ Double-click to open the marker editor.</source>
<translation>СброÑить маÑштаб</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
</message>
@@ -17560,7 +17538,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>Микшер MIDI</translation>
</message>
@@ -17575,7 +17553,7 @@ Double-click to open the marker editor.</source>
<translation>ИнÑтрумент</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</translation>
</message>
@@ -17874,13 +17852,13 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Партитура</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>ПредÑтавление по умолчанию</translation>
</message>
@@ -18458,7 +18436,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> Шрифт: </translation>
</message>
@@ -18479,7 +18457,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"> Промежуток: </translation>
</message>
<message numerus="yes">
- <location line="-118"/>
+ <location line="-120"/>
<source> %n event(s) selected </source>
<translation>
<numerusform> Выделено %n Ñобытие </numerusform>
@@ -18493,7 +18471,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation> Ðет Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ </translation>
</message>
<message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation>Ðккорд</translation>
</message>
@@ -18510,7 +18488,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>%1 %2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation type="unfinished">%1 - неизвеÑтное дейÑтвие Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ¶ÑƒÑ‚ÐºÐ¾Ð¼</translation>
</message>
@@ -18535,42 +18513,37 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>Параметры предоÑмотра LilyPond</translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Ðе удалоÑÑŒ выполнить ÑкÑпорт. Файл не мог быть открыт Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи.</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Буфер обмена пуÑÑ‚</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>Ðевозможно вÑтавить неÑкольких Ñегментов в один</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+381"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>ВыполнÑетÑÑ Ð¿ÐµÑ‡Ð°Ñ‚ÑŒ через LilyPond...</translation>
</message>
@@ -18585,29 +18558,29 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation type="unfinished">Ð’ÑтавлÑетÑÑ Ñодержимое буфера обмена...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation type="unfinished">Ðевозможно оÑущеÑтвить вÑтавку в Ñтой точке.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation>ПеремеÑтить ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² нотоноÑец выше</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>Повышение Ñилы нажатиÑ...</translation>
</message>
@@ -18617,15 +18590,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>Понижение Ñилы нажатиÑ...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">УÑтановить Ñилу нажатиÑ</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">УÑтанавливаетÑÑ Ñила нажатиÑ...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation type="unfinished"></translation>
</message>
@@ -18640,7 +18605,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished">Ðоты ÑжимаютÑÑ...</translation>
</message>
<message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation type="unfinished">ÐеизвеÑтное дейÑтвие %1 при вÑтавке ноты</translation>
</message>
@@ -18650,13 +18615,13 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>Ð’ÑтавлÑетÑÑ Ð½Ð¾Ñ‚Ð°</translation>
</message>
<message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation type="unfinished">ДобавлÑетÑÑ Ñ‚Ð¾Ñ‡ÐºÐ°...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation type="unfinished"></translation>
</message>
@@ -18666,10 +18631,6 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Создать украшение</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>ИÑпользовать украшение</translation>
@@ -18705,7 +18666,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished">Ð¡Ñ‚Ð°Ð±Ð¸Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð·Ð°</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation type="unfinished">Ð”Ð»Ñ Ñтого уÑтройÑтва не определён контроллер
@@ -18717,7 +18678,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished">ВычиÑленные ключевые знаки альтерации показаны вверху</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 — Сегмент дорожки #%3 — Ðотный редактор</translation>
</message>
@@ -18751,7 +18712,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>По чиÑлу полутонов: </translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>ВремÑ: %1 (%2.%3s)</translation>
</message>
@@ -18800,16 +18761,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Cycling slashes...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation type="unfinished">Ðевозможно вÑтавить ноту: не выбрана длительноÑÑ‚ÑŒ ноты</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>МаÑштаб</translation>
</message>
@@ -18834,7 +18790,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>Скрыть заголовки дорожек</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation type="unfinished"></translation>
@@ -19056,10 +19012,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">ПоÑледовательноÑÑ‚ÑŒ Ñдвига выÑоты тона</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>Профиль</translation>
@@ -19070,10 +19022,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>Профиль:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">ПользовательÑкий</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -19301,14 +19249,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>Перед Ñмещением</translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Значение (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">ДлительноÑÑ‚ÑŒ (%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation>ДлительноÑÑ‚ÑŒ ÑÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ (%):</translation>
@@ -19329,31 +19269,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>Конечное значение (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð°Ð¼Ð¿Ð»Ð¸Ñ‚ÑƒÐ´Ð° вибрато (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">ÐšÐ¾Ð½ÐµÑ‡Ð½Ð°Ñ Ð°Ð¼Ð¿Ð»Ð¸Ñ‚ÑƒÐ´Ð° вибрато (%):</translation>
- </message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation>ПоÑледовательноÑÑ‚ÑŒ ÑмещениÑ</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Длина волны вибрато:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">Разрешение:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Ðеправильно указано конечно времÑ. Ð’Ñ‹ выделили какие-либо ÑобытиÑ?</translation>
@@ -19880,13 +19800,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">Контроллер %1</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -19974,12 +19887,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Ðет</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>2 за Ð²Ñ€ÐµÐ¼Ñ 3</translation>
</message>
@@ -20044,7 +19957,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>Слиговать-разлиговать перекрывающиеÑÑ Ð°ÐºÐºÐ¾Ñ€Ð´Ñ‹</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Полное квантование</translation>
</message>
@@ -20387,8 +20300,8 @@ There may be some incompatibilities with the file format.</source>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20400,7 +20313,7 @@ There may be some incompatibilities with the file format.</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>Ðе удалоÑÑŒ Ñохранить документ в %1</translation>
</message>
@@ -20480,7 +20393,12 @@ Please select any you wish to delete permanently from the hard disk.
<translation>Объединить</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>Ðе удалоÑÑŒ Ñоздать временный файл в каталоге '%1': %2</translation>
</message>
@@ -20495,7 +20413,7 @@ Please select any you wish to delete permanently from the hard disk.
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished">Предупреждение</translation>
</message>
@@ -20509,11 +20427,7 @@ Would you like to set it now?</source>
Хотите Ñделать Ñто прÑмо ÑейчаÑ?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">СохранÑетÑÑ Ñ„Ð°Ð¹Ð»...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation>Ошибка при запиÑи "%1"</translation>
</message>
@@ -20593,7 +20507,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation type="unfinished">ВыделÑÑ‚ÑŒ можно либо звуковой, либо незвуковой Ñегмент</translation>
</message>
@@ -20604,7 +20518,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20613,7 +20527,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20633,7 +20547,7 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -20703,14 +20617,14 @@ See Edit -> Preferences -> Audio.</source>
<translation>Ключ на Ñтарт...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> МаÑштаб: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -20739,12 +20653,12 @@ Do you want to open it instead ?</source>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Без названиÑ</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20784,12 +20698,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Ð’Ñе поддерживаемые файлы</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20809,33 +20723,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Ð’Ñе файлы</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Открыть файл</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation type="unfinished">%1 - %3 {1%2 ?}</translation>
</message>
@@ -20845,16 +20759,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation type="unfinished">Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ файл "%1"</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>СохранÑетÑÑ Ñ„Ð°Ð¹Ð»...</translation>
</message>
@@ -20956,12 +20870,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Предупреждение</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21025,12 +20939,12 @@ No segment will be split.</source>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>УÑтановить темп вÑей композиции</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>Переключить отображение панели...</translation>
</message>
@@ -21096,12 +21010,12 @@ No segment will be split.</source>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Проектные файлы Rosegarden</translation>
</message>
<message>
- <location line="-1229"/>
+ <location line="-1223"/>
<source>Open MIDI File</source>
<translation>Открыть файл MIDI</translation>
</message>
@@ -21111,12 +21025,12 @@ No segment will be split.</source>
<translation>Объединить Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð¼ MIDI</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>ИмпортируетÑÑ Ñ„Ð°Ð¹Ð» MIDI...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>РаÑÑчитываетÑÑ Ð¿Ð°Ñ€Ñ‚Ð¸Ñ‚ÑƒÑ€Ð°...</translation>
</message>
@@ -21148,19 +21062,6 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Открыть файл Hydrogen</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">ИмпортируетÑÑ Ñ„Ð°Ð¹Ð» Hydrogen...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Ðе удалоÑÑŒ загрузить файл Hydrogen.
-Скорее вÑего, файл поврежден.</translation>
- </message>
- <message>
<location line="+152"/>
<location line="+36"/>
<source>Open MusicXML File</source>
@@ -21178,12 +21079,12 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3444"/>
+ <location line="+3416"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+615"/>
+ <location line="+595"/>
<source><h3>Invalid audio path</h3></source>
<translation type="unfinished"></translation>
</message>
@@ -21213,7 +21114,7 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3504"/>
+ <location line="-3456"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation type="unfinished">СеквенÑер Rosgarden запуÑтить не удалоÑÑŒ, поÑтому воÑпроизведение
@@ -21221,7 +21122,7 @@ Please exit and restart Rosegarden to restore sound capability.</source>
наÑтройке звука и MIDI обратитеÑÑŒ на www.rosegardenmusic.com.</translation>
</message>
<message>
- <location line="-2122"/>
+ <location line="-2116"/>
<source><qt><p>In order to create anacrusis, at least one of the segments in your selection must start at the beginning of the composition.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -21246,7 +21147,7 @@ Please exit and restart Rosegarden to restore sound capability.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2061"/>
+ <location line="+2055"/>
<source>The Rosegarden sequencer could not be started, so sound and recording will be unavailable for this session.
For assistance with correct audio and MIDI configuration, go to http://rosegardenmusic.com.</source>
<translation type="unfinished">СеквенÑер Rosgarden запуÑтить не удалоÑÑŒ, поÑтому воÑпроизведение
@@ -21261,7 +21162,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21269,7 +21170,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation>ÐкÑпортировать как...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Ðе удалоÑÑŒ Ñохранить файл Rosegarden в архив: %1</translation>
</message>
@@ -21285,7 +21186,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation>Стандартные файлы MIDI</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21352,9 +21253,9 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation>ВыполнÑетÑÑ ÑкÑпорт в партитуру MusicXML...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>Файлы XML</translation>
</message>
@@ -21457,7 +21358,7 @@ Would you like to set it now?</source>
<translation>Введите метку</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>СпиÑок воÑпроизведениÑ</translation>
</message>
@@ -21472,8 +21373,8 @@ Would you like to set it now?</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="-6820"/>
- <location line="+312"/>
+ <location line="-6809"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21497,8 +21398,8 @@ Would you like to set it now?</source>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21508,7 +21409,7 @@ Would you like to set it now?</source>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21526,8 +21427,8 @@ Would you like to set it now?</source>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21536,12 +21437,12 @@ Would you like to set it now?</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-7975"/>
+ <location line="-7925"/>
<source>Starting sequencer...</source>
<translation>ЗапуÑкаетÑÑ ÑеквенÑер...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation type="unfinished"></translation>
@@ -21552,7 +21453,7 @@ Would you like to set it now?</source>
<translation> как шаблон </translation>
</message>
<message>
- <location line="+5909"/>
+ <location line="+5855"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation type="unfinished">Ð’ очередь на передачу ÑтавÑÑ‚ÑÑ ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ MIDI panic...</translation>
</message>
@@ -21605,7 +21506,7 @@ Error was : %2</source>
<translation><p>Ð’Ñ‹ иÑпользуете верÑию %1. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð´Ð¾Ñтупна более Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ %2.</p><p>ПодробноÑти можно узнать на Ñайте <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Rosegarden</a>.</p></translation>
</message>
<message>
- <location line="-3157"/>
+ <location line="-3114"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -21618,7 +21519,7 @@ Error was : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Укажите новое значение</translation>
</message>
@@ -21670,7 +21571,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Изменить цвет Ñегмента...</translation>
</message>
@@ -21713,7 +21614,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Удалите Ñегмент щелчком по нему</translation>
</message>
@@ -21746,7 +21647,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">О&бъединить</translation>
</message>
@@ -21754,7 +21655,7 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>Переименовать &метку...</translation>
</message>
@@ -21791,22 +21692,22 @@ Error was : %2</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation type="unfinished">ПеремеÑтить Ñегмент</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation type="unfinished">ПеремеÑтить Ñегменты</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished">Ðажмите Shift, чтобы отключить прилипание к тактовой Ñетке</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation type="unfinished">ПеремеÑтите Ñегмент нажатием и перетаÑкиванием</translation>
</message>
@@ -22001,12 +21902,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation type="unfinished">С Shift прилипание к линиÑм такта отключаетÑÑ</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation type="unfinished">ЗапиÑать либо MIDI, либо звук</translation>
</message>
@@ -22082,7 +21983,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Предупреждение</translation>
</message>
@@ -22106,17 +22007,17 @@ Would you like to set it now?</source>
<translation>СоздаётÑÑ Ð¿Ñ€Ð¾Ñмотр волновой формы...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Изменить размер Ñегмента</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Ðажмите Shift, чтобы отключить прилипание к тактовой Ñетке</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation type="unfinished"></translation>
</message>
@@ -22126,7 +22027,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation type="unfinished"></translation>
</message>
@@ -22139,26 +22040,17 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Выделите Ñегменты щелчком и перетаÑкиванием</translation>
</message>
- <message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>ПеремеÑтить Ñегмент</numerusform>
- <numerusform>ПеремеÑтить Ñегменты</numerusform>
- <numerusform>ПеремеÑтить Ñегменты</numerusform>
- </translation>
- </message>
<message>
- <location line="+154"/>
+ <location line="+348"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished">Ðажмите Shift, чтобы отключить прилипание к тактовой Ñетке</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation type="unfinished"></translation>
</message>
@@ -22187,8 +22079,17 @@ Would you like to set it now?</source>
<source>Click and drag to copy segments</source>
<translation type="unfinished">Скопируйте Ñегмент щелчком и перетаÑкиванием</translation>
</message>
+ <message numerus="yes">
+ <location line="-287"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <location line="+6"/>
+ <location line="+293"/>
<source>Click and drag to copy segment</source>
<translation type="unfinished">Скопируйте Ñегмент щелчком и перетаÑкиванием</translation>
</message>
@@ -22258,24 +22159,12 @@ Would you like to set it now?</source>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Разделить Ñегмент надвое</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation type="unfinished">Разделите Ñегмент на две чаÑти щелчком по нему, Ñ Shift прилипание к тактовой Ñетке отключаетÑÑ</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation type="unfinished">Разделите Ñегмент на две чаÑти щелчком по нему</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23993,7 +23882,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><нет инÑтрумента></translation>
</message>
@@ -24008,19 +23897,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation><без имени></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Предупреждение</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Каталог Ñо звуковыми файлами не ÑущеÑтвует или закрыт Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи.
- Укажите правильный каталог в ÑвойÑтвах документа перед началом запиÑи.
-Хотите Ñделать Ñто прÑмо ÑейчаÑ?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Приглушить дорожку</translation>
</message>
@@ -24033,25 +23910,17 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Превратить повторение Ñегмента в его наÑтоÑщие копии</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Превратить повторение Ñегментов в их наÑтоÑщие копии</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -24060,7 +23929,7 @@ Would you like to set it now?</source>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -24069,7 +23938,7 @@ Would you like to set it now?</source>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24115,7 +23984,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Дорожка</translation>
</message>
@@ -24126,12 +23995,12 @@ Would you like to set it now?</source>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><без имени></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Параметры воÑпроизведениÑ</translation>
</message>
@@ -24272,7 +24141,103 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+2"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Ñкрипичный</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">баÑовый</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">помпейÑÐºÐ°Ñ Ñ‚Ð°Ñ€ÐµÐ»ÐºÐ°</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">кÑилофон</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">гитара</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">контрабаÑ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">челеÑта</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">ÑÑ‚Ð°Ñ€Ð°Ñ Ñ‡ÐµÐ»ÐµÑта</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">французÑкий Ñкрипичный</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">Ñопрановый</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">меццо-Ñопрановый</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">альтовый</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">теноровый</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">баритональный</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">баÑовый</translation>
+ </message>
+ <message>
+ <location line="+39"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -24297,87 +24262,67 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>treble</source>
- <translation>Ñкрипичный</translation>
+ <translation type="obsolete">Ñкрипичный</translation>
</message>
<message>
- <location line="+1"/>
<source>bass</source>
- <translation>баÑовый</translation>
+ <translation type="obsolete">баÑовый</translation>
</message>
<message>
- <location line="+1"/>
<source>crotales</source>
- <translation type="unfinished">помпейÑÐºÐ°Ñ Ñ‚Ð°Ñ€ÐµÐ»ÐºÐ°</translation>
+ <translation type="obsolete">помпейÑÐºÐ°Ñ Ñ‚Ð°Ñ€ÐµÐ»ÐºÐ°</translation>
</message>
<message>
- <location line="+1"/>
<source>xylophone</source>
- <translation>кÑилофон</translation>
+ <translation type="obsolete">кÑилофон</translation>
</message>
<message>
- <location line="+1"/>
<source>guitar</source>
- <translation>гитара</translation>
+ <translation type="obsolete">гитара</translation>
</message>
<message>
- <location line="+1"/>
<source>contrabass</source>
- <translation>контрабаÑ</translation>
+ <translation type="obsolete">контрабаÑ</translation>
</message>
<message>
- <location line="+1"/>
<source>celesta</source>
- <translation>челеÑта</translation>
+ <translation type="obsolete">челеÑта</translation>
</message>
<message>
- <location line="+1"/>
<source>old celesta</source>
- <translation>ÑÑ‚Ð°Ñ€Ð°Ñ Ñ‡ÐµÐ»ÐµÑта</translation>
+ <translation type="obsolete">ÑÑ‚Ð°Ñ€Ð°Ñ Ñ‡ÐµÐ»ÐµÑта</translation>
</message>
<message>
- <location line="+1"/>
<source>french</source>
- <translation>французÑкий Ñкрипичный</translation>
+ <translation type="obsolete">французÑкий Ñкрипичный</translation>
</message>
<message>
- <location line="+1"/>
<source>soprano</source>
- <translation>Ñопрановый</translation>
+ <translation type="obsolete">Ñопрановый</translation>
</message>
<message>
- <location line="+1"/>
<source>mezzosoprano</source>
- <translation>меццо-Ñопрановый</translation>
+ <translation type="obsolete">меццо-Ñопрановый</translation>
</message>
<message>
- <location line="+1"/>
<source>alto</source>
- <translation>альтовый</translation>
+ <translation type="obsolete">альтовый</translation>
</message>
<message>
- <location line="+1"/>
<source>tenor</source>
- <translation>теноровый</translation>
+ <translation type="obsolete">теноровый</translation>
</message>
<message>
- <location line="+1"/>
<source>baritone</source>
- <translation>баритональный</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>varbaritone</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">баритональный</translation>
</message>
<message>
- <location line="+1"/>
<source>subbass</source>
- <translation>баÑовый</translation>
+ <translation type="obsolete">баÑовый</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+36"/>
<source>Transpose</source>
<translation>ТранÑпозициÑ</translation>
</message>
@@ -24418,7 +24363,7 @@ Would you like to set it now?</source>
<translation><qt><p>Ðовые Ñегменты будут Ñозданы Ñ Ñтим цветом</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Звук</translation>
@@ -24491,7 +24436,7 @@ Would you like to set it now?</source>
<translation>Сегмент</translation>
</message>
<message>
- <location line="-994"/>
+ <location line="-1002"/>
<source><qt><p>Choose normal, \small or \tiny font size for notation elements on this (normal-sized) staff when exporting to LilyPond.</p><p>This is as close as we get to enabling you to print parts in cue size</p></qt></source>
<translation type="unfinished"></translation>
</message>
diff --git a/data/locale/sv.ts b/data/locale/sv.ts
index 2ed2d87..ba2289c 100644
--- a/data/locale/sv.ts
+++ b/data/locale/sv.ts
@@ -48,10 +48,6 @@
<translation>Standarduppspelningsenhet</translation>
</message>
<message>
- <source><qt><p>Create new playback devices here. Click the device name to change it. Select a device here and connect it to a MIDI output port by clicking on a port to the right.</p></qt></source>
- <translation type="obsolete"><qt><p>Skapa nya uppspelningsenheter här. Klicka på enhetsnamnet för att ändra det. Välj en enhet här och anslut den till en MIDI-utgång genom att klicka på en port till höger.</p></qt></translation>
- </message>
- <message>
<location line="+44"/>
<location filename="../../src/gui/studio/DeviceManagerDialogUi.h" line="+7"/>
<source><qt><p>Bank definitions allow you to tell Rosegarden about the programs or patches available for use on the equipment (hardware or software synth) connected to this device.</p><p>You must have something defined for any program or bank changes you wish to transmit, as Rosegarden hides all bank and program numbers that are undefined.</p></qt></source>
@@ -335,23 +331,23 @@
<translation>Kan inte öppna teckensnittskartfilen %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>&Arkiv</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>&Lägg till ljudfil...</translation>
</message>
@@ -361,54 +357,54 @@
<translation>&Exportera ljudfil...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>Stä&ng</translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>&Redigera</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>&Stäng ljudfil</translation>
</message>
@@ -433,350 +429,346 @@
<translation>Spela förhandsgranskning</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>&Hjälp</translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation>F1</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">Rosegarden &handledning</translation>
- </message>
- <message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>Riktlinjer för &felrapportering</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>Om &Rosegarden</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>Redigeringsverktygslist</translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>Ingenting att å&ngra</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>Ingenting att &göra om</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>K&opiera</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>K&listra in</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>Byt till markeringsverktyg</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>Byt till att infoga noter</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>Byt till raderingsverktyg</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>&Spara</translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation>&Infoga händelse</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation>Ta &bort händelse</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation>Delete</translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation>&Redigera händelse</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation>&Avancerad händelseeditor</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>Klipp u&t</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation>Markera &alla</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>&Rensa markering</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>&Filtrera</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation>Ställ in starttid för se&gment...</translation>
</message>
@@ -786,82 +778,82 @@
<translation>Ställ in seg&mentlängd...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>&Visa</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>&Metronomtider</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>&Klocktider</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>&Obehandlade tider</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>Seg&ment</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>Redigera &med</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>Öppna i &matriseditor</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>Öppna i ¬editor</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>Om &Qt</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>Lägg till &Segno</translation>
</message>
@@ -891,7 +883,7 @@
<translation>Punkterad ha&lvnot</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>B&yt till noter</translation>
</message>
@@ -911,12 +903,12 @@
<translation>Dölj &punkt</translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>Visa &symbolverktygslist</translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>Längdverktygslist</translation>
</message>
@@ -926,41 +918,41 @@
<translation>Symbolverktygslist</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+2059"/>
+ <location line="-2438"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>Return</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="-353"/>
+ <location line="+29"/>
<source>Ctrl+Shift+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+T</translation>
@@ -972,11 +964,6 @@
<translation>Ctrl+D</translation>
</message>
<message>
- <source>Enter, Media Play, Ctrl+Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Enter, Media Play, Ctrl+Return</translation>
- </message>
- <message>
<location line="+132"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
@@ -1024,7 +1011,7 @@
<translation>End</translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>Visa verk&tygslist</translation>
</message>
@@ -1034,7 +1021,7 @@
<translation>Dölj st&atusrad</translation>
</message>
<message>
- <location line="-4651"/>
+ <location line="+1686"/>
<source>Insert into Selected Audio Track</source>
<translation>Infoga i markerat ljudspår</translation>
</message>
@@ -1049,39 +1036,39 @@
<translation>Hjälp</translation>
</message>
<message>
- <location line="+256"/>
+ <location line="-1677"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>Åtgärdsverktygslist</translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>Tidsverktygslist</translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>Spelarverktygslist</translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>Zoomverktygslist</translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1131,7 +1118,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>Infoga markering</translation>
</message>
@@ -1151,125 +1138,117 @@
<translation>Redigera markering</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation>F2</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>Byt till förflyttningsverktyg</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation>F5</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>Byt till ritverktyg</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation>F3</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>Byt till storleksändringsverktyg</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation>F4</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">Ingenting att å&ngra</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">Ingenting att &göra om</translation>
- </message>
- <message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>Ta &bort</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Delete, Ctrl+D</translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation>&Rutnät</translation>
</message>
@@ -1285,13 +1264,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation>0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation>Lås till &fyrtioåttondel</translation>
</message>
@@ -1302,13 +1281,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation>Lås till t&jugofjärdedel</translation>
</message>
@@ -1319,13 +1298,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation>LÃ¥s till t&olftedel</translation>
</message>
@@ -1336,13 +1315,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation>8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation>LÃ¥s till t&resextondel</translation>
</message>
@@ -1353,13 +1332,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation>Lås till treåttondedel</translation>
</message>
@@ -1370,37 +1349,37 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation>LÃ¥s till &taktslag</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation>LÃ¥s t&ill takt</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2213"/>
+ <location line="-3409"/>
<source>Show A&ctions Toolbar</source>
<translation>Visa åt&gärdsverktygslist</translation>
</message>
@@ -1411,149 +1390,149 @@
</message>
<message>
<location line="+7"/>
- <location line="+1302"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>Lägg till &styrlinjal</translation>
</message>
<message>
- <location line="-1284"/>
- <location line="+1550"/>
+ <location line="-2479"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1548"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2744"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>&Komposition</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>Lägg till te&mpobyte...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>Lägg till ta&ktartsändring...</translation>
</message>
<message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>Öppna i &editor av händelselista</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation>=</translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation>+</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation>-</translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Left</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Right</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Up</translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Down</translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation>Up</translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation>Down</translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Up</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Down</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Alt+I</translation>
@@ -1566,703 +1545,703 @@
</message>
<message>
<location line="+5"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1724"/>
+ <location line="-2917"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Left</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Right</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>Markör bakåt &takt och markera</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Left</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>Markör fram&åt och markera</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Right</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+;</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgUp</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgDown</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation>Left</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation>Right</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Left</translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Right</translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation>Pause</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation>F7</translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>C</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>Ciss</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>Dess</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>D</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation>S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>Diss</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>Ess</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>E</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>F</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>Fiss</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>Gess</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>G</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>Giss</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>Ass</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>A</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>Aiss</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>B</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>H</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation>L</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+E</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation>R</translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Shift+R</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation>U</translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+I</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+I</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation>O</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation>Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+X</translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation>X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Shift+X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation>V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Shift+V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation>N</translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+M</translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation>M</translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation>H</translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1713"/>
+ <location line="-2548"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -2287,23 +2266,23 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+43"/>
- <location line="+2001"/>
+ <location line="-228"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2588"/>
+ <location line="+43"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Shift+X</translation>
@@ -2345,18 +2324,19 @@
<translation>Dumpa taktdataavbildning (felsökning)</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
- <source>Open in &Pitch Tracker</source>
- <translation>Öppna i ton&höjdsföljare</translation>
+ <location line="+4"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Add Clef Change in this link only...</source>
- <translation type="obsolete">Lägg till klavändring enbart för den här länken...</translation>
+ <location line="-1269"/>
+ <location line="+623"/>
+ <location line="+652"/>
+ <source>Open in &Pitch Tracker</source>
+ <translation>Öppna i ton&höjdsföljare</translation>
</message>
<message>
- <location line="-2452"/>
+ <location line="+10"/>
<source>Add &Layer</source>
<translation>Lägg till &lager</translation>
</message>
@@ -2575,14 +2555,14 @@
<translation>Ctrl+U</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+R</translation>
@@ -2600,8 +2580,8 @@
<translation>Ctrl+)</translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation>~</translation>
@@ -2619,27 +2599,27 @@
<translation>></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>&Justera</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>&Kvantisera</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>&Kvantisera...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>Upp&repa senaste kvantisering</translation>
</message>
@@ -2650,36 +2630,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>&Lägg ihop noter med samma tonhöjd</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>Knuffa åt &vänster</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>Knuffa åt &höger</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>&Öka ljudstyrka</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>&Reducera ljudstyrka</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation>Ställ in till &nuvarande ljudstyrka</translation>
</message>
@@ -2695,315 +2675,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>&Halvera notvärden</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>&Dubblera notvärden</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>Sträck eller tr&yck ihop...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>&Transponera</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>&Upp ett halvtonsteg</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>&Ner ett halvtonsteg</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>Upp en &oktav</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>Ner en okta&v</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>Transponera med &halvtonsteg...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>Transponera med &intervall...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>K&onvertera</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>&Invertera</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>&Retrograd</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>Re&trograd inversion</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>Utlösande se&gment...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>Verk&tyg</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>&Markera och redigera</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>&Rita</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>Rad&era</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>&Flytta</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>Ändra &storlek</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>&Dela</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>L&judstyrka</translation>
</message>
<message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation>Markör bakåt och mar&kera</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>Markör framåt och &markera</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>Ställ in upprepning &till markering</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>R&ensa upprepning</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>Spel&kontroller</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>S&pela</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>&Stoppa</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>Spola &tillbaka</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>Spola f&ram</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>Spola tillbaka till bör&jan</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>Spola fram till s&lutet</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>S&olo</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>&Rulla för att följa uppspelning</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>&Panik</translation>
</message>
<message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>&Övre oktav</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>Infogningsläge för &ackord</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>&Stegvis inspelning</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>&Verktygslister</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>&Linjaler</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>Visa &ackordnamnslinjal</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>Visa &tempolinjal</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>Redigeringsverktygslist</translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>Spela &in</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>In&ställningar</translation>
</message>
@@ -3088,7 +3068,7 @@
<translation>Visa &otilldelade toningsreglage</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>Byt till infogningsverktyg</translation>
</message>
@@ -3098,17 +3078,13 @@
<translation>Lägg ihop pauser efter radering</translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>Skriv &ut...</translation>
</message>
<message>
- <source>P&rint preview...</source>
- <translation type="obsolete">&Förhandsgranska utskrift...</translation>
- </message>
- <message>
- <location line="-1934"/>
+ <location line="+56"/>
<source>C&ut and Close</source>
<translation>Klipp &ut och dra tillbaka</translation>
</message>
@@ -3198,26 +3174,26 @@
<translation>Visa spår&namn</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>Öppna i slagverksmatrise&ditor</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>Lägg till &klavbyte...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>Lägg till &tonartsbyte...</translation>
</message>
<message>
- <location line="-1493"/>
+ <location line="-2689"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -3227,7 +3203,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1483"/>
+ <location line="+2679"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -3242,13 +3218,13 @@
<translation>Lägg till pedals&läpp</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>K&onvertera notskrift för...</translation>
</message>
<message>
- <location line="-2184"/>
+ <location line="-74"/>
<source>Search and Selec&t</source>
<translation type="unfinished"></translation>
</message>
@@ -3258,7 +3234,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+42"/>
<source>Unadopt an Adopted Segment</source>
<translation type="unfinished"></translation>
</message>
@@ -3580,8 +3556,8 @@
<translation>Åte&rställ skaft</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>&Fras</translation>
</message>
@@ -3651,14 +3627,14 @@
<translation>Legatobåge &nedanför</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>B&indebåge</translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>Ta bo&rt bindebåge</translation>
</message>
@@ -3738,14 +3714,14 @@
<translation>&Normalisera pauser</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+N</translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation>Lägg ihop pau&ser</translation>
</message>
@@ -3755,8 +3731,8 @@
<translation>&Noter</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+=</translation>
@@ -3842,13 +3818,13 @@
<translation>Fin t&idsjustering</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation>Knuffa åt &höger</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>S&ynlighet</translation>
</message>
@@ -3905,26 +3881,26 @@
<translation>Nästa notsystem &neråt</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>Före&gående segment</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>&Nästa segment</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>Stega &bakåt</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>Stega &framåt</translation>
</message>
@@ -4069,14 +4045,14 @@
<translation>&Gitarrackord</translation>
</message>
<message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>&Infoga not</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>&Undre oktav</translation>
</message>
@@ -4096,13 +4072,13 @@
<translation>Infogningsläge för &prydnadsnoter</translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>Visa verktygslist med &verktyg</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>Visa verktygslist med tillfälliga &förtecken</translation>
</message>
@@ -4122,18 +4098,18 @@
<translation>Visa &gruppverktygslist</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>Visa verktygslist med s&pelkontroller</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>Visa &utläggningsverktygslist</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+O</translation>
@@ -4146,13 +4122,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Ins</translation>
@@ -4163,7 +4139,7 @@
<translation>Visa &ackordnamnslinjal</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation>Visa linjal med &obehandlade noter</translation>
</message>
@@ -4178,7 +4154,7 @@
<translation>Visa Lily&pond-direktiv</translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>Klavverktygslist</translation>
</message>
@@ -4198,7 +4174,7 @@
<translation>Verktygslist med föredragsbeteckningar och ornament</translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation>Markera &alla händelser</translation>
</message>
@@ -4219,54 +4195,54 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>Rosegarden hand&bok</translation>
</message>
<message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>Inställningar...</translation>
</message>
<message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>&Visa ljudstyrkelinjal</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>Visa ton&höjdsavvikelselinjal</translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation>Markör bakåt och mar&kera</translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>Linjalverktygslist</translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>In&ställningar...</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation>Visa lin&jalverktygslist</translation>
</message>
<message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>Stega bakåt (vänster)</translation>
</message>
@@ -4276,29 +4252,29 @@
<translation>Spela</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>Stega framåt (höger)</translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation>Åt&gärd</translation>
</message>
<message>
- <location line="+814"/>
- <location line="+1724"/>
+ <location line="-1209"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>Infoga tonhöjdsav&vikelse för sekvens...</translation>
</message>
<message>
- <location line="-627"/>
+ <location line="-628"/>
<source>Show La&yer Toolbar</source>
<translation>Visa &lagerverktygslist</translation>
</message>
<message>
- <location line="+335"/>
+ <location line="+336"/>
<source>Cycle &Dots</source>
<translation>Vä&xla punkter</translation>
</message>
@@ -4452,21 +4428,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation>P</translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation>Infogningsläge för annan&delning</translation>
</message>
@@ -4637,7 +4613,7 @@
<translation>Lagerverktygslist</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>Byt till infogningsverktyg</translation>
</message>
@@ -4692,7 +4668,7 @@
<translation>Gör synlig</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>Lägg automatiskt till balkar om lämpligt</translation>
</message>
@@ -4732,7 +4708,7 @@
<translation>Dubbel-b-förtecken</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>N&ytt</translation>
</message>
@@ -4742,23 +4718,11 @@
<translation>&Importera</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">Importera Rosegarden-&projektfil...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">Importera &MIDI-fil...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>Importera &Hydrogen-fil...</translation>
</message>
<message>
- <source>Import MusicXM&L file...</source>
- <translation type="obsolete">Importera MusicXM&L-fil...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Merge</source>
<translation>Samman&foga</translation>
@@ -4769,44 +4733,16 @@
<translation>Sammanfoga &fil...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">Sammanfoga &MIDI-fil...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>Sammanfoga &Hydrogen-fil...</translation>
</message>
<message>
- <source>Merge MusicXM&L file...</source>
- <translation type="obsolete">Sammanfoga MusicXM&L-fil...</translation>
- </message>
- <message>
<location line="+2"/>
<source>&Export</source>
<translation>E&xportera</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">Exportera Rosegarden-&projektfil...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">Exportera &MIDI-fil...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">Exportera &Csound-partiturfil...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">Exportera M&up-fil...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">Exportera Music&XML-fil...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>Ö&ppna...</translation>
@@ -4817,10 +4753,6 @@
<translation>Öppna s&enaste</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">Spara s&om...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>Spara som &mall...</translation>
@@ -4831,10 +4763,6 @@
<translation>Å&terställ</translation>
</message>
<message>
- <source>Prin&t preview...</source>
- <translation type="obsolete">Förhands&granska utskrift...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Manage A&udio Files</source>
<translation>Hantera l&judfiler</translation>
@@ -4916,10 +4844,6 @@
<translation>Ställ in tempon från takt&segment</translation>
</message>
<message>
- <source>Fit existing beats to beat segment</source>
- <translation type="obsolete">Passa in befintliga takter i taktsegment</translation>
- </message>
- <message>
<location line="+2"/>
<source>Change &Composition Start and End...</source>
<translation>Ändra kompositionens &början och slut...</translation>
@@ -4940,13 +4864,13 @@
<translation>Placera snabbmarkering vid &uppspelningsposition</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>&GÃ¥ till snabbmarkering</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation>St&udio</translation>
</message>
@@ -5006,42 +4930,38 @@
<translation>Ändra upprepning</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">Öppna i &standardeditor</translation>
- </message>
- <message>
- <location line="+64"/>
- <location line="+452"/>
+ <location line="-478"/>
+ <location line="+542"/>
<source>R&elabel...</source>
<translation>Ändra &namn...</translation>
</message>
<message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>Upp&repa senaste kvantisering</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>Sträck eller tr&yck ihop...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>Ställ in start&tid...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>Ställ in n&otvärde...</translation>
</message>
<message>
- <location line="-354"/>
+ <location line="-980"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -5116,24 +5036,24 @@
<translation type="unfinished">Passa in befintliga takter i taktsegment</translation>
</message>
<message>
- <location line="+53"/>
- <location line="+371"/>
+ <location line="-570"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-295"/>
+ <location line="+76"/>
<source>Create &Anacrusis...</source>
<translation>Skapa uppt&akt...</translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>Sammanfoga</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>&Dela</translation>
</message>
@@ -5253,13 +5173,13 @@
<translation>Ändra instrumentav&bildningar...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>Ändra &storlek</translation>
</message>
<message>
- <location line="-279"/>
+ <location line="+26"/>
<source>Ctrl+Enter, Enter, Media Play, Ctrl+Return</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
@@ -5270,15 +5190,15 @@
<translation>Pu&nch-in-inspelning</translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>Visa &huvudverktygslist</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>Visa &spårverktygslist</translation>
</message>
@@ -5293,27 +5213,19 @@
<translation>Visa &zoomverktygslist</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>Visa &statusrad</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>Visa &uppspelningslinjal</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">Importera &X11 Rosegarden-fil...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">Sammanfoga &X11 Rosegarden-fil...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>MIDI-mi&xer</translation>
@@ -5324,10 +5236,6 @@
<translation>Visa &tempolinjal</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">Exportera &Lilypond-fil...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>Visa spelkon&trollfönster</translation>
@@ -5374,26 +5282,26 @@
<translation>Editorverktygslist</translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>Spola tillbaka till början</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>Spola fram till slutet</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>&Stöd Rosegarden</translation>
</message>
<message>
- <location line="+221"/>
+ <location line="-1791"/>
<source>Insert Tempo Change</source>
<translation>Infoga tempobyte</translation>
</message>
@@ -5433,7 +5341,7 @@
<translation>Öppna tempo- och taktartsverktyget</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>&Redigera objekt</translation>
</message>
@@ -5453,7 +5361,7 @@
<translation>In&ställningar</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>Kli&stra in som nytt utlösande segment</translation>
</message>
@@ -8437,16 +8345,16 @@
<translation><inget></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>Syntinsticksmodul</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>Ljud</translation>
@@ -10542,10 +10450,6 @@
<translation>allmän avbildning</translation>
</message>
<message>
- <source>Blue pastel</source>
- <translation type="obsolete">Pastellblå</translation>
- </message>
- <message>
<location line="+2"/>
<source>Red pastel</source>
<translation>Pastellröd</translation>
@@ -10591,20 +10495,15 @@
<translation>Okänd</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10619,10 +10518,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 effekt %2 %3</translation>
</message>
@@ -10637,7 +10536,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>Välkommen!</translation>
</message>
@@ -10745,7 +10644,7 @@
<translation><qt><p>Inga spår är förberedda för inspelning.</p><p>Markera minst en av lysdioderna för inspelning <img src=":pixmaps/tooltip/record-leds.png"> och försök igen</p></qt></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>Kunde inte starta inspelning av ljud.</p><p>Ställ in en giltig sökväg för inspelningar med <b>Komposition -> Redgera dokumentegenskaper... -> Ljud</b></p></qt></translation>
</message>
@@ -10757,40 +10656,52 @@
<translation type="unfinished">Felaktig ljudfil </translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>Felaktig längd för lång heltalsdata i MIDI-ström</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>Felaktig längd för heltalsdata i MIDI-ström</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>Slutet av MIDI-filen påträffades under läsning</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation>Försök att hämta fler byte än förväntat för spår</translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation>Försök att läsa förbi MIDI-filens slut</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>Ogilting händelsekod hittades</translation>
+ <translation type="obsolete">Ogilting händelsekod hittades</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation>Första händelsen i spåret har körstatus</translation>
</message>
@@ -10897,12 +10808,12 @@
<translation>Syntinsticksmodul </translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2935"/>
+ <location filename="../QMenuStrings.cpp" line="+35"/>
<source>P&rint Preview...</source>
<translation>Fö&rhandsgranska utskrift...</translation>
</message>
<message>
- <location line="+1990"/>
+ <location line="-752"/>
<source>Prin&t Preview...</source>
<translation>Förhandsgranska u&tskrift...</translation>
</message>
@@ -10911,7 +10822,7 @@
<translation></translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation>Den här händelsen är kopplad till en annan händelse.</translation>
</message>
@@ -10990,6 +10901,58 @@
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Lilypond tillåter inte mellanslag eller snedstreck i filnamn.
+
+Vill du använda
+
+ %1
+
+ istället?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">Export misslyckades. Filen kunde inte öppnas för skrivning.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">varning: alltför lång takt avkortad här</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">varning: för kort takt, fyller ut med pauser</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11005,20 +10968,8 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="unfinished"><p>Copyright 2000-2012 Rosegardens utvecklingsgrupp</p><p>Version: %1 Qt version: %2<br>Byggnyckel: %3</p><p>Rosegarden har tagits fram av en grupp frivilliga över hela världen. Besök <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> för att se en lista med bidragsgivare.<br>För ytterligare information om Rosegarden, besök <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licens: GNU General Public License Version 2 or later</p> {2000-2014 ?} {1 ?} {2<?} {3<?} {2 ?}</translation>
- </message>
- <message>
- <source><p>Copyright 2000-2012 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
- <translation type="obsolete"><p>Copyright 2000-2012 Rosegardens utvecklingsgrupp</p><p>Version: %1 Qt version: %2<br>Byggnyckel: %3</p><p>Rosegarden har tagits fram av en grupp frivilliga över hela världen. Besök <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> för att se en lista med bidragsgivare.<br>För ytterligare information om Rosegarden, besök <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licens: GNU General Public License Version 2 or later</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2011 Rosegardens utvecklingsgrupp</p><p>Version: %1 Qt version: %2<br>Byggnyckel: %3</p><p>Rosegarden har tagits fram av en grupp frivilliga över hela världen. Besök <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> för att se en lista med bidragsgivare.<br>För ytterligare information om Rosegarden, besök <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licens: GNU General Public License Version 2</p></translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>Copyright 2000-2010 Rosegardens utvecklingsgrupp</p><p>Version: %1 Qt version: %2<br>Byggnyckel: %3</p><p>Rosegarden har tagits fram av en grupp frivilliga över hela världen. Besök <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> för att se en lista med bidragsgivare.<br>För ytterligare information om Rosegarden, besök <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licens: GNU General Public License Version 2</p></translation>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <translation type="unfinished"><p>Copyright 2000-2012 Rosegardens utvecklingsgrupp</p><p>Version: %1 Qt version: %2<br>Byggnyckel: %3</p><p>Rosegarden har tagits fram av en grupp frivilliga över hela världen. Besök <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a> för att se en lista med bidragsgivare.<br>För ytterligare information om Rosegarden, besök <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>Licens: GNU General Public License Version 2 or later</p> {2000-2015 ?} {1 ?} {2<?} {3<?} {2 ?}</translation>
</message>
</context>
<context>
@@ -11079,12 +11030,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>Kan inte lägga till identiska överlappande indikeringar</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>&Lägg till legatobåge</translation>
</message>
@@ -11579,14 +11530,6 @@
<translation>Konverterar ljudfil...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">Samplar om ljudfil...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">Konverterar och samplar om ljudfil...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation>Importerar ljudfil...</translation>
@@ -11600,24 +11543,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>Klicka för att byta namn på instrumentet</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>Klicka på knappen ovanför för att byta namn på instrumentet</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><ingen synt></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><ingen modul></translation>
</message>
@@ -11670,10 +11613,6 @@
<translation>Fil</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><inga ljudfiler></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>Spara fil som</translation>
@@ -11799,10 +11738,6 @@ Välj de du vill ta bort permanent från hårddisken.
<translation>Skriv nytt namn</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">importerar ljudfil från annan dator</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>importerar en ljudfil som måste konverteras eller samplas om</translation>
@@ -11837,7 +11772,7 @@ Välj de du vill ta bort permanent från hårddisken.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>Ljudmixer</translation>
</message>
@@ -11853,20 +11788,20 @@ Välj de du vill ta bort permanent från hårddisken.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>Panorera</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>Ljudnivå</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>Mono eller stereo</translation>
</message>
@@ -11877,21 +11812,21 @@ Välj de du vill ta bort permanent från hårddisken.
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><ingen></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>Klicka för att läsa in en ljudmodul</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>Klicka för att byta namn på instrumentet</translation>
</message>
@@ -11911,7 +11846,7 @@ Välj de du vill ta bort permanent från hårddisken.
<translation>Klicka på knappen ovanför för att byta namn på instrumentet</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>Del %1</translation>
</message>
@@ -11927,14 +11862,14 @@ Välj de du vill ta bort permanent från hårddisken.
<translation>Huvudnivå</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><ingen modul></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</translation>
</message>
@@ -12493,7 +12428,7 @@ Välj de du vill ta bort permanent från hårddisken.
<translation><ny bank %1></translation>
</message>
<message>
- <location line="+508"/>
+ <location line="+514"/>
<source>Some internal error: no device selected</source>
<translation>Ett internt fel: ingen enhet vald</translation>
</message>
@@ -12509,7 +12444,7 @@ Välj de du vill ta bort permanent från hårddisken.
<translation>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</translation>
</message>
<message>
- <location line="-774"/>
+ <location line="-780"/>
<source><new bank></source>
<translation><ny bank></translation>
</message>
@@ -12529,7 +12464,7 @@ Välj de du vill ta bort permanent från hårddisken.
<translation>Ska banken verkligen tas bort?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>Ska tonartsändringen verkligen tas bort?</translation>
</message>
@@ -12697,6 +12632,120 @@ Välj de du vill ta bort permanent från hårddisken.
</message>
</context>
<context>
+ <name>Rosegarden::CheckForParallelsDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"> </translation>
+ </message>
+ <message>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::ChordNameRuler</name>
<message>
<location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
@@ -13020,7 +13069,7 @@ Välj de du vill ta bort permanent från hårddisken.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13245,7 +13294,7 @@ Välj de du vill ta bort permanent från hårddisken.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>Ljudstyrka</translation>
</message>
@@ -13261,7 +13310,7 @@ Välj de du vill ta bort permanent från hårddisken.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>Händelsetyp som inte stöds</translation>
</message>
@@ -13276,12 +13325,13 @@ Välj de du vill ta bort permanent från hårddisken.
<translation>Effekthändelser</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>Infoga effektrad</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>Nummer på effekthändelse</translation>
</message>
@@ -13289,7 +13339,7 @@ Välj de du vill ta bort permanent från hårddisken.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>K&opiera</translation>
</message>
@@ -13299,7 +13349,7 @@ Välj de du vill ta bort permanent från hårddisken.
<translation>(utdrag)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(kopierad)</translation>
</message>
@@ -13369,7 +13419,7 @@ Välj de du vill ta bort permanent från hårddisken.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>Klipp u&t</translation>
</message>
@@ -13409,10 +13459,6 @@ Välj de du vill ta bort permanent från hårddisken.
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">Återförena</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>Ta bort omfång</translation>
@@ -13437,12 +13483,12 @@ Välj de du vill ta bort permanent från hårddisken.
<context>
<name>Rosegarden::DeviceManagerDialog</name>
<message>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-385"/>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="-376"/>
<source>[ No port ]</source>
<translation>[ Ingen port ]</translation>
</message>
<message>
- <location line="+729"/>
+ <location line="+720"/>
<location line="+11"/>
<location line="+16"/>
<source>New Device</source>
@@ -14070,46 +14116,10 @@ Det kan orsaka problem om den senare överskrider ett annat beräknat värde.</t
<translation>Mönster</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">Jämn: Ställ in %1 till ett värde</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">Växlande: Ställ in %1 till maximum och minimum för varannan händelse</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">Crescendo: Ställ in %1 stigande från minimum till maximum</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">Diminuendo: Ställ in %1 fallande från maximum till minimum</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">Ringning: Ställ in %1 växlande från maximum till minimum med båda bortdöende till tystnad</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>Värde</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">Första värdet</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">Andra värdet</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">Lägsta värdet</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">Högsta värdet</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14504,22 +14514,6 @@ Vill du försöka söka efter filen eller hoppa över den?</translation>
<translation>Laddar ner %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">Misslyckades ansluta till FTP-server</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">Inloggning misslyckades</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">Misslyckades byta till rätt katalog</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">Nerladdning med FTP avbruten</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>Nerladdning avbruten</translation>
@@ -14847,10 +14841,6 @@ Vill du försöka söka efter filen eller hoppa över den?</translation>
<translation>Adobe Acrobat läsare (icke-fri)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation>Används för att förhandsgranska utdata skapad av Lilypond</translation>
@@ -14861,10 +14851,6 @@ Vill du försöka söka efter filen eller hoppa över den?</translation>
<translation>Utskriftsverktyg för filer på kommandoraden</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">Kprinter (KDE 3)</translation>
- </message>
- <message>
<location line="+5"/>
<source>Gtk-LP (GNOME)</source>
<translation>Gtk-LP (GNOME)</translation>
@@ -14922,13 +14908,6 @@ Vill du försöka söka efter filen eller hoppa över den?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Guitar::Fingering</name>
- <message>
- <source>couldn't parse fingering '%1' in '%2'</source>
- <translation type="obsolete">kunde inte tolka fingersättning '%1' i '%2'</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::GuitarChordEditorDialog</name>
<message>
<location filename="../../src/gui/editors/guitar/GuitarChordEditorDialog.cpp" line="+40"/>
@@ -15453,7 +15432,7 @@ Exempeltext från filen:</translation>
<translation>Instrumentparametrar</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>Spår</translation>
</message>
@@ -15461,7 +15440,7 @@ Exempeltext från filen:</translation>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation>ingen</translation>
</message>
@@ -15846,7 +15825,6 @@ Exempeltext från filen:</translation>
<context>
<name>Rosegarden::LilyPondExporter</name>
<message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -15854,7 +15832,7 @@ Would you like to use
%1
instead?</source>
- <translation>Lilypond tillåter inte mellanslag eller snedstreck i filnamn.
+ <translation type="obsolete">Lilypond tillåter inte mellanslag eller snedstreck i filnamn.
Vill du använda
@@ -15863,39 +15841,16 @@ Vill du använda
istället?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished">Export misslyckades. Filen kunde inte öppnas för skrivning.</translation>
- </message>
- <message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Export misslyckades. Filen kunde inte öppnas för skrivning.</translation>
</message>
<message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>varning: alltför lång takt avkortad här</translation>
+ <translation type="obsolete">varning: alltför lång takt avkortad här</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>varning: för kort takt, fyller ut med pauser</translation>
+ <translation type="obsolete">varning: för kort takt, fyller ut med pauser</translation>
</message>
</context>
<context>
@@ -15926,10 +15881,6 @@ Vill du använda
<translation><qt>Välj vilka spår eller segment att exportera</qt></translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">Valda spår</translation>
- </message>
- <message>
<location line="+16"/>
<source>Compatibility level</source>
<translation>Kompatibilitetsnivå</translation>
@@ -16411,10 +16362,6 @@ Vill du använda
<context>
<name>Rosegarden::LoopRuler</name>
<message>
- <source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Double-click to start playback.</p></qt></source>
- <translation type="obsolete"><qt><p>Klicka och dra för att flytta uppspelningsmarkören.</p><p>Skift-klicka och dra för att ange ett intervall för upprepning eller redigering.</p><p>Skift-klicka för att rensa upprepningen eller intervallet.</p><p>Dubbelklicka för att starta uppspelning.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/rulers/LoopRuler.cpp" line="+80"/>
<source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Ctrl-click and drag to move the playback pointer with snap to beat.</p><p>Double-click to start playback.</p></qt></source>
<translation><qt><p>Klicka och dra för att flytta uppspelningspekaren.</p><p>Skift-klicka och dra för att ange ett intervall att repetera eller redigera.</p><p>Skift-klicka för att ta bort repetition eller intervall.</p><p>Klicka och dra för att flytta uppspelningspekaren låst till takter.</p><p>Dubbelklicka för att starta uppspelning.</p></qt></translation>
@@ -16611,7 +16558,7 @@ fördröjning vid uppspelningens start, på grund av mängden data som skickas.<
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation><qt>Ställ in variationer av programmet ovan, om tillgängliga i studion</qt></translation>
</message>
@@ -16621,14 +16568,6 @@ fördröjning vid uppspelningens start, på grund av mängden data som skickas.<
<translation><qt>Ställ in MIDI-bank som program ska väljas från</qt></translation>
</message>
<message>
- <source>auto</source>
- <translation type="obsolete">automatiskt</translation>
- </message>
- <message>
- <source>fixed</source>
- <translation type="obsolete">låst</translation>
- </message>
- <message>
<location line="+26"/>
<source><qt>Set the MIDI program or "patch"</p></qt></source>
<translation><qt>Ställ in MIDI-program eller "patch"</p></qt></translation>
@@ -16704,12 +16643,7 @@ fördröjning vid uppspelningens start, på grund av mängden data som skickas.<
<translation>Ta emot extern</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>Ingen anslutning</translation>
</message>
@@ -16933,6 +16867,15 @@ fördröjning vid uppspelningens start, på grund av mängden data som skickas.<
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17138,12 +17081,12 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Håll ner Skift för att undvika rutnätet för taktslag</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>Kopiera och flytta händelse</translation>
</message>
@@ -17302,7 +17245,7 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<translation>Ändra ljudstyrkor</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>Klicka och dra för att ändra ljudstyrka för markerade noter</translation>
</message>
@@ -17315,12 +17258,12 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation>Okänd notinfogningsåtgärd %1</translation>
</message>
<message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation><namnlös></translation>
</message>
@@ -17383,7 +17326,7 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<translation>Av</translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:matrix-en</translation>
</message>
@@ -17399,8 +17342,7 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -17410,7 +17352,7 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<translation>Uppskattad tonartssignatur visas</translation>
</message>
<message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation>Uppskattad taktart visas</translation>
</message>
@@ -17425,10 +17367,6 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<translation>Enligt antal halvtonsteg:</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Ställ in händelseljudstyrkor</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation>Utlösande segment</translation>
@@ -17439,20 +17377,15 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<translation>Ta bort utlösare</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>Matris</translation>
</message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>Kan inte infoga not: Ingen rutnätslängd vald</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>Zooma</translation>
</message>
@@ -17472,7 +17405,7 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<translation>Återställ zoom</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Rotera hjulet för att byta aktivt segment</qt></translation>
</message>
@@ -17579,13 +17512,6 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">Tonartsändring</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="+53"/>
@@ -17602,7 +17528,7 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>MIDI-mixer</translation>
</message>
@@ -17617,7 +17543,7 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<translation>Instrument</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</translation>
</message>
@@ -17914,13 +17840,13 @@ Dubbel-klicka för att öppna markeringsredigeraren.</translation>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>Notskrift</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>Standardutläggning</translation>
</message>
@@ -18495,7 +18421,7 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> Teckensnitt: </translation>
</message>
@@ -18515,16 +18441,12 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
<translation> Avstånd: </translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-117"/>
<source> No selection </source>
<translation> Ingen markering </translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">Triol</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation>Ackord</translation>
</message>
@@ -18541,7 +18463,7 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
<translation>%1 %2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation>Okänd avståndsåtgärd %1</translation>
</message>
@@ -18566,21 +18488,17 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
<translation>Förhandsgranskningsalternativ för Lilypond</translation>
</message>
<message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">Export misslyckades. Filen kunde inte öppnas för skrivning.</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>Klippbordet är tomt</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>Kan inte klistra in flera segment i ett</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -18593,23 +18511,22 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+88"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>Skriver ut med Lilypond...</translation>
</message>
@@ -18624,29 +18541,29 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
<translation><qt><p>Misslyckades öppna en tillfällig fil för export till Lilypond.</p><p>Detta betyder troligen att diskutrymmet på <pre>%1</pre> har tagit slut</p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation><qt><p>Den begränsade typen av inklistring kräver tillräckligt med tomt utrymme (som bara innehåller pauser) på stället för inklistringen för att få plats med alla händelser som ska klistras in.</p><p>Tillräckligt utrymme fanns inte.</p><p>Om du vill klistra in ändå, fundera på att använda någon av de andra inklistringstyperna i alternativet <b>Klistra in...</b> på menyn Redigera. Du kan också ändra standardtypen för inklistring till något annat än begränsat om du önskar.</p></qt></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>Infogar klippbordets innehåll...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>Kunde inte klistra in på den här platsen.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation>Flytta händelser till systemet ovanför</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>Ökar ljudstyrkor...</translation>
</message>
@@ -18656,15 +18573,7 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
<translation>Minskar ljudstyrkor...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">Ställ in händelseljudstyrkor</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">Ställer in ljudstyrkor...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation>Redigera texthändelse</translation>
</message>
@@ -18679,7 +18588,7 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
<translation>Lägger ihop noter...</translation>
</message>
<message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation>Okänd notinfogningsåtgärd %1</translation>
</message>
@@ -18689,13 +18598,13 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
<translation>Infogar not</translation>
</message>
<message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation>Lägger till punkt...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation>Ornament spår %1 takt %2</translation>
</message>
@@ -18705,10 +18614,6 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
<translation>Ornament takt %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">Skapa ornament</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation>Använd ornament</translation>
@@ -18744,7 +18649,7 @@ Detta är ett programfel (tidigare skulle programmet redan ha kraschat)</transla
<translation>Förlängning</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation>Det finns igen förlängningseffekt definierad för enheten.
@@ -18756,7 +18661,7 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<translation>Uppskattad taktart visas</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - segment spår nummer %3 - notskrift</translation>
</message>
@@ -18789,7 +18694,7 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<translation>Med antal halvtonsteg: </translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>Tid: %1 (%2,%3 s)</translation>
</message>
@@ -18838,16 +18743,11 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<source>Cycling slashes...</source>
<translation>Växlar tvärbalkar...</translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>Kan inte infoga not: Inget notvärde valt</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>Zooma</translation>
</message>
@@ -18872,7 +18772,7 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<translation>Stäng spårnamn</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>Rotera hjulet för att byta aktivt segment</qt></translation>
@@ -19094,10 +18994,6 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">Tonhöjdsavvikelse för sekvens</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>Förinställning</translation>
@@ -19108,10 +19004,6 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<translation>Förinställning:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">Användare</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -19339,14 +19231,6 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<translation type="unfinished"></translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">Värde (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">Varaktighet (%):</translation>
- </message>
- <message>
<location line="-851"/>
<source>Ramp duration (%):</source>
<translation>Rampens varaktighet (%):</translation>
@@ -19367,31 +19251,11 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<translation>Slutvärde (%):</translation>
</message>
<message>
- <source>Vibrato start amplitude (%):</source>
- <translation type="obsolete">Startamplitud för vibrato (%):</translation>
- </message>
- <message>
- <source>Vibrato end amplitude (%):</source>
- <translation type="obsolete">Slutamplitud för vibrato (%):</translation>
- </message>
- <message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation>Avvikelseföljd</translation>
</message>
<message>
- <source>Vibrato wavelength:</source>
- <translation type="obsolete">Våglängd för vibrato:</translation>
- </message>
- <message>
- <source>Resolution:</source>
- <translation type="obsolete">Upplösning:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>Felaktig sluttid. Har du markerat några händelser?</translation>
@@ -19726,10 +19590,6 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
- <message>
- <source><qt><h3>Processing...</h3></qt></source>
- <translation type="obsolete"><qt><h3>Behandlar...</h3></qt></translation>
- </message>
</context>
<context>
<name>Rosegarden::ProjectPackager</name>
@@ -19922,13 +19782,6 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1 effekt</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
@@ -20016,12 +19869,12 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>Ingen</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>Duol</translation>
</message>
@@ -20086,7 +19939,7 @@ Försäkra dig om att enheten är riktigt inställd i dialogrutan Hantera MIDI-e
<translation>Dela och bind ackordnoter med för stora notvärden</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>Fullständig kvantisering</translation>
</message>
@@ -20387,10 +20240,6 @@ här versionen. Det kan finnas vissa problem med filformatet.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <source>Open Directory</source>
- <translation type="obsolete">Öppna katalog</translation>
- </message>
- <message>
<location line="+1335"/>
<source>Loading plugins...</source>
<translation>Läser in insticksmoduler...</translation>
@@ -20430,8 +20279,8 @@ här versionen. Det kan finnas vissa problem med filformatet.</translation>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -20443,7 +20292,7 @@ här versionen. Det kan finnas vissa problem med filformatet.</translation>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>Kunde inte spara dokument i %1</translation>
</message>
@@ -20521,7 +20370,12 @@ Välj alla du vill ta bort permanent från hårddisken.
<translation>Sammanfoga</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>Kunde inte skapa tillfällig fil i katalogen '%1': %2</translation>
</message>
@@ -20536,7 +20390,7 @@ Välj alla du vill ta bort permanent från hårddisken.
<translation>Misslyckades byta namn på tillfällig utdatafil '%1' till den önskade utdatafilen '%2'</translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation>Varning</translation>
</message>
@@ -20550,11 +20404,7 @@ Ställ in sökvägen till ljudfiler till en giltig katalog i dokumentegenskaper
Vill du ställa in den nu?</translation>
</message>
<message>
- <source>Saving file...</source>
- <translation type="obsolete">Sparar fil...</translation>
- </message>
- <message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation>Fel vid skrivning till '%1'</translation>
</message>
@@ -20614,10 +20464,6 @@ Du rekommenderas att spara filen med den här versionen av Rosegarden,
för att försäkra dig om att den kan läsas in igen i framtida versioner.</translation>
</message>
<message>
- <source><qt><h2>Channels were remapped</h2><p>Beginning with version 10.02, Rosegarden no longer provides controls for changing the channel associated with each MIDI instrument. Instead, each instrument uses the same channel as its instrument number. For example, "MIDI Input System Device #12" always uses channel 12.</p><p>The file you just loaded contained instruments whose channels differed from the instrument numbers. These channels have been reassigned so that instrument #1 will always use channel 1, regardless of what channel it might have used previously. In most cases, you will experience no difference, but you may have to make some small changes to this file in order for it to play as intended. We recommend that you save this file in order to avoid seeing this warning in the future.</p><p>We apologize for any inconvenience.</p></qt></source>
- <translation type="obsolete"><qt><h2>Kanalernas avbildning har ändrats</h2><p>Från och med version 10.02 tillhandahåller inte Rosegarden längre kontroller för att ändra kanalen som hör ihop med varje MIDI-instrument. Istället använder varje instrument samma kanal som sitt instrumentnummer. Exempelvis använder alltid "MIDI-systemingångsenhet 12" kanal 12.</p><p>Filen du just har läst in innehåller instrument vars kanaler skiljer sig från instrumentnumren. Tilldelningen av dessa kanaler har ändrats så att instrument 1 alltid använder kanal 1, oberoende av vilken kanal det tidigare kan ha använt. I de flesta fall kommer du inte att märka någon skillnad, men du kanske måste göra några små ändringar av filen för att den ska spelas upp som avsett. Vi rekommenderar att du sparar filen för att undvika den här varningen i fortsättningen.</p><p>Vi ber om ursäkt för alla eventuella olägenheter.</p></qt></translation>
- </message>
- <message>
<location line="+650"/>
<source>Insert Recorded MIDI</source>
<translation>Infoga inspelad MIDI</translation>
@@ -20637,7 +20483,7 @@ för att försäkra dig om att den kan läsas in igen i framtida versioner.</tra
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>Markering får bara innehålla segment med eller utan ljud</translation>
</message>
@@ -20648,7 +20494,7 @@ för att försäkra dig om att den kan läsas in igen i framtida versioner.</tra
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -20657,7 +20503,7 @@ för att försäkra dig om att den kan läsas in igen i framtida versioner.</tra
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -20678,7 +20524,7 @@ See Edit -> Preferences -> Audio.</source>
Se Redigera -> Inställningar -> Ljud.</translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation>Kan inte lägga till släppt fil. Ljudservern JACK är inte tillgänglig.</translation>
</message>
@@ -20688,10 +20534,6 @@ Se Redigera -> Inställningar -> Ljud.</translation>
<translation>Kan inte lägga till släppt fil. Den här versionen av Rosegarden byggdes inte med ljudstöd.</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">importerar ljudfil från annan dator</translation>
- </message>
- <message>
<location line="+28"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>Importerar en ljudfil som behöver konverteras ell omsamplas</translation>
@@ -20751,14 +20593,14 @@ Se Redigera -> Inställningar -> Ljud.</translation>
<translation>Startar...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> Zooma: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 %2</translation>
@@ -20787,12 +20629,12 @@ Vill du öppna den istället?</translation>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>Namnlös</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -20832,12 +20674,12 @@ Felet är: %2</translation>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>Alla filer som stöds</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -20857,33 +20699,33 @@ Felet är: %2</translation>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>Alla filer</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>Öppna fil</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -20893,16 +20735,16 @@ Felet är: %2</translation>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>Kan inte öppna filen %1</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>Sparar fil...</translation>
</message>
@@ -21004,12 +20846,12 @@ Felet är: %2</translation>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>Varning</translation>
</message>
<message>
- <location line="-2838"/>
+ <location line="-2827"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -21065,12 +20907,12 @@ Vill du ange den nu?</translation>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>Ställ in övergripande tempo</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>Växla verktygslist...</translation>
</message>
@@ -21138,23 +20980,23 @@ Segment -> Sammanfoga segment.
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Rosegarden projektfiler</translation>
</message>
<message>
- <location line="+1713"/>
+ <location line="+1708"/>
<source>Input</source>
<translation>Indata</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-en</translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21178,8 +21020,8 @@ Segment -> Sammanfoga segment.
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21189,7 +21031,7 @@ Segment -> Sammanfoga segment.
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21207,8 +21049,8 @@ Segment -> Sammanfoga segment.
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21217,12 +21059,12 @@ Segment -> Sammanfoga segment.
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation>http://rosegardenmusic.com/tutorials/</translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation><h3>Nyare version tillgänglig</h3></translation>
</message>
@@ -21232,7 +21074,7 @@ Segment -> Sammanfoga segment.
<translation><p>Du använder version %1. Version %2 är nu tillgänglig.</p><p>Besök gärna <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Rosegardens hemsida</a> för mer information.</p></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>Öppna MIDI-fil</translation>
</message>
@@ -21242,12 +21084,12 @@ Segment -> Sammanfoga segment.
<translation>Sammanfoga MIDI-fil</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>Importerar MIDI-fil...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>Beräknar notskrift...</translation>
</message>
@@ -21279,36 +21121,24 @@ Segment -> Sammanfoga segment.
<translation>Kan inte läsa in X11 Rosegarden-fil. Den verkar vara skadad.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">Öppna Hydrogen-fil</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">Importerar Hydrogen-fil...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">Kan inte läsa in Hydrogen-fil. Den verkar vara skadad.</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>Misslyckades öppna en tillfällig fil för export till LilyPond.</p><p>Detta betyder troligen att diskutrymmet på <pre>%1</pre> har tagit slut</p></qt></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation>Rosegardens spelarprocess har oväntat avslutats. Ljud och inspelning är inte längre tillgängliga för den här sessionen.
Avsluta och starta om Rosegarden för att återställa ljudfunktionen.</translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>Startar spelarhanteraren...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>Spara filen%1med ett nytt filnamn...</translation>
@@ -21351,7 +21181,7 @@ Inget segment kommer att delas.</translation>
<translation>Ta bort ursprungligt tempo och taktart</translation>
</message>
<message>
- <location line="+1394"/>
+ <location line="+1388"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation>Öppna MusicXML-fil</translation>
@@ -21382,7 +21212,7 @@ För hjälp med riktig inställning av ljud och MIDI, besök http://www.rosegard
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -21390,7 +21220,7 @@ För hjälp med riktig inställning av ljud och MIDI, besök http://www.rosegard
<translation>Exportera som...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>Misslyckades spara Rosegarden-fil till paket: %1</translation>
</message>
@@ -21406,7 +21236,7 @@ För hjälp med riktig inställning av ljud och MIDI, besök http://www.rosegard
<translation>Vanliga MIDI-filer</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -21473,9 +21303,9 @@ För hjälp med riktig inställning av ljud och MIDI, besök http://www.rosegard
<translation>Exporterar MusicXML-fil...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>XML-filer</translation>
</message>
@@ -21573,21 +21403,17 @@ Vill du ställa in den nu?</translation>
<translation>Skriv nytt namn</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>Spellista</translation>
</message>
<message>
- <source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
- <translation type="obsolete">http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</translation>
- </message>
- <message>
<location line="+51"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation>Köar MIDI-panikhändelser för att skicka...</translation>
</message>
@@ -21667,7 +21493,7 @@ Felet är: %2</translation>
<translation><qt><p>Klicka och dra uppåt, neråt, åt vänster eller åt höger för att ändra.</p><p>Dubbelklicka för att direkt redigera värdet.</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>Välj ett nytt värde</translation>
</message>
@@ -21719,7 +21545,7 @@ Felet är: %2</translation>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>Ändra segmentfärg...</translation>
</message>
@@ -21762,7 +21588,7 @@ Felet är: %2</translation>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>Klicka på ett segment för att radera det</translation>
</message>
@@ -21795,7 +21621,7 @@ Felet är: %2</translation>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">&Sammanfoga</translation>
</message>
@@ -21803,7 +21629,7 @@ Felet är: %2</translation>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>&Ändra namn...</translation>
</message>
@@ -21840,22 +21666,22 @@ Felet är: %2</translation>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>Flytta segment</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>Flytta segment</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Håll ner Skift för att undvika rutnätet för taktslag</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>Dra för att flytta ett segment</translation>
</message>
@@ -22051,12 +21877,12 @@ innan en ny transponering kan utföras.</translation>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>Håll ner Skift för att undvika fästande vid taktstreck</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>Spela in eller släpp ljud här</translation>
</message>
@@ -22132,7 +21958,7 @@ innan en ny transponering kan utföras.</translation>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>Varning</translation>
</message>
@@ -22156,17 +21982,17 @@ Vill du ange den nu?</translation>
<translation>Skapar förhandsgranskning av ljud...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">Ändra storlek på segment</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Håll ner Skift för att undvika rutnätet för taktslag</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>Håll nere Skift för att undvika rutnätet för taktslag; håll även ner Ctrl för att storleksändra innehållet</translation>
</message>
@@ -22176,7 +22002,7 @@ Vill du ange den nu?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>Klicka och dra för att ändra storlek på ett segment; håll ner Ctrl för att även ändra innehållet</translation>
</message>
@@ -22189,25 +22015,25 @@ Vill du ange den nu?</translation>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>Klicka och dra för att markera segment</translation>
</message>
<message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>Flytta segment</numerusform>
- <numerusform>Flytta segment</numerusform>
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+154"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>Håll ner Skift för att undvika rutnätet för taktslag</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>Klicka och dra för att markera segment; mittenklicka för att skapa ett tomt segment</translation>
</message>
@@ -22232,19 +22058,11 @@ Vill du ange den nu?</translation>
<translation>Klicka och dra för att flytta segment; håll ner Ctrl för att kopiera det; Cltr+Alt för en länkad kopia; dubbelklicka för att redigera</translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">Klicka och dra för att flytta segment; håll ner Ctrl för att kopiera dem</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation>Klicka och dra för att kopiera segment</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">Klicka och dra för att flytta segment; håll ner Ctrl för att kopiera det; dubbelklicka för att redigera</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation>Klicka och dra för att kopiera segment</translation>
@@ -22315,24 +22133,12 @@ Vill du ange den nu?</translation>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">Dela segment två gånger</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>Klicka på ett segment för att dela det itu; håll ner Skift för att undvika fästande på rutnätet för taktslag</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>Klicka på ett segment för att dela det itu</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -24047,7 +23853,7 @@ Att avsluta andra program som körs kan förbättra Rosegardens prestanda.</tran
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><inget instrument></translation>
</message>
@@ -24062,19 +23868,7 @@ Att avsluta andra program som körs kan förbättra Rosegardens prestanda.</tran
<translation><namnlös></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">Varning</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">Sökvägen till ljudfiler finns inte eller är inte skrivbar.
-Ställ in sökvägen till ljudfiler till en giltig katalog i dokumentegenskaper innan ljud spelas in.
-Vill du ställa in den nu?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>Gör spår stumt</translation>
</message>
@@ -24087,25 +23881,17 @@ Vill du ställa in den nu?</translation>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">Omvandla upprepat segment till riktiga kopior</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">Omvandla upprepade segment till riktiga kopior</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation>
<numerusform>Omvandla ett upprepat segment till en riktig kopia</numerusform>
@@ -24113,7 +23899,7 @@ Vill du ställa in den nu?</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation>
<numerusform>Omvandla ett länkat segment till en riktig kopia</numerusform>
@@ -24121,7 +23907,7 @@ Vill du ställa in den nu?</translation>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -24134,10 +23920,6 @@ Vill du ställa in den nu?</translation>
<context>
<name>Rosegarden::TrackLabel</name>
<message>
- <source><qt>Click and hold with either mouse button to assign this track to an instrument.</qt></source>
- <translation type="obsolete"><qt>Klicka och håll med endera musknapp för att tilldela spåret till ett instrument.</qt></translation>
- </message>
- <message>
<location filename="../../src/gui/editors/segment/TrackLabel.cpp" line="+61"/>
<source><qt><p>Click to select all the segments on this track.</p><p>Shift+click to add to or to remove from the selection all the segments on this track.</p><p>Click and hold with either mouse button to assign this track to an instrument.</p></qt></source>
<translation><qt><p>Klicka för att markera alla segment i spåret.</p><p>Skiftklicka för att lägga till eller ta bort från markeringen alla segment i det här spåret.</p><p>Klicka och håll nere endera musknappen för att tilldela det här spåret till ett instrument.</p></qt></translation>
@@ -24171,7 +23953,7 @@ Vill du ställa in den nu?</translation>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>Spår</translation>
</message>
@@ -24182,12 +23964,12 @@ Vill du ställa in den nu?</translation>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><namnlös></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>Uppspelningsparametrar</translation>
</message>
@@ -24328,7 +24110,103 @@ Vill du ställa in den nu?</translation>
<translation><qt><p>Nya segment kommer att skapas med den här klaven infogad i början</p></qt></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+2"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">diskant</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">bas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">krotal</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">xylofon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">gitarr</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">kontrabas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">celesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">äldre celesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">fransk</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">sopran</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">mezzosopran</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">alt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">tenor</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">baryton</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">baryton (F)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">subbas</translation>
+ </message>
+ <message>
+ <location line="+39"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation><qt><p>Välj den lägsta föreslagna spelbara tonen, med användning av ett notsystem</p></qt></translation>
</message>
@@ -24358,87 +24236,71 @@ Vill du ställa in den nu?</translation>
<translation><qt><p>Läs in förinställning av segmentparametrar från den omfattande databasen av verkliga instrument.</p><p>När du skapar nya segment, har de dessa parametrar från det ögonblick de skapas. För att använda parametrarna i befintliga segment (t.ex. för att konvertera en befintlig stämma till konserttonhöjd för uppspelning med en B-trumpet), använd <b>Segment -> Konvertera notskrift för</b> i noteditorn.</p></qt></translation>
</message>
<message>
- <location line="+13"/>
<source>treble</source>
- <translation>diskant</translation>
+ <translation type="obsolete">diskant</translation>
</message>
<message>
- <location line="+1"/>
<source>bass</source>
- <translation>bas</translation>
+ <translation type="obsolete">bas</translation>
</message>
<message>
- <location line="+1"/>
<source>crotales</source>
- <translation>krotal</translation>
+ <translation type="obsolete">krotal</translation>
</message>
<message>
- <location line="+1"/>
<source>xylophone</source>
- <translation>xylofon</translation>
+ <translation type="obsolete">xylofon</translation>
</message>
<message>
- <location line="+1"/>
<source>guitar</source>
- <translation>gitarr</translation>
+ <translation type="obsolete">gitarr</translation>
</message>
<message>
- <location line="+1"/>
<source>contrabass</source>
- <translation>kontrabas</translation>
+ <translation type="obsolete">kontrabas</translation>
</message>
<message>
- <location line="+1"/>
<source>celesta</source>
- <translation>celesta</translation>
+ <translation type="obsolete">celesta</translation>
</message>
<message>
- <location line="+1"/>
<source>old celesta</source>
- <translation>äldre celesta</translation>
+ <translation type="obsolete">äldre celesta</translation>
</message>
<message>
- <location line="+1"/>
<source>french</source>
- <translation>fransk</translation>
+ <translation type="obsolete">fransk</translation>
</message>
<message>
- <location line="+1"/>
<source>soprano</source>
- <translation>sopran</translation>
+ <translation type="obsolete">sopran</translation>
</message>
<message>
- <location line="+1"/>
<source>mezzosoprano</source>
- <translation>mezzosopran</translation>
+ <translation type="obsolete">mezzosopran</translation>
</message>
<message>
- <location line="+1"/>
<source>alto</source>
- <translation>alt</translation>
+ <translation type="obsolete">alt</translation>
</message>
<message>
- <location line="+1"/>
<source>tenor</source>
- <translation>tenor</translation>
+ <translation type="obsolete">tenor</translation>
</message>
<message>
- <location line="+1"/>
<source>baritone</source>
- <translation>baryton</translation>
+ <translation type="obsolete">baryton</translation>
</message>
<message>
- <location line="+1"/>
<source>varbaritone</source>
- <translation>baryton (F)</translation>
+ <translation type="obsolete">baryton (F)</translation>
</message>
<message>
- <location line="+1"/>
<source>subbass</source>
- <translation>subbas</translation>
+ <translation type="obsolete">subbas</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+36"/>
<source>Transpose</source>
<translation>Transponera</translation>
</message>
@@ -24479,7 +24341,7 @@ Vill du ställa in den nu?</translation>
<translation><qt><p>Nya segment skapas med den här färgen</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>Ljud</translation>
@@ -24875,13 +24737,6 @@ Vill du ställa in den nu?</translation>
</message>
</context>
<context>
- <name>Rosegarden::Ui</name>
- <message>
- <source>[ No port ]</source>
- <translation type="obsolete">[ Ingen port ]</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::UnGraceCommand</name>
<message>
<location filename="../../src/commands/notation/UnGraceCommand.h" line="+43"/>
@@ -25118,13 +24973,6 @@ Vill du ställa in den nu?</translation>
</message>
</context>
<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">(inspelad)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/locale/zh_CN.ts b/data/locale/zh_CN.ts
index 31a5585..a188142 100644
--- a/data/locale/zh_CN.ts
+++ b/data/locale/zh_CN.ts
@@ -2,13 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0" language="zh_CN">
<context>
- <name></name>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">玫瑰å›</translation>
- </message>
-</context>
-<context>
<name>:</name>
<message>
<source></source>
@@ -338,23 +331,23 @@
<translation>æ— æ³•æ‰“å¼€å—ä½“æ˜ å°„æ–‡ä»¶ %1</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="+30"/>
- <location line="+33"/>
- <location line="+61"/>
- <location line="+49"/>
- <location line="+143"/>
- <location line="+157"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1941"/>
- <location line="+860"/>
+ <location filename="../QMenuStrings.cpp" line="+66"/>
<location line="+115"/>
+ <location line="+70"/>
+ <location line="+1104"/>
+ <location line="+140"/>
+ <location line="+45"/>
+ <location line="+49"/>
+ <location line="+242"/>
+ <location line="+36"/>
+ <location line="+106"/>
+ <location line="+747"/>
+ <location line="+54"/>
<source>&File</source>
<translation>文件(&F)</translation>
</message>
<message>
- <location line="-4686"/>
+ <location line="-942"/>
<source>&Add Audio File...</source>
<translation>æ·»åŠ éŸ³é¢‘æ–‡ä»¶(&A)...</translation>
</message>
@@ -364,54 +357,54 @@
<translation>导出音频文件(&E)...</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-1757"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>&Close</source>
<translation>å…³é—(&C)</translation>
</message>
<message>
- <location line="-4678"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+75"/>
- <location line="+1992"/>
- <location line="+807"/>
+ <location line="-2703"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+49"/>
+ <location line="+235"/>
+ <location line="+43"/>
+ <location line="+159"/>
+ <location line="+685"/>
+ <location line="+65"/>
<source>Ctrl+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="-4683"/>
- <location line="+31"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+798"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+284"/>
+ <location line="+211"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>&Edit</source>
<translation>编辑(&E)</translation>
</message>
<message>
- <location line="-4684"/>
+ <location line="-951"/>
<source>&Unload Audio File</source>
<translation>å¸è½½éŸ³é¢‘文件(&U)</translation>
</message>
@@ -436,350 +429,346 @@
<translation>æ’放预览</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+59"/>
+ <location line="-1684"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+62"/>
<location line="+1"/>
- <location line="+134"/>
+ <location line="+1092"/>
+ <location line="+158"/>
<location line="+1"/>
- <location line="+51"/>
+ <location line="+48"/>
<location line="+1"/>
- <location line="+1193"/>
- <location line="+173"/>
+ <location line="+49"/>
<location line="+1"/>
- <location line="+69"/>
+ <location line="+46"/>
<location line="+1"/>
- <location line="+1692"/>
- <location line="+880"/>
- <location line="+342"/>
+ <location line="+226"/>
+ <location line="+73"/>
<location line="+1"/>
- <location line="+57"/>
+ <location line="+664"/>
+ <location line="+172"/>
<location line="+1"/>
+ <location line="+1690"/>
<source>&Help</source>
<translation>帮助(&H)</translation>
</message>
<message>
- <location line="-4701"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1194"/>
- <location line="+173"/>
- <location line="+70"/>
- <location line="+1693"/>
- <location line="+880"/>
- <location line="+342"/>
- <location line="+58"/>
+ <location line="-4280"/>
+ <location line="+63"/>
+ <location line="+1093"/>
+ <location line="+158"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+665"/>
+ <location line="+172"/>
+ <location line="+1691"/>
<source>F1</source>
<comment>keyboard shortcut</comment>
<translation>F1</translation>
</message>
<message>
- <source>&Rosegarden tutorial</source>
- <translation type="obsolete">&Rosegarden 教程</translation>
- </message>
- <message>
- <location line="-3213"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-3129"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Bug Reporting Guidelines</source>
<translation>错误报告指导(&B)</translation>
</message>
<message>
- <location line="-4309"/>
- <location line="+59"/>
- <location line="+52"/>
- <location line="+135"/>
- <location line="+52"/>
- <location line="+1196"/>
- <location line="+171"/>
- <location line="+70"/>
- <location line="+1695"/>
- <location line="+880"/>
- <location line="+340"/>
- <location line="+58"/>
+ <location line="-4289"/>
+ <location line="+63"/>
+ <location line="+1095"/>
+ <location line="+156"/>
+ <location line="+49"/>
+ <location line="+50"/>
+ <location line="+47"/>
+ <location line="+227"/>
+ <location line="+73"/>
+ <location line="+667"/>
+ <location line="+170"/>
+ <location line="+1693"/>
<source>&About Rosegarden</source>
<translation>关于 RoseGarden(&A)</translation>
</message>
<message>
- <location line="-4707"/>
- <location line="+1496"/>
- <location line="+1936"/>
+ <location line="-3129"/>
+ <location line="+527"/>
+ <location line="+2605"/>
<source>General Toolbar</source>
<translation>主工具æ </translation>
</message>
<message>
- <location line="-3420"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-4382"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>&Nothing to undo</source>
<translation>没有å¯ä»¥æ’¤é”€çš„æ“作(&N)</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+4295"/>
+ <location line="-2708"/>
<location line="+106"/>
+ <location line="+1183"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+1171"/>
<source>N&othing to redo</source>
<translation>没有å¯ä»¥æ¢å¤çš„æ“作(&O)</translation>
</message>
<message>
- <location line="-4647"/>
- <location line="+70"/>
- <location line="+49"/>
- <location line="+134"/>
- <location line="+166"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
- <location line="+168"/>
+ <location line="-2638"/>
<location line="+106"/>
+ <location line="+79"/>
+ <location line="+1104"/>
+ <location line="+131"/>
+ <location line="+54"/>
+ <location line="+131"/>
+ <location line="+364"/>
+ <location line="+676"/>
+ <location line="+65"/>
<source>Ctrl+Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location line="-4652"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2602"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Copy</source>
<translation>æ‹·è´(&C)</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+C, F16, Ctrl+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+C, F16, Ctrl+Ins</translation>
</message>
<message>
- <location line="-4387"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2611"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>&Paste</source>
<translation>粘贴(&P)</translation>
</message>
<message>
- <location line="-4382"/>
- <location line="+156"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2606"/>
+ <location line="+88"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+V, F18, Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+V, F18, Shift+Ins</translation>
</message>
<message>
- <location line="-4376"/>
- <location line="+192"/>
- <location line="+52"/>
+ <location line="-2809"/>
+ <location line="+148"/>
+ <location line="+1163"/>
+ <location line="+487"/>
<location line="+36"/>
+ <location line="+73"/>
+ <location line="+694"/>
+ <location line="+2063"/>
+ <location line="+3"/>
+ <location line="+3"/>
<location line="+36"/>
- <location line="+1126"/>
- <location line="+72"/>
- <location line="+163"/>
- <location line="+1930"/>
- <location line="+863"/>
- <location line="+123"/>
<source>Switch to Select Tool</source>
<translation>切æ¢åˆ°é€‰æ‹©å·¥å…·</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+4278"/>
- <location line="+123"/>
+ <location line="-4557"/>
+ <location line="+1686"/>
+ <location line="+2830"/>
+ <location line="+3"/>
<source>Switch to Inserting Notes</source>
<translation>切æ¢åˆ°æ’入音符</translation>
</message>
<message>
- <location line="-4592"/>
- <location line="+192"/>
- <location line="+104"/>
- <location line="+36"/>
- <location line="+1135"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+2064"/>
- <location line="+12"/>
- <location line="+864"/>
- <location line="+123"/>
+ <location line="-4650"/>
+ <location line="+132"/>
+ <location line="+60"/>
+ <location line="+1102"/>
+ <location line="+524"/>
+ <location line="+89"/>
+ <location line="+694"/>
+ <location line="+53"/>
+ <location line="+1994"/>
+ <location line="+3"/>
+ <location line="+28"/>
<source>Switch to Erase Tool</source>
<translation>切æ¢åˆ°æ“¦é™¤å·¥å…·</translation>
</message>
<message>
- <location line="-4591"/>
+ <location line="-4660"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>&Save</source>
<translation>ä¿å˜(&S)</translation>
</message>
<message>
- <location line="-4471"/>
+ <location line="-2701"/>
+ <location line="+185"/>
+ <location line="+1104"/>
+ <location line="+185"/>
<location line="+49"/>
- <location line="+300"/>
- <location line="+1207"/>
- <location line="+48"/>
- <location line="+73"/>
- <location line="+1979"/>
- <location line="+822"/>
+ <location line="+278"/>
+ <location line="+144"/>
+ <location line="+763"/>
<source>Ctrl+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+S</translation>
</message>
<message>
- <location line="-4399"/>
+ <location line="-1389"/>
<source>&Insert Event</source>
<translation>æ’入事件(&I)</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1132"/>
- <location line="+1908"/>
- <location line="+823"/>
- <location line="+371"/>
- <location line="+195"/>
+ <location line="-1282"/>
+ <location line="+1017"/>
+ <location line="+272"/>
+ <location line="+289"/>
+ <location line="+623"/>
+ <location line="+1920"/>
<source>I</source>
<comment>keyboard shortcut</comment>
<translation>I</translation>
</message>
<message>
- <location line="-4427"/>
+ <location line="-2830"/>
<source>&Delete Event</source>
<translation>åˆ é™¤äº‹ä»¶(&D)</translation>
</message>
<message>
<location line="+7"/>
- <location line="+1666"/>
- <location line="+1992"/>
- <location line="+621"/>
+ <location line="+334"/>
+ <location line="+373"/>
+ <location line="+750"/>
<source>Delete</source>
<comment>keyboard shortcut</comment>
<translation>Delete</translation>
</message>
<message>
- <location line="-4277"/>
+ <location line="-1455"/>
<source>&Edit Event</source>
<translation>编辑事件(&E)</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1051"/>
- <location line="+1908"/>
- <location line="+877"/>
- <location line="+371"/>
- <location line="+231"/>
+ <location line="-1273"/>
+ <location line="+927"/>
+ <location line="+353"/>
+ <location line="+262"/>
+ <location line="+623"/>
+ <location line="+1866"/>
<source>E</source>
<comment>keyboard shortcut</comment>
<translation>E</translation>
</message>
<message>
- <location line="-4436"/>
+ <location line="-2749"/>
<source>&Advanced Event Editor</source>
<translation>高级事件编辑器(&A)</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-1131"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Cu&t</source>
<translation>剪切(&T)</translation>
</message>
<message>
- <location line="-4226"/>
- <location line="+272"/>
- <location line="+1330"/>
- <location line="+2001"/>
- <location line="+630"/>
+ <location line="-2518"/>
+ <location line="+1132"/>
+ <location line="+288"/>
+ <location line="+364"/>
+ <location line="+741"/>
<source>Ctrl+X, F20, Shift+Del</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+X, F20, Shift+Del</translation>
</message>
<message>
- <location line="-4213"/>
+ <location line="-1373"/>
<source>&Select All</source>
<translation>全选(&S)</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2024"/>
- <location line="+751"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+708"/>
+ <location line="+718"/>
<source>Ctrl+A</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+A</translation>
</message>
<message>
- <location line="-4408"/>
- <location line="+281"/>
+ <location line="-2547"/>
+ <location line="+1123"/>
<source>C&lear Selection</source>
<translation>清除选择(&l)</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+281"/>
- <location line="+1354"/>
- <location line="+2775"/>
+ <location line="-1301"/>
+ <location line="+185"/>
+ <location line="+1123"/>
+ <location line="+1426"/>
<source>Escape</source>
<comment>keyboard shortcut</comment>
<translation>Escape</translation>
</message>
<message>
- <location line="-4127"/>
- <location line="+1363"/>
+ <location line="-2547"/>
+ <location line="+2558"/>
<source>&Filter Selection</source>
<translation>过滤器选择(&F)</translation>
</message>
<message>
- <location line="-1356"/>
- <location line="+1363"/>
+ <location line="-2551"/>
+ <location line="+2558"/>
<source>Ctrl+F</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+F</translation>
</message>
<message>
- <location line="-1651"/>
+ <location line="-1442"/>
<source>Set Se&gment Start Time...</source>
<translation>设置片段起点时间(&g)...</translation>
</message>
@@ -789,82 +778,82 @@
<translation>设置片段时长(&m)...</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+58"/>
- <location line="+230"/>
- <location line="+1364"/>
- <location line="+1996"/>
- <location line="+760"/>
- <location line="+60"/>
+ <location line="-1308"/>
+ <location line="+194"/>
+ <location line="+1116"/>
+ <location line="+55"/>
+ <location line="+642"/>
+ <location line="+592"/>
+ <location line="+154"/>
<source>&View</source>
<translation>查看(&V)</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2752"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Musical Times</source>
<translation>音ä¹æ—¶é—´(&M)</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>&Real Times</source>
<translation>实际时间(&R)</translation>
</message>
<message>
- <location line="-4467"/>
- <location line="+58"/>
- <location line="+4350"/>
- <location line="+60"/>
+ <location line="-2598"/>
+ <location line="+1310"/>
+ <location line="+55"/>
+ <location line="+1234"/>
<source>Ra&w Times</source>
<translation>原始时间(&W)</translation>
</message>
<message>
- <location line="-4465"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2040"/>
+ <location line="-2293"/>
+ <location line="+1007"/>
+ <location line="+774"/>
+ <location line="+703"/>
<source>Se&gment</source>
<translation>片段(&g)</translation>
</message>
<message>
- <location line="-3724"/>
- <location line="+397"/>
- <location line="+1288"/>
- <location line="+2049"/>
+ <location line="-2483"/>
+ <location line="+1007"/>
+ <location line="+783"/>
+ <location line="+694"/>
<source>Edit &With</source>
<translation>编辑(&W)</translation>
</message>
<message>
- <location line="-3733"/>
- <location line="+399"/>
- <location line="+1287"/>
- <location line="+2057"/>
- <location line="+371"/>
+ <location line="-2481"/>
+ <location line="+1005"/>
+ <location line="+169"/>
+ <location line="+623"/>
+ <location line="+686"/>
<source>Open in Matri&x Editor</source>
<translation>在钢ç´å·å¸˜çª—ä¸æ‰“å¼€(&X)</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+397"/>
- <location line="+3363"/>
- <location line="+371"/>
+ <location line="-2484"/>
+ <location line="+1007"/>
+ <location line="+186"/>
+ <location line="+623"/>
<source>Open in &Notation Editor</source>
<translation>在ä¹è°±ç¼–辑器ä¸æ‰“å¼€(&N)</translation>
</message>
<message>
- <location line="-2871"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-953"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>About &Qt</source>
<translation>关于 &Qt</translation>
</message>
<message>
- <location line="-1529"/>
+ <location line="-649"/>
<source>Add &Segno</source>
<translation>æ·»åŠ &Segno</translation>
</message>
@@ -894,7 +883,7 @@
<translation>附点二分音符(&l)</translation>
</message>
<message>
- <location line="+792"/>
+ <location line="-2569"/>
<source>Switch To &Notes</source>
<translation>切æ¢åˆ°éŸ³ç¬¦(&N)</translation>
</message>
@@ -914,12 +903,12 @@
<translation>切æ¢æ— 附点(&g)</translation>
</message>
<message>
- <location line="-1778"/>
+ <location line="+1582"/>
<source>Show &Symbols Toolbar</source>
<translation>显示符å·å·¥å…·æ (&S)</translation>
</message>
<message>
- <location line="+1542"/>
+ <location line="+1543"/>
<source>Duration Toolbar</source>
<translation>时值工具æ </translation>
</message>
@@ -929,41 +918,41 @@
<translation>符å·å·¥å…·æ </translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+2059"/>
+ <location line="-2438"/>
+ <location line="+683"/>
<source>Ctrl+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+K</translation>
</message>
<message>
- <location line="-1224"/>
- <location line="+1243"/>
+ <location line="-664"/>
+ <location line="+1500"/>
<source>Ctrl+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="-1478"/>
<source>Ctrl+Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+R</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+371"/>
+ <location line="-613"/>
+ <location line="+623"/>
<source>Return</source>
<comment>keyboard shortcut</comment>
<translation>Return</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+382"/>
+ <location line="-515"/>
+ <location line="+612"/>
<source>Ctrl+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="-353"/>
+ <location line="+29"/>
<source>Ctrl+Shift+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+T</translation>
@@ -975,11 +964,6 @@
<translation>Ctrl+D</translation>
</message>
<message>
- <source>Enter, Media Play, Ctrl+Return</source>
- <comment>keyboard shortcut</comment>
- <translation type="obsolete">Enter, Media Play, Ctrl+Return</translation>
- </message>
- <message>
<location line="+132"/>
<source>Insert, Media Stop</source>
<comment>keyboard shortcut</comment>
@@ -1027,7 +1011,7 @@
<translation>End</translation>
</message>
<message>
- <location line="+302"/>
+ <location line="-2465"/>
<source>Show &Toolbar</source>
<translation>显示工具æ (&T)</translation>
</message>
@@ -1037,39 +1021,39 @@
<translation>éšè—状æ€æ (&a)</translation>
</message>
<message>
- <location line="-4392"/>
+ <location line="+12"/>
+ <location line="+1163"/>
+ <location line="+151"/>
<location line="+3"/>
- <location line="+1250"/>
- <location line="+3151"/>
<source>Actions Toolbar</source>
<translation>动作工具æ </translation>
</message>
<message>
- <location line="-4403"/>
- <location line="+51"/>
- <location line="+4353"/>
- <location line="+57"/>
+ <location line="-1316"/>
+ <location line="+1314"/>
+ <location line="+48"/>
+ <location line="+1234"/>
<source>Time Toolbar</source>
<translation>时间工具æ </translation>
</message>
<message>
- <location line="-4460"/>
- <location line="+1250"/>
- <location line="+167"/>
- <location line="+70"/>
- <location line="+1699"/>
- <location line="+884"/>
+ <location line="-1435"/>
+ <location line="+154"/>
+ <location line="+144"/>
+ <location line="+300"/>
+ <location line="+675"/>
+ <location line="+1859"/>
<source>Transport Toolbar</source>
<translation>æ’放控制工具æ </translation>
</message>
<message>
- <location line="-4068"/>
- <location line="+4087"/>
+ <location line="-2976"/>
+ <location line="+1136"/>
<source>Zoom Toolbar</source>
<translation>缩放工具æ </translation>
</message>
<message>
- <location line="-713"/>
+ <location line="+2030"/>
<source>Interpret Toolbar</source>
<translation type="unfinished"></translation>
</message>
@@ -1119,7 +1103,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-3353"/>
+ <location line="+2"/>
<source>Insert Marker</source>
<translation>æ’å…¥æ ‡ç¾</translation>
</message>
@@ -1139,125 +1123,117 @@
<translation>ç¼–è¾‘æ ‡ç¾</translation>
</message>
<message>
- <location line="+8"/>
- <location line="+36"/>
+ <location line="-4656"/>
+ <location line="+756"/>
+ <location line="+988"/>
+ <location line="+163"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+1144"/>
+ <location line="+925"/>
<location line="+36"/>
- <location line="+571"/>
- <location line="+555"/>
- <location line="+72"/>
- <location line="+1166"/>
- <location line="+1431"/>
- <location line="+305"/>
<source>F2</source>
<comment>keyboard shortcut</comment>
<translation>F2</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+72"/>
- <location line="+1126"/>
+ <location line="-2797"/>
+ <location line="+712"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
<source>Switch to Move Tool</source>
<translation>切æ¢åˆ°ç§»åŠ¨å·¥å…·</translation>
</message>
<message>
- <location line="-1281"/>
- <location line="+72"/>
- <location line="+589"/>
- <location line="+537"/>
+ <location line="-3925"/>
+ <location line="+970"/>
+ <location line="+163"/>
+ <location line="+544"/>
+ <location line="+168"/>
+ <location line="+35"/>
+ <location line="+2016"/>
<location line="+36"/>
- <location line="+54"/>
- <location line="+2597"/>
- <location line="+287"/>
<source>F5</source>
<comment>keyboard shortcut</comment>
<translation>F5</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+27"/>
- <location line="+1171"/>
- <location line="+18"/>
- <location line="+45"/>
+ <location line="-4713"/>
+ <location line="+2601"/>
+ <location line="+44"/>
+ <location line="+2034"/>
+ <location line="+36"/>
<source>Switch to Draw Tool</source>
<translation>切æ¢åˆ°ç»˜åˆ¶å·¥å…·</translation>
</message>
<message>
- <location line="-1254"/>
- <location line="+27"/>
- <location line="+607"/>
- <location line="+564"/>
- <location line="+18"/>
- <location line="+45"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4708"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+1101"/>
+ <location line="+933"/>
+ <location line="+36"/>
<source>F3</source>
<comment>keyboard shortcut</comment>
<translation>F3</translation>
</message>
<message>
- <location line="-4170"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+1162"/>
- <location line="+45"/>
+ <location line="-4704"/>
+ <location line="+1907"/>
+ <location line="+703"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>Switch to Resize Tool</source>
<translation>切æ¢åˆ°å°ºå¯¸è°ƒæ•´å·¥å…·</translation>
</message>
<message>
- <location line="-1272"/>
- <location line="+36"/>
- <location line="+36"/>
- <location line="+580"/>
- <location line="+582"/>
- <location line="+45"/>
- <location line="+2597"/>
- <location line="+305"/>
+ <location line="-4699"/>
+ <location line="+765"/>
+ <location line="+988"/>
+ <location line="+154"/>
+ <location line="+535"/>
+ <location line="+168"/>
+ <location line="+44"/>
+ <location line="+2052"/>
<source>F6</source>
<comment>keyboard shortcut</comment>
<translation>F6</translation>
</message>
<message>
- <location line="-4154"/>
- <location line="+36"/>
- <location line="+571"/>
- <location line="+564"/>
- <location line="+27"/>
- <location line="+36"/>
- <location line="+1167"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-4715"/>
+ <location line="+756"/>
+ <location line="+997"/>
+ <location line="+154"/>
+ <location line="+526"/>
+ <location line="+168"/>
+ <location line="+53"/>
+ <location line="+1092"/>
+ <location line="+933"/>
<source>F4</source>
<comment>keyboard shortcut</comment>
<translation>F4</translation>
</message>
<message>
- <source>Nothing to &undo</source>
- <translation type="obsolete">没有å¯ä»¥æ’¤é”€çš„æ“作(&u)</translation>
- </message>
- <message>
- <source>Nothing to &redo</source>
- <translation type="obsolete">没有å¯ä»¥æ¢å¤çš„æ“作(&r)</translation>
- </message>
- <message>
- <location line="-4033"/>
- <location line="+3340"/>
- <location line="+621"/>
- <location line="+159"/>
+ <location line="-4612"/>
+ <location line="+194"/>
+ <location line="+1420"/>
+ <location line="+373"/>
<source>&Delete</source>
<translation>åˆ é™¤(&D)</translation>
</message>
<message>
- <location line="-4113"/>
- <location line="+4120"/>
+ <location line="-1980"/>
+ <location line="+194"/>
<source>Delete, Ctrl+D</source>
<comment>keyboard shortcut</comment>
<translation>Delete, Ctrl+D</translation>
</message>
<message>
- <location line="-4089"/>
+ <location line="+31"/>
<source>&Grid</source>
<translation>ç½‘æ ¼(&G)</translation>
</message>
@@ -1273,13 +1249,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2350"/>
+ <location line="+3546"/>
<source>0</source>
<comment>keyboard shortcut</comment>
<translation>0</translation>
</message>
<message>
- <location line="-2348"/>
+ <location line="-3544"/>
<source>Snap to &1/48</source>
<translation>对é½åˆ° &1/48</translation>
</message>
@@ -1290,13 +1266,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2331"/>
+ <location line="+3527"/>
<source>3</source>
<comment>keyboard shortcut</comment>
<translation>3</translation>
</message>
<message>
- <location line="-2329"/>
+ <location line="-3525"/>
<source>Snap to 1/&24</source>
<translation>对é½åˆ° 1/&24</translation>
</message>
@@ -1307,13 +1283,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2312"/>
+ <location line="+3508"/>
<source>6</source>
<comment>keyboard shortcut</comment>
<translation>6</translation>
</message>
<message>
- <location line="-2310"/>
+ <location line="-3506"/>
<source>Snap t&o 1/12</source>
<translation>对é½åˆ° 1/12(&o)</translation>
</message>
@@ -1324,13 +1300,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2293"/>
+ <location line="+3489"/>
<source>8</source>
<comment>keyboard shortcut</comment>
<translation>8</translation>
</message>
<message>
- <location line="-2291"/>
+ <location line="-3487"/>
<source>Snap to &3/16</source>
<translation>对é½åˆ° &3/16</translation>
</message>
@@ -1341,13 +1317,13 @@
</message>
<message>
<location line="+7"/>
- <location line="+2274"/>
+ <location line="+3470"/>
<source>4</source>
<comment>keyboard shortcut</comment>
<translation>4</translation>
</message>
<message>
- <location line="-2272"/>
+ <location line="-3468"/>
<source>Snap to 3/8</source>
<translation>对é½åˆ° 3/8</translation>
</message>
@@ -1358,177 +1334,173 @@
</message>
<message>
<location line="+7"/>
- <location line="+2255"/>
+ <location line="+3451"/>
<source>2</source>
<comment>keyboard shortcut</comment>
<translation>2</translation>
</message>
<message>
- <location line="-2253"/>
+ <location line="-3449"/>
<source>Snap to Bea&t</source>
<translation>对é½åˆ°æ•´æ‹(&t)</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2237"/>
+ <location line="+3433"/>
<source>1</source>
<comment>keyboard shortcut</comment>
<translation>1</translation>
</message>
<message>
- <location line="-2235"/>
+ <location line="-3431"/>
<source>Snap to &Bar</source>
<translation>对é½åˆ°å°èŠ‚(&B)</translation>
</message>
<message>
<location line="+7"/>
- <location line="+2219"/>
+ <location line="+3415"/>
<source>5</source>
<comment>keyboard shortcut</comment>
<translation>5</translation>
</message>
<message>
- <location line="-2205"/>
- <location line="+1302"/>
+ <location line="-3401"/>
+ <location line="+2497"/>
<source>Add &Control Ruler</source>
<translation>æ·»åŠ æŽ§åˆ¶æ ‡å°º(&C)</translation>
</message>
<message>
- <location line="-1282"/>
- <location line="+1288"/>
- <location line="+1995"/>
+ <location line="-2477"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>&Composition</source>
<translation>编曲(&C)</translation>
</message>
<message>
- <location line="-3282"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+669"/>
+ <location line="-2844"/>
+ <location line="+362"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Te&mpo Change...</source>
<translation>æ·»åŠ é€Ÿåº¦(&M)...</translation>
</message>
<message>
- <location line="-3951"/>
- <location line="+1288"/>
- <location line="+1995"/>
- <location line="+677"/>
+ <location line="-2836"/>
+ <location line="+354"/>
+ <location line="+1736"/>
+ <location line="+747"/>
<source>Add Time Si&gnature Change...</source>
<translation>æ·»åŠ æ‹å·(&G)...</translation>
</message>
<message>
- <source>&Segment</source>
- <translation type="obsolete">å°èŠ‚(&M)</translation>
- </message>
- <message>
- <location line="-3957"/>
- <location line="+1288"/>
- <location line="+2085"/>
- <location line="+371"/>
+ <location line="-2480"/>
+ <location line="+1203"/>
+ <location line="+623"/>
+ <location line="+658"/>
<source>Open in &Event List Editor</source>
<translation>在事件列表编辑器ä¸æ‰“å¼€(&E)</translation>
</message>
<message>
- <location line="-3728"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2468"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>=</source>
<comment>keyboard shortcut</comment>
<translation>=</translation>
</message>
<message>
- <location line="-3807"/>
- <location line="+3383"/>
- <location line="+433"/>
+ <location line="-2942"/>
+ <location line="+1275"/>
+ <location line="+561"/>
<source>+</source>
<comment>keyboard shortcut</comment>
<translation>+</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-1827"/>
<source>-</source>
<comment>keyboard shortcut</comment>
<translation>-</translation>
</message>
<message>
<location line="+18"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Left</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Left</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-3008"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Alt+Right</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Right</translation>
</message>
<message>
- <location line="-3362"/>
- <location line="+1777"/>
- <location line="+1650"/>
+ <location line="-3008"/>
+ <location line="+1880"/>
+ <location line="+1093"/>
<source>Shift+Up</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Up</translation>
</message>
<message>
- <location line="-3418"/>
- <location line="+1777"/>
- <location line="+1632"/>
+ <location line="-2964"/>
+ <location line="+1862"/>
+ <location line="+1111"/>
<source>Shift+Down</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Down</translation>
</message>
<message>
- <location line="-3397"/>
- <location line="+1693"/>
+ <location line="-2961"/>
+ <location line="+2889"/>
<source>Ctrl+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Shift+H</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+H</translation>
</message>
<message>
- <location line="-1682"/>
- <location line="+1693"/>
- <location line="+1711"/>
+ <location line="-2878"/>
+ <location line="+1857"/>
+ <location line="+1032"/>
<source>Up</source>
<comment>keyboard shortcut</comment>
<translation>Up</translation>
</message>
<message>
- <location line="-3395"/>
- <location line="+1693"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+1839"/>
+ <location line="+1050"/>
<source>Down</source>
<comment>keyboard shortcut</comment>
<translation>Down</translation>
</message>
<message>
- <location line="-3377"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Up</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Up</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Ctrl+Down</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Down</translation>
</message>
<message>
- <location line="-1681"/>
+ <location line="-2877"/>
<source>Shift+Alt+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Alt+I</translation>
@@ -1541,701 +1513,701 @@
</message>
<message>
<location line="+6"/>
- <location line="+1723"/>
+ <location line="+2919"/>
<source>Cut Controller Events (&X)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1723"/>
+ <location line="-2918"/>
+ <location line="+2919"/>
<source>&Copy Controller Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1721"/>
- <location line="+1723"/>
+ <location line="-2917"/>
+ <location line="+2919"/>
<source>&Place a Controller for Each Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1712"/>
- <location line="+1724"/>
+ <location line="-2908"/>
+ <location line="+2920"/>
<source>Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Left</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Right</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor Back &Bar and Select</source>
<translation>å…‰æ ‡åŽé€€ä¸€å°èŠ‚并选ä¸(&B)</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Left</translation>
</message>
<message>
- <location line="-1722"/>
- <location line="+1724"/>
+ <location line="-2918"/>
+ <location line="+2920"/>
<source>Cursor For&ward and Select</source>
<translation>å…‰æ ‡å‰ç§»å¹¶é€‰ä¸(&w)</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1724"/>
+ <location line="-2913"/>
+ <location line="+2920"/>
<source>Ctrl+Shift+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Right</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+;</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+;</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Ctrl+:</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+:</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1742"/>
+ <location line="-2911"/>
+ <location line="+2938"/>
<source>Alt+PgUp</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgUp</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Alt+PgDown</source>
<comment>keyboard shortcut</comment>
<translation>Alt+PgDown</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Left</source>
<comment>keyboard shortcut</comment>
<translation>Left</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Right</source>
<comment>keyboard shortcut</comment>
<translation>Right</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Ctrl+Left</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Left</translation>
</message>
<message>
- <location line="-1745"/>
- <location line="+1754"/>
+ <location line="-2941"/>
+ <location line="+2950"/>
<source>Ctrl+Right</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Right</translation>
</message>
<message>
- <location line="-1742"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2938"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Pause</source>
<comment>keyboard shortcut</comment>
<translation>Pause</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>Alt+Ctrl+P</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Ctrl+P</translation>
</message>
<message>
- <location line="-3297"/>
+ <location line="-2928"/>
<location line="+9"/>
- <location line="+3215"/>
- <location line="+305"/>
+ <location line="+979"/>
+ <location line="+689"/>
<source>F7</source>
<comment>keyboard shortcut</comment>
<translation>F7</translation>
</message>
<message>
- <location line="-3517"/>
+ <location line="-1665"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do</source>
<translation>I/do</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>A</source>
<comment>keyboard shortcut</comment>
<translation>A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>I/do sharp</source>
<translation>I/do sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+A</source>
<comment>keyboard shortcut</comment>
<translation>Shift+A</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re flat</source>
<translation>II/re flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+792"/>
+ <location line="-3405"/>
+ <location line="+1153"/>
+ <location line="+1951"/>
<source>Ctrl+Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-2698"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re</source>
<translation>II/re</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>S</source>
<comment>keyboard shortcut</comment>
<translation>S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>II/re sharp</source>
<translation>II/re sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+S</source>
<comment>keyboard shortcut</comment>
<translation>Shift+S</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi flat</source>
<translation>III/mi flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+D</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+D</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>III/mi</source>
<translation>III/mi</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
- <location line="+1013"/>
- <location line="+371"/>
+ <location line="-3405"/>
+ <location line="+751"/>
+ <location line="+623"/>
+ <location line="+1730"/>
<source>D</source>
<comment>keyboard shortcut</comment>
<translation>D</translation>
</message>
<message>
- <location line="-3290"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa</source>
<translation>IV/fa</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>F</source>
<comment>keyboard shortcut</comment>
<translation>F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>IV/fa sharp</source>
<translation>IV/fa sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+F</source>
<comment>keyboard shortcut</comment>
<translation>Shift+F</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol flat</source>
<translation>V/sol flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol</source>
<translation>V/sol</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>J</source>
<comment>keyboard shortcut</comment>
<translation>J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>V/sol sharp</source>
<translation>V/sol sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+J</source>
<comment>keyboard shortcut</comment>
<translation>Shift+J</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la flat</source>
<translation>VI/la flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la</source>
<translation>VI/la</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>K</source>
<comment>keyboard shortcut</comment>
<translation>K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VI/la sharp</source>
<translation>VI/la sharp</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Shift+K</source>
<comment>keyboard shortcut</comment>
<translation>Shift+K</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti flat</source>
<translation>VII/ti flat</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+L</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+L</translation>
</message>
<message>
- <location line="-1906"/>
+ <location line="-3102"/>
<location line="+154"/>
<location line="+154"/>
- <location line="+1600"/>
+ <location line="+2796"/>
<location line="+154"/>
<location line="+154"/>
<source>VII/ti</source>
<translation>VII/ti</translation>
</message>
<message>
- <location line="-2209"/>
- <location line="+1908"/>
+ <location line="-3405"/>
+ <location line="+3104"/>
<source>L</source>
<comment>keyboard shortcut</comment>
<translation>L</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Q</source>
<comment>keyboard shortcut</comment>
<translation>Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Q</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Q</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>W</source>
<comment>keyboard shortcut</comment>
<translation>W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+W</source>
<comment>keyboard shortcut</comment>
<translation>Shift+W</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+E</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+E</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
- <location line="+1021"/>
+ <location line="-3086"/>
+ <location line="+1382"/>
+ <location line="+1722"/>
<source>R</source>
<comment>keyboard shortcut</comment>
<translation>R</translation>
</message>
<message>
- <location line="-2920"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+R</source>
<comment>keyboard shortcut</comment>
<translation>Shift+R</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+985"/>
+ <location line="-3095"/>
+ <location line="+1346"/>
+ <location line="+1758"/>
<source>U</source>
<comment>keyboard shortcut</comment>
<translation>U</translation>
</message>
<message>
- <location line="-2884"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+U</source>
<comment>keyboard shortcut</comment>
<translation>Shift+U</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+I</translation>
</message>
<message>
- <location line="-1890"/>
- <location line="+1908"/>
+ <location line="-3086"/>
+ <location line="+3104"/>
<source>Shift+I</source>
<comment>keyboard shortcut</comment>
<translation>Shift+I</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>O</source>
<comment>keyboard shortcut</comment>
<translation>O</translation>
</message>
<message>
- <location line="-1898"/>
- <location line="+1908"/>
+ <location line="-3094"/>
+ <location line="+3104"/>
<source>Z</source>
<comment>keyboard shortcut</comment>
<translation>Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+Z</source>
<comment>keyboard shortcut</comment>
<translation>Shift+Z</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+581"/>
+ <location line="-3095"/>
+ <location line="+942"/>
+ <location line="+2162"/>
<source>Ctrl+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+X</translation>
</message>
<message>
- <location line="-2480"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>X</source>
<comment>keyboard shortcut</comment>
<translation>X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Shift+X</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+563"/>
+ <location line="-3095"/>
+ <location line="+924"/>
+ <location line="+2180"/>
<source>Ctrl+Shift+C</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location line="-2462"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>C</source>
<comment>keyboard shortcut</comment>
<translation>C</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>V</source>
<comment>keyboard shortcut</comment>
<translation>V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Shift+V</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>B</source>
<comment>keyboard shortcut</comment>
<translation>B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+B</source>
<comment>keyboard shortcut</comment>
<translation>Shift+B</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Ctrl+Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+651"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+389"/>
+ <location line="+623"/>
+ <location line="+2092"/>
<source>N</source>
<comment>keyboard shortcut</comment>
<translation>N</translation>
</message>
<message>
- <location line="-2921"/>
- <location line="+1908"/>
+ <location line="-3095"/>
+ <location line="+3104"/>
<source>Shift+N</source>
<comment>keyboard shortcut</comment>
<translation>Shift+N</translation>
</message>
<message>
- <location line="-1899"/>
- <location line="+1908"/>
- <location line="+565"/>
+ <location line="-3095"/>
+ <location line="+926"/>
+ <location line="+2178"/>
<source>Ctrl+Shift+M</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+M</translation>
</message>
<message>
- <location line="-2464"/>
- <location line="+1908"/>
- <location line="+606"/>
- <location line="+371"/>
+ <location line="-3095"/>
+ <location line="+344"/>
+ <location line="+623"/>
+ <location line="+2137"/>
<source>M</source>
<comment>keyboard shortcut</comment>
<translation>M</translation>
</message>
<message>
- <location line="-2876"/>
- <location line="+1917"/>
+ <location line="-3095"/>
+ <location line="+3113"/>
<source>H</source>
<comment>keyboard shortcut</comment>
<translation>H</translation>
</message>
<message>
- <location line="-1904"/>
- <location line="+1936"/>
+ <location line="-3100"/>
+ <location line="+3132"/>
<source>&Rosegarden Tutorial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1666"/>
- <location line="+2001"/>
+ <location line="-2772"/>
+ <location line="+364"/>
<location line="+551"/>
- <location line="+79"/>
+ <location line="+190"/>
<source>&Nothing to Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2622"/>
- <location line="+2001"/>
+ <location line="-1096"/>
+ <location line="+364"/>
<location line="+543"/>
- <location line="+87"/>
+ <location line="+198"/>
<source>N&othing to Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2588"/>
+ <location line="+43"/>
<source>Alt+Shift+X</source>
<comment>keyboard shortcut</comment>
<translation>Alt+Shift+X</translation>
@@ -2267,7 +2239,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+17"/>
+ <source>Check for Parallels...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
<source>Add Clef Change in This Link Only...</source>
<translation type="unfinished"></translation>
</message>
@@ -2384,14 +2361,14 @@
<translation>Ctrl+U</translation>
</message>
<message>
- <location line="+9"/>
- <location line="+1968"/>
+ <location line="-766"/>
+ <location line="+775"/>
<source>Ctrl+T</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="-1959"/>
+ <location line="+9"/>
<source>Ctrl+R</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+R</translation>
@@ -2409,8 +2386,8 @@
<translation>Ctrl+)</translation>
</message>
<message>
- <location line="-1537"/>
- <location line="+1550"/>
+ <location line="-2733"/>
+ <location line="+2746"/>
<source>~</source>
<comment>keyboard shortcut</comment>
<translation>~</translation>
@@ -2428,27 +2405,27 @@
<translation>></translation>
</message>
<message>
- <location line="-1558"/>
- <location line="+1570"/>
+ <location line="-2754"/>
+ <location line="+2766"/>
<source>Ad&just</source>
<translation>调整(&j)</translation>
</message>
<message>
- <location line="-1569"/>
- <location line="+1755"/>
+ <location line="-2765"/>
+ <location line="+2951"/>
<source>&Quantize</source>
<translation>é‡åŒ–(&Q)</translation>
</message>
<message>
- <location line="-1754"/>
- <location line="+1755"/>
- <location line="+1628"/>
- <location line="+433"/>
+ <location line="-2950"/>
+ <location line="+1275"/>
+ <location line="+561"/>
+ <location line="+1115"/>
<source>&Quantize...</source>
<translation>é‡åŒ–(&Q)...</translation>
</message>
<message>
- <location line="-3807"/>
+ <location line="-2942"/>
<source>&Repeat Last Quantize</source>
<translation>é‡åšä¸Šä¸€ä¸ªé‡åŒ–(&R)</translation>
</message>
@@ -2459,36 +2436,36 @@
</message>
<message>
<location line="+9"/>
- <location line="+1554"/>
+ <location line="+2750"/>
<source>Collapse &Equal-Pitch Notes</source>
<translation>压缩相åŒéŸ³é«˜çš„音符(&E)</translation>
</message>
<message>
- <location line="-1545"/>
- <location line="+1821"/>
- <location line="+1550"/>
+ <location line="-2741"/>
+ <location line="+1824"/>
+ <location line="+1193"/>
<source>Jog &Left</source>
<translation>左移一帧(&L)</translation>
</message>
<message>
- <location line="-3362"/>
+ <location line="-3008"/>
<source>&Jog Right</source>
<translation>å³ç§»ä¸€å¸§(&J)</translation>
</message>
<message>
<location line="+9"/>
- <location line="+1777"/>
+ <location line="+2973"/>
<source>&Increase Velocity</source>
<translation>å¢žåŠ åŠ›åº¦(&I)</translation>
</message>
<message>
- <location line="-1768"/>
- <location line="+1777"/>
+ <location line="-2964"/>
+ <location line="+2973"/>
<source>&Reduce Velocity</source>
<translation>å‡å°‘力度(&R)</translation>
</message>
<message>
- <location line="-1768"/>
+ <location line="-2964"/>
<source>&Set to Current Velocity</source>
<translation>设置为当å‰åŠ›åº¦(&S)</translation>
</message>
@@ -2504,359 +2481,315 @@
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Halve Durations</source>
<translation>时值å‡åŠ(&H)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Double Durations</source>
<translation>æ—¶å€¼åŠ å€(&D)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Stretch or S&quash...</source>
<translation>拉伸或挤压(&Q)...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>Trans&pose</source>
<translation>移调(&P)</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1693"/>
+ <location line="-2888"/>
+ <location line="+2889"/>
<source>&Up a Semitone</source>
<translation>å‡é«˜ä¸€ä¸ªåŠéŸ³(&U)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Down a Semitone</source>
<translation>é™ä½Žä¸€ä¸ªåŠéŸ³(&D)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Up an &Octave</source>
<translation>å‡é«˜ä¸€ä¸ªå…«åº¦(&O)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>Down an Octa&ve</source>
<translation>é™ä½Žä¸€ä¸ªå…«åº¦(&V)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1693"/>
+ <location line="-2880"/>
+ <location line="+2889"/>
<source>&Transpose by Semitones...</source>
<translation>按åŠéŸ³ä¸ªæ•°ç§»è°ƒ(&T)...</translation>
</message>
<message>
- <location line="-1692"/>
- <location line="+1158"/>
+ <location line="-2888"/>
+ <location line="+1162"/>
+ <location line="+560"/>
+ <location line="+632"/>
<location line="+535"/>
- <location line="+1576"/>
- <location line="+434"/>
<source>Transpose by &Interval...</source>
<translation>按音程移调(&I)...</translation>
</message>
<message>
- <location line="-3702"/>
+ <location line="-2888"/>
<source>&Convert</source>
<translation>转æ¢(&C)</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1693"/>
+ <location line="+2889"/>
<source>&Invert</source>
<translation>翻转(&V)</translation>
</message>
<message>
- <location line="-1684"/>
- <location line="+1685"/>
+ <location line="-2880"/>
+ <location line="+2881"/>
<source>&Retrograde</source>
<translation>åå‘æ’放(&R)</translation>
</message>
<message>
- <location line="-1676"/>
- <location line="+1677"/>
+ <location line="-2872"/>
+ <location line="+2873"/>
<source>Re&trograde Invert</source>
<translation>翻转并åå‘æ’放(&T)</translation>
</message>
<message>
- <location line="-1676"/>
+ <location line="-2872"/>
<source>Trigger Se&gment...</source>
<translation>触å‘片段(&g)...</translation>
</message>
<message>
<location line="+153"/>
- <location line="+1793"/>
- <location line="+1431"/>
+ <location line="+1677"/>
+ <location line="+1312"/>
<source>&Tools</source>
<translation>工具(&T)</translation>
</message>
<message>
- <location line="-3223"/>
- <location line="+1793"/>
- <location line="+1431"/>
- <location line="+305"/>
+ <location line="-2988"/>
+ <location line="+988"/>
+ <location line="+689"/>
+ <location line="+1312"/>
<source>&Select and Edit</source>
<translation>选择并编辑(&S)</translation>
</message>
<message>
- <location line="-3520"/>
- <location line="+3224"/>
- <location line="+314"/>
+ <location line="-2980"/>
+ <location line="+997"/>
+ <location line="+680"/>
<source>&Draw</source>
<translation>绘制(&D)</translation>
</message>
<message>
- <location line="-3529"/>
- <location line="+1794"/>
- <location line="+1430"/>
- <location line="+314"/>
+ <location line="-1668"/>
+ <location line="+997"/>
+ <location line="+680"/>
+ <location line="+1313"/>
<source>&Erase</source>
<translation>擦除(&E)</translation>
</message>
<message>
- <location line="-3701"/>
+ <location line="-3153"/>
<location line="+172"/>
- <location line="+1552"/>
- <location line="+1672"/>
- <location line="+287"/>
+ <location line="+970"/>
+ <location line="+707"/>
+ <location line="+1071"/>
<source>&Move</source>
<translation>移动(&M)</translation>
</message>
<message>
- <location line="-3502"/>
+ <location line="-2739"/>
<source>Resi&ze</source>
<translation>调整大å°(&z)</translation>
</message>
<message>
<location line="+9"/>
- <location line="+3224"/>
- <location line="+305"/>
+ <location line="+988"/>
+ <location line="+689"/>
<source>S&plit</source>
<translation>拆分(&P)</translation>
</message>
<message>
- <location line="-3520"/>
+ <location line="-1668"/>
<source>&Velocity</source>
<translation>力度(&V)</translation>
</message>
<message>
- <source>Cursor &Back</source>
- <translation type="obsolete">å…‰æ ‡åŽé€€(&B)</translation>
- </message>
- <message>
- <source>Cursor &Forward</source>
- <translation type="obsolete">å…‰æ ‡å‰è¿›(&F)</translation>
- </message>
- <message>
- <source>Cursor For&ward Bar</source>
- <translation type="obsolete">å…‰æ ‡æ²¿è¿›ç¨‹æ¡å‰è¿›(&W)</translation>
- </message>
- <message>
- <source>Cursor to St&art</source>
- <translation type="obsolete">å…‰æ ‡ç§»åˆ°èµ·ç‚¹(&A)</translation>
- </message>
- <message>
- <source>Cursor to &End</source>
- <translation type="obsolete">å…‰æ ‡ç§»åˆ°æœ«å°¾(&E)</translation>
- </message>
- <message>
- <location line="+1526"/>
+ <location line="+2722"/>
<source>Cursor back and Se&lect</source>
<translation>å…‰æ ‡åŽé€€å¹¶é€‰ä¸(&l)</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Cursor Forward and &Select</source>
<translation>å…‰æ ‡å‰ç§»å¹¶é€‰ä¸(&S)</translation>
</message>
<message>
- <location line="-1697"/>
- <location line="+1724"/>
+ <location line="-2893"/>
+ <location line="+2920"/>
<source>Set Loop &to Selection</source>
<translation>将选ä¸åŒºåŸŸè®¾ç½®ä¸ºé‡å¤æ®µè½(&T)</translation>
</message>
<message>
- <location line="-1715"/>
- <location line="+1724"/>
+ <location line="-2911"/>
+ <location line="+2920"/>
<source>Clear L&oop</source>
<translation>清除循环(&o)</translation>
</message>
<message>
- <location line="-934"/>
- <location line="+48"/>
- <location line="+2539"/>
+ <location line="-1999"/>
+ <location line="+278"/>
+ <location line="+631"/>
<source>T&ransport</source>
<translation>æ’放控制(&R)</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+930"/>
- <location line="+1609"/>
+ <location line="-1803"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+631"/>
+ <location line="+1134"/>
<source>&Play</source>
<translation>æ’放(&P)</translation>
</message>
<message>
- <location line="-3350"/>
- <location line="+764"/>
- <location line="+48"/>
- <location line="+936"/>
- <location line="+1611"/>
+ <location line="-2937"/>
+ <location line="+895"/>
+ <location line="+278"/>
+ <location line="+639"/>
+ <location line="+1132"/>
<source>&Stop</source>
<translation>åœæ¢(&S)</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+734"/>
- <location line="+48"/>
- <location line="+972"/>
- <location line="+1583"/>
+ <location line="-2913"/>
+ <location line="+865"/>
+ <location line="+278"/>
+ <location line="+647"/>
+ <location line="+1160"/>
<source>Re&wind</source>
<translation>倒带(&W)</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+726"/>
- <location line="+48"/>
- <location line="+980"/>
- <location line="+1583"/>
+ <location line="-2941"/>
+ <location line="+857"/>
+ <location line="+278"/>
+ <location line="+655"/>
+ <location line="+1160"/>
<source>&Fast Forward</source>
<translation>å¿«è¿›(&F)</translation>
</message>
<message>
- <location line="-3328"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+988"/>
+ <location line="-2941"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1823"/>
<source>Rewind to &Beginning</source>
<translation>跳转到起点(&B)</translation>
</message>
<message>
- <location line="-1753"/>
- <location line="+718"/>
- <location line="+48"/>
- <location line="+994"/>
+ <location line="-2949"/>
+ <location line="+849"/>
+ <location line="+278"/>
+ <location line="+1829"/>
<source>Fast Forward to &End</source>
<translation>快进到末尾(&E)</translation>
</message>
<message>
- <location line="-1759"/>
- <location line="+1775"/>
+ <location line="-2955"/>
+ <location line="+2971"/>
<source>S&olo</source>
<translation>独å¥(&o)</translation>
</message>
<message>
- <location line="-1774"/>
- <location line="+1781"/>
- <location line="+1571"/>
+ <location line="-2970"/>
+ <location line="+1805"/>
+ <location line="+1172"/>
<source>Scro&ll to Follow Playback</source>
<translation>æ’放时滚动视图(&l)</translation>
</message>
<message>
- <location line="-3343"/>
- <location line="+709"/>
- <location line="+48"/>
- <location line="+1030"/>
- <location line="+1565"/>
+ <location line="-2968"/>
+ <location line="+840"/>
+ <location line="+278"/>
+ <location line="+687"/>
+ <location line="+1178"/>
<source>P&anic</source>
<translation>å¤åŽŸ(&a)</translation>
</message>
<message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <location line="-3125"/>
- <location line="+1908"/>
+ <location line="-2756"/>
+ <location line="+3104"/>
<source>&Upper Octave</source>
<translation>高八度(&U)</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1917"/>
+ <location line="-2796"/>
+ <location line="+3113"/>
<source>C&hord Insert Mode</source>
<translation>和弦æ’入模å¼(&H)</translation>
</message>
<message>
- <location line="-1908"/>
- <location line="+1936"/>
+ <location line="-3104"/>
+ <location line="+3132"/>
<source>Ste&p Recording</source>
<translation>å•æ¥å½•éŸ³(&p)</translation>
</message>
<message>
- <location line="-2823"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-4019"/>
+ <location line="+1735"/>
+ <location line="+753"/>
<source>&Toolbars</source>
<translation>工具æ (&T)</translation>
</message>
<message>
- <location line="-3275"/>
- <location line="+1301"/>
- <location line="+1981"/>
+ <location line="-2481"/>
+ <location line="+1735"/>
+ <location line="+761"/>
<source>&Rulers</source>
<translation>æ ‡å°º(&R)</translation>
</message>
<message>
- <location line="-3281"/>
- <location line="+1301"/>
+ <location line="-2495"/>
+ <location line="+2496"/>
<source>Show Ch&ord Name Ruler</source>
<translation>显示和弦åç§°æ ‡å°º(&O)</translation>
</message>
<message>
- <location line="-1300"/>
- <location line="+1302"/>
+ <location line="-2495"/>
+ <location line="+2497"/>
<source>Show &Tempo Ruler</source>
<translation>æ˜¾ç¤ºé€Ÿåº¦æ ‡å°º(&T)</translation>
</message>
<message>
- <location line="-407"/>
- <location line="+1936"/>
- <location line="+882"/>
+ <location line="-1602"/>
+ <location line="+1271"/>
+ <location line="+1861"/>
<source>Tools Toolbar</source>
<translation>工具工具æ </translation>
</message>
<message>
- <location line="-2671"/>
- <location line="+48"/>
- <location line="+2569"/>
+ <location line="-2854"/>
+ <location line="+278"/>
+ <location line="+661"/>
<source>&Record</source>
<translation>录音(&R)</translation>
</message>
<message>
- <location line="-2559"/>
+ <location line="-651"/>
<source>&Settings</source>
<translation>设置(&S)</translation>
</message>
@@ -2941,7 +2874,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-95"/>
<source>Switch to Inserting Tool</source>
<translation>切æ¢åˆ°è¾“入工具</translation>
</message>
@@ -2951,13 +2884,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <location line="+1990"/>
+ <location line="+203"/>
+ <location line="+752"/>
<source>&Print...</source>
<translation>打å°(&P)...</translation>
</message>
<message>
- <location line="-1991"/>
+ <location line="-1"/>
<source>P&rint Preview...</source>
<translation>打å°é¢„览(&R)...</translation>
</message>
@@ -3022,10 +2955,6 @@
<translation type="unfinished">é—´è·</translation>
</message>
<message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">音长 </translation>
- </message>
- <message>
<location line="+1"/>
<source>&Layout Mode</source>
<translation>布局模å¼(&L)</translation>
@@ -3051,36 +2980,32 @@
<translation>打开æŒè¯ç¼–辑器(&Y)</translation>
</message>
<message>
- <source>Add Event Ruler</source>
- <translation type="obsolete">æ·»åŠ äº‹ä»¶æ ‡å°º</translation>
- </message>
- <message>
<location line="+23"/>
<source>Show &Track Headers</source>
<translation>显示音轨头(&T)</translation>
</message>
<message>
- <location line="-1275"/>
- <location line="+1287"/>
- <location line="+2065"/>
- <location line="+371"/>
+ <location line="-2470"/>
+ <location line="+1182"/>
+ <location line="+623"/>
+ <location line="+678"/>
<source>Open in &Percussion Matrix Editor</source>
<translation>在鼓Matrix编辑器ä¸æ‰“å¼€(&P)</translation>
</message>
<message>
- <location line="-2434"/>
+ <location line="+2"/>
<source>Add Cle&f Change...</source>
<translation>æ·»åŠ è°±å·(&F)...</translation>
</message>
<message>
- <location line="-1288"/>
- <location line="+1290"/>
+ <location line="-2484"/>
+ <location line="+2486"/>
<source>Add &Key Change...</source>
<translation>æ·»åŠ è°ƒå·(&K)...</translation>
</message>
<message>
- <location line="-1125"/>
- <location line="+1724"/>
+ <location line="-2321"/>
+ <location line="+2920"/>
<source>Insert Pitch &Bend Sequence...</source>
<translation>æ’入弯音轮åºåˆ—(&B)...</translation>
</message>
@@ -3095,13 +3020,13 @@
<translation>æ·»åŠ è¸æ¿é‡Šæ”¾äº‹ä»¶(&R)</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+2111"/>
+ <location line="-628"/>
+ <location line="+632"/>
<source>&Convert Notation for...</source>
<translation>转æ¢ä¹è°±(&C)...</translation>
</message>
<message>
- <location line="-2110"/>
+ <location line="+1"/>
<source>Add &Layer</source>
<translation>æ·»åŠ å£°éƒ¨(&L)</translation>
</message>
@@ -3117,7 +3042,7 @@
<translation>音符(&O)</translation>
</message>
<message>
- <location line="-1510"/>
+ <location line="-2706"/>
<source>Nothing to &Undo</source>
<translation type="unfinished"></translation>
</message>
@@ -3127,7 +3052,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1502"/>
+ <location line="+2698"/>
<source>Mar&ks</source>
<translation>æ ‡è®°(&K)</translation>
</message>
@@ -3409,8 +3334,8 @@
<translation>æ¢å¤ç¬¦å¹²(&R)</translation>
</message>
<message>
- <location line="-1480"/>
- <location line="+1481"/>
+ <location line="-2676"/>
+ <location line="+2677"/>
<source>&Phrase</source>
<translation>ä¹å¥(&P)</translation>
</message>
@@ -3486,14 +3411,14 @@
<translation>è¿žå¥çº¿å‘下(&B)</translation>
</message>
<message>
- <location line="-1549"/>
- <location line="+1550"/>
+ <location line="-2745"/>
+ <location line="+2746"/>
<source>T&ie</source>
<translation>连音线(&I)</translation>
</message>
<message>
- <location line="-1541"/>
- <location line="+1550"/>
+ <location line="-2737"/>
+ <location line="+2746"/>
<source>&Untie</source>
<translation>å–消连音线(&U)</translation>
</message>
@@ -3573,14 +3498,14 @@
<translation>è§„æ ¼åŒ–ä¼‘æ¢ç¬¦(&N)</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1472"/>
+ <location line="-1264"/>
+ <location line="+1271"/>
<source>Ctrl+N</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+N</translation>
</message>
<message>
- <location line="-1470"/>
+ <location line="+2"/>
<source>&Collapse Rests</source>
<translation type="unfinished">压缩休æ¢ç¬¦(&C)</translation>
</message>
@@ -3590,8 +3515,8 @@
<translation>音符(&N)</translation>
</message>
<message>
- <location line="-1546"/>
- <location line="+1554"/>
+ <location line="-2742"/>
+ <location line="+2750"/>
<source>Ctrl+=</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+=</translation>
@@ -3677,13 +3602,13 @@
<translation>微调时间(&M)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+1550"/>
+ <location line="-1183"/>
+ <location line="+1193"/>
<source>Jog &Right</source>
<translation type="unfinished">å³ç§»ä¸€å¸§(&R)</translation>
</message>
<message>
- <location line="-1541"/>
+ <location line="+9"/>
<source>&Visibility</source>
<translation>å¯è§æ€§(&V)</translation>
</message>
@@ -3740,26 +3665,26 @@
<translation>下一谱表(&D)</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Pre&vious Segment</source>
<translation>å‰ä¸€ä¸ªç‰‡æ®µ(&V)</translation>
</message>
<message>
- <location line="-1733"/>
- <location line="+1742"/>
+ <location line="-2929"/>
+ <location line="+2938"/>
<source>Ne&xt Segment</source>
<translation>下一个片段(&X)</translation>
</message>
<message>
- <location line="-1731"/>
- <location line="+1754"/>
+ <location line="-2927"/>
+ <location line="+2950"/>
<source>Step &Back</source>
<translation>å…‰æ ‡åŽé€€(&B)</translation>
</message>
<message>
- <location line="-1739"/>
- <location line="+1754"/>
+ <location line="-2935"/>
+ <location line="+2950"/>
<source>Step &Forward</source>
<translation>å…‰æ ‡å‰è¿›(&F)</translation>
</message>
@@ -3904,26 +3829,14 @@
<translation>å‰ä»–和弦(&G)</translation>
</message>
<message>
- <source>Cursor &Up Staff</source>
- <translation type="obsolete">å…‰æ ‡ä¸Šç§»äº”çº¿è°±(&U)</translation>
- </message>
- <message>
- <source>Cursor &Down Staff</source>
- <translation type="obsolete">å…‰æ ‡ä¸‹ç§»äº”çº¿è°±(&D)</translation>
- </message>
- <message>
- <source>Cursor Ne&xt Segment</source>
- <translation type="obsolete">创建å°èŠ‚</translation>
- </message>
- <message>
- <location line="-1784"/>
- <location line="+1908"/>
+ <location line="-2980"/>
+ <location line="+3104"/>
<source>&Insert Note</source>
<translation>æ’入音符(&I)</translation>
</message>
<message>
- <location line="-1600"/>
- <location line="+1908"/>
+ <location line="-2796"/>
+ <location line="+3104"/>
<source>&Lower Octave</source>
<translation>低八度(&L)</translation>
</message>
@@ -3943,13 +3856,13 @@
<translation>装饰音输入模å¼(&M)</translation>
</message>
<message>
- <location line="-1527"/>
- <location line="+1989"/>
+ <location line="-2281"/>
+ <location line="+753"/>
<source>Show T&ools Toolbar</source>
<translation>显示工具工具æ (&O)</translation>
</message>
<message>
- <location line="-1988"/>
+ <location line="+1"/>
<source>Show &Accidentals Toolbar</source>
<translation>显示临时å‡é™å·å·¥å…·æ (&A)</translation>
</message>
@@ -3969,18 +3882,18 @@
<translation>显示分组工具æ (&G)</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+1986"/>
+ <location line="-754"/>
+ <location line="+756"/>
<source>Show Trans&port Toolbar</source>
<translation>æ˜¾ç¤ºä¼ é€æŽ§åˆ¶å·¥å…·æ (&P)</translation>
</message>
<message>
- <location line="-1985"/>
+ <location line="+1"/>
<source>Show &Layout Toolbar</source>
<translation>显示布局工具æ (&L)</translation>
</message>
<message>
- <location line="+1821"/>
+ <location line="-921"/>
<source>Ctrl+O</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+O</translation>
@@ -3993,13 +3906,13 @@
</message>
<message>
<location line="+91"/>
- <location line="+841"/>
+ <location line="+613"/>
<source>Ctrl+Shift+V</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+V</translation>
</message>
<message>
- <location line="-832"/>
+ <location line="-604"/>
<source>Ctrl+Shift+Ins</source>
<comment>keyboard shortcut</comment>
<translation>Ctrl+Shift+Ins</translation>
@@ -4010,7 +3923,7 @@
<translation>显示和弦åç§°æ ‡å°º(&R)</translation>
</message>
<message>
- <location line="-1981"/>
+ <location line="+761"/>
<source>Show Ra&w Note Ruler</source>
<translation>æ˜¾ç¤ºåŽŸå§‹éŸ³ç¬¦æ ‡å°º(&W)</translation>
</message>
@@ -4025,7 +3938,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1706"/>
+ <location line="+1707"/>
<source>Clefs Toolbar</source>
<translation>è°±å·å·¥å…·æ </translation>
</message>
@@ -4045,7 +3958,7 @@
<translation>æ ‡è®°å·¥å…·æ </translation>
</message>
<message>
- <location line="-3134"/>
+ <location line="-4330"/>
<source>Select &All Events</source>
<translation>选择所有事件(&A)</translation>
</message>
@@ -4066,90 +3979,54 @@
</message>
<message>
<location line="+886"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>Rosegarden &Manual</source>
<translation>Rosegarden 用户手册(&M)</translation>
</message>
<message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <location line="-4074"/>
- <location line="+288"/>
+ <location line="-4102"/>
+ <location line="+1116"/>
<source>Preferences...</source>
<translation>设置...</translation>
</message>
<message>
- <source>0</source>
- <translation type="obsolete">0</translation>
- </message>
- <message>
- <source>3</source>
- <translation type="obsolete">A3</translation>
- </message>
- <message>
- <source>6</source>
- <translation type="obsolete">A6</translation>
- </message>
- <message>
- <source>4</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
- <source>2</source>
- <translation type="obsolete">A2</translation>
- </message>
- <message>
- <source>1</source>
- <translation type="obsolete">%1</translation>
- </message>
- <message>
- <source>5</source>
- <translation type="obsolete">A5</translation>
- </message>
- <message>
- <location line="+91"/>
- <location line="+1302"/>
+ <location line="-1025"/>
+ <location line="+2497"/>
<source>Show &Velocity Ruler</source>
<translation>æ˜¾ç¤ºåŠ›åº¦æ ‡å°º(&V)</translation>
</message>
<message>
- <location line="-1301"/>
- <location line="+1302"/>
+ <location line="-2496"/>
+ <location line="+2497"/>
<source>Show Pitch &Bend Ruler</source>
<translation>æ˜¾ç¤ºå¼¯éŸ³è½®æ ‡å°º(&B)</translation>
</message>
<message>
- <location line="-1104"/>
+ <location line="-2299"/>
<source>Cursor Back and Se&lect</source>
<translation>å…‰æ ‡åŽé€€å¹¶é€‰ä¸(&L)</translation>
</message>
<message>
<location line="+698"/>
- <location line="+2123"/>
+ <location line="+3319"/>
<source>Rulers Toolbar</source>
<translation>æ ‡å°ºå·¥å…·æ </translation>
</message>
<message>
- <location line="-1747"/>
- <location line="+1996"/>
+ <location line="-2494"/>
+ <location line="+746"/>
<source>&Preferences...</source>
<translation>选项(&P)...</translation>
</message>
<message>
- <location line="-1975"/>
+ <location line="+21"/>
<source>Show &Rulers Toolbar</source>
<translation>æ˜¾ç¤ºæ ‡å°ºå·¥å…·æ (&R)</translation>
</message>
<message>
- <source>Rewind</source>
- <translation type="obsolete">回绕</translation>
- </message>
- <message>
- <location line="-1008"/>
- <location line="+1754"/>
+ <location line="-2203"/>
+ <location line="+2950"/>
<source>Step Back (Left)</source>
<translation>å…‰æ ‡åŽé€€</translation>
</message>
@@ -4159,13 +4036,13 @@
<translation>æ’放</translation>
</message>
<message>
- <location line="-1717"/>
- <location line="+1754"/>
+ <location line="-2913"/>
+ <location line="+2950"/>
<source>Step Forward (Right)</source>
<translation>å…‰æ ‡å¿«è¿›</translation>
</message>
<message>
- <location line="-2673"/>
+ <location line="-1846"/>
<source>&Action</source>
<translation>动作(&A)</translation>
</message>
@@ -4185,7 +4062,7 @@
<translation>帮助</translation>
</message>
<message>
- <location line="+607"/>
+ <location line="-1416"/>
<source>Show A&ctions Toolbar</source>
<translation>显示动作工具æ (&C)</translation>
</message>
@@ -4196,31 +4073,31 @@
</message>
<message>
<location line="+25"/>
- <location line="+1550"/>
+ <location line="+2746"/>
<source>`</source>
<comment>keyboard shortcut</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1379"/>
- <location line="+1723"/>
+ <location line="-2575"/>
+ <location line="+2919"/>
<source>Co&ntrollers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1723"/>
+ <location line="-2916"/>
+ <location line="+2919"/>
<source>&Set Controller Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1720"/>
- <location line="+1724"/>
+ <location line="-2916"/>
+ <location line="+2920"/>
<source>Insert C&ontroller Sequence...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-810"/>
+ <location line="-1645"/>
<source>Panning &Law</source>
<translation type="unfinished"></translation>
</message>
@@ -4245,7 +4122,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+116"/>
+ <location line="+950"/>
<source>&Move to Staff Above...</source>
<translation type="unfinished"></translation>
</message>
@@ -4270,14 +4147,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <location line="+2091"/>
- <location line="+371"/>
+ <location line="-1265"/>
+ <location line="+623"/>
+ <location line="+652"/>
<source>Open in &Pitch Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2180"/>
+ <location line="+282"/>
<source>&Figuration</source>
<translation type="unfinished"></translation>
</message>
@@ -4550,21 +4427,21 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+478"/>
- <location line="+516"/>
+ <location line="-1749"/>
+ <location line="+2227"/>
<source>P</source>
<comment>keyboard shortcut</comment>
<translation>P</translation>
</message>
<message>
- <location line="-498"/>
- <location line="+1190"/>
+ <location line="-4302"/>
+ <location line="+4320"/>
<source>G</source>
<comment>keyboard shortcut</comment>
<translation>G</translation>
</message>
<message>
- <location line="-1188"/>
+ <location line="+2"/>
<source>Tuplet Insert Mo&de</source>
<translation type="unfinished"></translation>
</message>
@@ -4735,7 +4612,7 @@
<translation>层工具æ </translation>
</message>
<message>
- <location line="+32"/>
+ <location line="-4419"/>
<source>Switch to Insert Tool</source>
<translation>切æ¢åˆ°æ’入工具</translation>
</message>
@@ -4790,7 +4667,7 @@
<translation>设置å¯è§</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+1097"/>
<source>Auto-Beam when appropriate</source>
<translation>自动符æ </translation>
</message>
@@ -4830,7 +4707,7 @@
<translation>é‡é™è®°å·</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+620"/>
<source>&New</source>
<translation>新建(&N)</translation>
</message>
@@ -4840,14 +4717,6 @@
<translation>导入(&I)</translation>
</message>
<message>
- <source>Import Rosegarden &Project file...</source>
- <translation type="obsolete">导入 Rosegarden 项目文件(&P)...</translation>
- </message>
- <message>
- <source>Import &MIDI file...</source>
- <translation type="obsolete">导入 MIDI 文件(&M)...</translation>
- </message>
- <message>
<location line="+4"/>
<source>Import &Hydrogen file...</source>
<translation>导入 Hydrogen 文件(&H)...</translation>
@@ -4863,10 +4732,6 @@
<translation>åˆå¹¶æ–‡ä»¶(&F)...</translation>
</message>
<message>
- <source>Merge &MIDI file...</source>
- <translation type="obsolete">åˆå¹¶ MIDI 文件(&M)...</translation>
- </message>
- <message>
<location line="+3"/>
<source>Merge &Hydrogen file...</source>
<translation>åˆå¹¶ Hydrogen 文件(&H)...</translation>
@@ -4877,26 +4742,6 @@
<translation>导出(&E)</translation>
</message>
<message>
- <source>Export Rosegarden &Project file...</source>
- <translation type="obsolete">导出 RoseGarden 项目文件(&P)...</translation>
- </message>
- <message>
- <source>Export &MIDI file...</source>
- <translation type="obsolete">导出 MIDI 文件(&M)...</translation>
- </message>
- <message>
- <source>Export &Csound score file...</source>
- <translation type="obsolete">导出 Csound ä¹è°±æ–‡ä»¶(&C)...</translation>
- </message>
- <message>
- <source>Export M&up file...</source>
- <translation type="obsolete">导出 Mup 文件(&U)...</translation>
- </message>
- <message>
- <source>Export Music&XML file...</source>
- <translation type="obsolete">导出 MusicXML 文件(&X)...</translation>
- </message>
- <message>
<location line="+7"/>
<source>&Open...</source>
<translation>打开(&O)...</translation>
@@ -4907,10 +4752,6 @@
<translation>打开最近文件(&R)</translation>
</message>
<message>
- <source>Save &As...</source>
- <translation type="obsolete">å¦å˜ä¸º(&A)...</translation>
- </message>
- <message>
<location line="+19"/>
<source>Save as &Template...</source>
<translation>å¦å˜ä¸ºæ¨¡æ¿(&T)...</translation>
@@ -5027,13 +4868,13 @@
<translation>在æ’放ä½ç½®è®¾ç½®å¿«é€Ÿæ ‡ç¾(&S)</translation>
</message>
<message>
- <location line="-1234"/>
- <location line="+1243"/>
+ <location line="+9"/>
+ <location line="+1500"/>
<source>&Jump to Quick Marker</source>
<translation>è·³åˆ°å¿«é€Ÿæ ‡ç¾(&J)</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="-1491"/>
<source>&Studio</source>
<translation type="unfinished">工作环境(&S)</translation>
</message>
@@ -5088,62 +4929,54 @@
<translation>将当å‰æ–‡æ¡£ä¿å˜ä¸ºé»˜è®¤å·¥ä½œçŽ¯å¢ƒ(&S)</translation>
</message>
<message>
- <source>Se&gments</source>
- <translation type="obsolete">片段(&G)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Toggle Repeat</source>
<translation>切æ¢åå¤</translation>
</message>
<message>
- <source>Open in &Default editor</source>
- <translation type="obsolete">在默认编辑器ä¸æ‰“å¼€(&D)</translation>
+ <location line="-478"/>
+ <location line="+542"/>
+ <source>R&elabel...</source>
+ <translation type="unfinished">é‡æ–°æ ‡è®°(&E)...</translation>
</message>
<message>
- <location line="+64"/>
- <location line="+452"/>
- <source>R&elabel...</source>
- <translation type="unfinished">é‡æ–°æ ‡è®°(&E)...</translation>
- </message>
- <message>
- <location line="-442"/>
- <location line="+433"/>
+ <location line="-551"/>
+ <location line="+561"/>
<source>Repe&at Last Quantize</source>
<translation>é‡åšä¸Šä¸€ä¸ªé‡åŒ–(&A)</translation>
</message>
<message>
- <location line="-422"/>
+ <location line="+11"/>
<source>Stretch &or Squash...</source>
<translation>拉伸或挤压(&O)...</translation>
</message>
<message>
- <location line="-3407"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-1860"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set Start &Time...</source>
<translation>设置起始时间(&T)...</translation>
</message>
<message>
- <location line="-3408"/>
- <location line="+1292"/>
- <location line="+2117"/>
+ <location line="-2487"/>
+ <location line="+1862"/>
+ <location line="+626"/>
<source>Set &Duration...</source>
<translation>设置时值(&D)...</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-628"/>
<source>Create &Anacrusis...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <location line="+382"/>
+ <location line="-591"/>
+ <location line="+612"/>
<source>Join</source>
<translation>åˆå¹¶</translation>
</message>
<message>
- <location line="-373"/>
+ <location line="+9"/>
<source>&Split</source>
<translation>拆分(&S)</translation>
</message>
@@ -5258,26 +5091,26 @@
<translation>é‡æ–°æ˜ å°„ä¹å™¨(&R)...</translation>
</message>
<message>
- <location line="+38"/>
- <location line="+305"/>
+ <location line="-651"/>
+ <location line="+689"/>
<source>&Resize</source>
<translation>调整大å°(&R)</translation>
</message>
<message>
- <location line="-241"/>
+ <location line="+64"/>
<source>P&unch in Record</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4041"/>
- <location line="+365"/>
- <location line="+1293"/>
- <location line="+1989"/>
+ <location line="-2129"/>
+ <location line="+1039"/>
+ <location line="+696"/>
+ <location line="+753"/>
<source>Show Main &Toolbar</source>
<translation>显示主工具æ (&T)</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-751"/>
<source>Show Trac&ks Toolbar</source>
<translation>显示音轨工具æ (&K)</translation>
</message>
@@ -5292,27 +5125,19 @@
<translation>显示缩放工具æ (&Z)</translation>
</message>
<message>
- <location line="-3651"/>
- <location line="+369"/>
- <location line="+1301"/>
- <location line="+2007"/>
+ <location line="-1735"/>
+ <location line="+1035"/>
+ <location line="+726"/>
+ <location line="+735"/>
<source>Show St&atusbar</source>
<translation>显示状æ€æ (&A)</translation>
</message>
<message>
- <location line="-24"/>
+ <location line="-759"/>
<source>Show Playback Position R&uler</source>
<translation>显示æ’放ä½ç½®æ ‡å°º(&U)</translation>
</message>
<message>
- <source>Import &X11 Rosegarden file...</source>
- <translation type="obsolete">导入 &X11 Rosegarden 文件...</translation>
- </message>
- <message>
- <source>Merge &X11 Rosegarden file...</source>
- <translation type="obsolete">åˆå¹¶ &X11 Rosegarden 文件...</translation>
- </message>
- <message>
<location line="+63"/>
<source>MIDI Mi&xer</source>
<translation>MIDI 混音器(&x)</translation>
@@ -5323,10 +5148,6 @@
<translation>æ˜¾ç¤ºé€Ÿåº¦æ ‡å°º(&M)</translation>
</message>
<message>
- <source>Export &LilyPond file...</source>
- <translation type="obsolete">导出 &LilyPond 文件...</translation>
- </message>
- <message>
<location line="+1"/>
<source>Show Tra&nsport</source>
<translation>显示æ’放控制器(&N)</translation>
@@ -5373,26 +5194,26 @@
<translation>编辑器工具æ </translation>
</message>
<message>
- <location line="-1634"/>
- <location line="+1636"/>
+ <location line="+2"/>
+ <location line="+1107"/>
<source>Rewind to Beginning</source>
<translation>跳转到起点</translation>
</message>
<message>
- <location line="-1629"/>
- <location line="+1638"/>
+ <location line="-1098"/>
+ <location line="+1105"/>
<source>Fast Forward to End</source>
<translation>跳转到终点</translation>
</message>
<message>
- <location line="-2833"/>
- <location line="+1936"/>
- <location line="+880"/>
+ <location line="-2391"/>
+ <location line="+1269"/>
+ <location line="+1863"/>
<source>&Support Rosegarden</source>
<translation>Rosegarden 软件支æŒ(&S)</translation>
</message>
<message>
- <location line="-620"/>
+ <location line="-2483"/>
<source>Import Rosegarden &Project File...</source>
<translation type="unfinished"></translation>
</message>
@@ -5467,13 +5288,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
- <location line="+371"/>
+ <location line="-570"/>
+ <location line="+623"/>
<source>Open in &Default Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-257"/>
+ <location line="+114"/>
<source>&Update all Figurations</source>
<translation type="unfinished"></translation>
</message>
@@ -5484,7 +5305,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+300"/>
+ <location line="+151"/>
<source>Insert Tempo Change</source>
<translation>æ’入速度å˜åŒ–</translation>
</message>
@@ -5524,7 +5345,7 @@
<translation>打开速度和æ‹å·ç¼–辑器</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="-2552"/>
<source>&Edit Item</source>
<translation>编辑事件(&E)</translation>
</message>
@@ -5544,7 +5365,7 @@
<translation>设置(&P)</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+2591"/>
<source>Pa&ste as New Triggered Segment</source>
<translation>粘贴为新的触å‘片段(&S)</translation>
</message>
@@ -5574,7 +5395,7 @@
<translation>低音</translation>
</message>
<message>
- <location filename="../QMenuStrings.cpp" line="-2626"/>
+ <location filename="../QMenuStrings.cpp" line="+345"/>
<location filename="../InstrumentStrings.cpp" line="-74"/>
<source>Triangle</source>
<translation>三角</translation>
@@ -7349,26 +7170,6 @@
<translation>B#</translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">C#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">ID</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">F#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">G#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../AutoloadStrings.cpp" line="-24"/>
<source>General MIDI Device</source>
<translation>通用MIDI设备</translation>
@@ -8554,16 +8355,16 @@
<translation><æ— ></translation>
</message>
<message>
+ <location filename="../../src/sound/AlsaDriver.cpp" line="+684"/>
<location filename="../../src/base/Studio.cpp" line="+61"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+670"/>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+526"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="+535"/>
<location filename="../AutoloadStrings.cpp" line="-258"/>
<source>Synth plugin</source>
<translation>åˆæˆå™¨æ’件</translation>
</message>
<message>
- <location line="-3"/>
- <location filename="../../src/sound/AlsaDriver.cpp" line="+37"/>
+ <location line="+37"/>
+ <location filename="../../src/base/Studio.cpp" line="-3"/>
<location filename="../AutoloadStrings.cpp" line="-1"/>
<source>Audio</source>
<translation>音频</translation>
@@ -10704,20 +10505,15 @@
<translation>未知</translation>
</message>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+306"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+460"/>
- <location line="+132"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="+716"/>
+ <location line="+131"/>
<source>%1. %2</source>
<translation>%1. %2</translation>
</message>
<message>
+ <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+448"/>
<location filename="../../src/gui/general/ActionFileParser.cpp" line="+643"/>
<location line="+7"/>
- <location filename="../../src/gui/studio/DeviceManagerDialog.cpp" line="+458"/>
<source>%1</source>
<translation>%1</translation>
</message>
@@ -10732,10 +10528,10 @@
<translation>%1 (%2)</translation>
</message>
<message>
+ <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+907"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1683"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1049"/>
<location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+468"/>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="+1012"/>
- <location filename="../../src/gui/editors/notation/NotationView.cpp" line="+904"/>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="+1651"/>
<source>%1 Controller %2 %3</source>
<translation>%1 控制器 %2 %3</translation>
</message>
@@ -10750,7 +10546,7 @@
<translation>Rosegarden</translation>
</message>
<message>
- <location line="+327"/>
+ <location line="+334"/>
<source>Welcome!</source>
<translation>欢迎!</translation>
</message>
@@ -10858,45 +10654,57 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+179"/>
+ <location line="+181"/>
<source><qt><p>Couldn't start recording audio.</p><p>Please set a valid recording path in <b>Composition -> Edit Document Properties... -> Audio</b></p></qt></source>
<translation><qt><p>æ— æ³•å¼€å§‹å½•åˆ¶éŸ³é¢‘.</p><p>请在 <b>编曲 -> 编辑文档属性... -> 音频</b>下设置一个有效的录音路径</p></qt></translation>
</message>
<message>
- <location filename="../../src/sound/MidiFile.cpp" line="+110"/>
+ <location filename="../../src/sound/MidiFile.cpp" line="+80"/>
<source>Wrong length for long data in MIDI stream</source>
<translation>MIDI æ•°æ®æµä¸çš„é•¿æ•°æ®çš„长度错误</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+20"/>
<source>Wrong length for int data in MIDI stream</source>
<translation>MIDI æ•°æ®æµä¸çš„æ•´æ•°æ•°æ®é•¿åº¦é”™è¯¯</translation>
</message>
<message>
<location line="+20"/>
- <location line="+47"/>
<source>End of MIDI file encountered while reading</source>
<translation>读å–æ—¶é‡åˆ° MIDI 文件末尾</translation>
</message>
<message>
- <location line="-43"/>
- <location line="+59"/>
+ <location line="+7"/>
<source>Attempt to get more bytes than expected on Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-38"/>
- <location line="+58"/>
+ <location line="+15"/>
<source>Attempt to read past MIDI file end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+86"/>
+ <source>File corrupted or in non-standard format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <location line="+5"/>
+ <source>Not a MIDI file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Unexpected MIDI file format</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Invalid event code found</source>
- <translation>å‘çŽ°æ— æ•ˆçš„äº‹ä»¶ä»£ç </translation>
+ <translation type="obsolete">å‘çŽ°æ— æ•ˆçš„äº‹ä»¶ä»£ç </translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+93"/>
<source>Running status used for first event in track</source>
<translation type="unfinished"></translation>
</message>
@@ -11003,7 +10811,7 @@
<translation type="unfinished">声音文件已æŸå</translation>
</message>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+176"/>
+ <location filename="../../src/gui/editors/matrix/MatrixElement.cpp" line="+179"/>
<source>This event is tied to another event.</source>
<translation type="unfinished"></translation>
</message>
@@ -11049,10 +10857,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>G</source>
- <translation type="obsolete">G</translation>
- </message>
- <message>
<location filename="../../src/base/figuration/SegmentFigData.cpp" line="+53"/>
<source>Replace segment contents</source>
<translation type="unfinished"></translation>
@@ -11097,6 +10901,58 @@
<source>Update Figurations</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
+ <source>LilyPond does not allow spaces or backslashes in filenames.
+
+Would you like to use
+
+ %1
+
+ instead?</source>
+ <translation type="unfinished">Lilypond ä¸å…许文件åä¸å‡ºçŽ°ç©ºæ ¼æˆ–åæ–œæ .
+
+您希望用
+
+ %1
+
+ æ¥ä»£æ›¿å—?</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Export failed. The file could not be opened for writing.</source>
+ <translation type="unfinished">导出失败. æ— æ³•æ‰“å¼€æ–‡ä»¶ä»¥å†™å…¥.</translation>
+ </message>
+ <message>
+ <location line="+169"/>
+ <source>Export succeeded, but the composition was empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Export of selected track failed. There are no segments on the selected track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Export of selected segments failed. No segments are selected.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1869"/>
+ <source>warning: overlong bar truncated here</source>
+ <translation type="unfinished">è¦å‘Š: 过长的å°èŠ‚截æ–于æ¤</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>warning: bar too short, padding with rests</source>
+ <translation type="unfinished">è¦å‘Š: å°èŠ‚太çŸ, 以休æ¢ç¬¦å¡«å……</translation>
+ </message>
</context>
<context>
<name>Rosegarden::AboutDialog</name>
@@ -11112,17 +10968,9 @@
</message>
<message>
<location line="+6"/>
- <source><p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
+ <source><p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p></source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source><p>Copyright 2000-2011 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>版æƒæ‰€æœ‰ 2000-2010 Rosegarden å¼€å‘组</p><p>版本: %1 Qt 版本: %2<br>Build key: %3</p><p>Rosegarden ç”±æ¥è‡ªå…¨çƒçš„志愿者组织æä¾›. 贡献者列表å‚è§ <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>关于 Rosegarden 的更多信æ¯, è§ <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p> {2000-2011 ?} {1 ?} {2<?} {3<?} {2<?}</translation>
- </message>
- <message>
- <source><p>Copyright 2000-2010 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></source>
- <translation type="obsolete"><p>版æƒæ‰€æœ‰ 2000-2010 Rosegarden å¼€å‘组</p><p>版本: %1 Qt 版本: %2<br>Build key: %3</p><p>Rosegarden ç”±æ¥è‡ªå…¨çƒçš„志愿者组织æä¾›. 贡献者列表å‚è§ <a style="color:gold" href="http://www.rosegardenmusic.com/resources/authors">http://www.rosegardenmusic.com/resources/authors</a>.<br>关于 Rosegarden 的更多信æ¯, è§ <a style="color:gold" href="http://www.rosegardenmusic.com">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2</p></translation>
- </message>
</context>
<context>
<name>Rosegarden::ActionCommandArgumentQuerier</name>
@@ -11182,12 +11030,12 @@
<context>
<name>Rosegarden::AddIndicationCommand</name>
<message>
- <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+107"/>
+ <location filename="../../src/commands/notation/AddIndicationCommand.cpp" line="+108"/>
<source>Can't add identical overlapping indications</source>
<translation>ä¸èƒ½é‡å æ·»åŠ ç›¸åŒç¬¦å·</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+134"/>
<source>Add S&lur</source>
<translation>æ·»åŠ è¿žéŸ³çº¿(&L)</translation>
</message>
@@ -11682,14 +11530,6 @@
<translation type="unfinished">æ£åœ¨å¯¼å‡ºéŸ³é¢‘文件...</translation>
</message>
<message>
- <source>Resampling audio file...</source>
- <translation type="obsolete">æ£åœ¨å¯¼å‡ºéŸ³é¢‘文件...</translation>
- </message>
- <message>
- <source>Converting and resampling audio file...</source>
- <translation type="obsolete">æ£åœ¨å¯¼å‡ºéŸ³é¢‘文件...</translation>
- </message>
- <message>
<location line="-30"/>
<source>Importing audio file...</source>
<translation>æ£åœ¨å¯¼å‡ºéŸ³é¢‘文件...</translation>
@@ -11703,24 +11543,24 @@
<context>
<name>Rosegarden::AudioInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+83"/>
+ <location filename="../../src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp" line="+85"/>
<source>Click to rename this instrument</source>
<translation>点击以é‡å‘½åä¹å™¨</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+11"/>
<source>Click the button above to rename this instrument</source>
<translation>点击上é¢çš„按钮é‡å‘½å这个ä¹å™¨</translation>
</message>
<message>
- <location line="+104"/>
- <location line="+178"/>
+ <location line="+107"/>
+ <location line="+186"/>
<source><no synth></source>
<translation><æ— åˆæˆå™¨></translation>
</message>
<message>
- <location line="-175"/>
- <location line="+179"/>
+ <location line="-183"/>
+ <location line="+187"/>
<source><no plugin></source>
<translation><æ— æ’件></translation>
</message>
@@ -11773,10 +11613,6 @@
<translation>文件</translation>
</message>
<message>
- <source><no audio files></source>
- <translation type="obsolete"><没有音频文件></translation>
- </message>
- <message>
<location line="+332"/>
<source>Save File As</source>
<translation>文件å¦å˜ä¸º</translation>
@@ -11894,10 +11730,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>è¾“å…¥æ–°æ ‡ç¾</translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">æ£åœ¨å¯¼å‡ºéŸ³é¢‘文件...</translation>
- </message>
- <message>
<location line="+172"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>æ£åœ¨å¯¼å…¥ä¸€ä¸ªéœ€è¦è¢«è½¬æ¢æˆ–é‡æ–°é‡‡æ ·çš„音频文件</translation>
@@ -11932,7 +11764,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::AudioMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+273"/>
+ <location filename="../../src/gui/studio/AudioMixerWindow.cpp" line="+282"/>
<source>Audio Mixer</source>
<translation>混音器</translation>
</message>
@@ -11948,53 +11780,45 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
<message>
<location line="+13"/>
- <location line="+149"/>
+ <location line="+141"/>
<source>Pan</source>
<translation>声相</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<location line="+1"/>
- <location line="+147"/>
+ <location line="+139"/>
<location line="+1"/>
<source>Audio level</source>
<translation>音频电平</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-133"/>
<source>Mono or stereo</source>
<translation>å•å£°é“或立体声</translation>
</message>
<message>
- <source>Mute</source>
- <translation type="obsolete">é™éŸ³</translation>
- </message>
- <message>
- <source>Solo</source>
- <translation type="obsolete">独å¥</translation>
- </message>
- <message>
<location line="+8"/>
<source>Arm recording</source>
<translation type="unfinished">æ£åœ¨å½•éŸ³</translation>
</message>
<message>
<location line="+11"/>
- <location line="+133"/>
- <location line="+143"/>
+ <location line="+125"/>
+ <location line="+148"/>
<location line="+57"/>
<location line="+185"/>
<source><none></source>
<translation><æ— ></translation>
</message>
<message>
- <location line="-516"/>
- <location line="+133"/>
+ <location line="-513"/>
+ <location line="+125"/>
<source>Click to load an audio plugin</source>
<translation>ç‚¹å‡»åŠ è½½ä¸€ä¸ªéŸ³é¢‘æ’件</translation>
</message>
<message>
- <location line="-122"/>
+ <location line="-114"/>
<source>Click to rename this instrument</source>
<translation>点击é‡å‘½åæ¤ä¹å™¨</translation>
</message>
@@ -12014,7 +11838,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>点击上é¢æŒ‰é’®é‡å‘½åæ¤ä¹å™¨</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+88"/>
<source>Sub %1</source>
<translation>å控制器 %1</translation>
</message>
@@ -12030,14 +11854,14 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>主控制器</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+95"/>
<location line="+57"/>
<location line="+185"/>
<source><no plugin></source>
<translation><没有æ’件></translation>
</message>
<message>
- <location line="+846"/>
+ <location line="+820"/>
<source>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:audioMixerWindow-en</translation>
</message>
@@ -12479,10 +12303,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>ç®¡ç† MIDI 库和指令</translation>
</message>
<message>
- <source>Reset</source>
- <translation type="obsolete">å¤ä½</translation>
- </message>
- <message>
<location line="+23"/>
<source>Device and Banks</source>
<translation>设备和库</translation>
@@ -12620,7 +12440,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>真的è¦åˆ 除这个库å—?</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+59"/>
<source>Really delete this key mapping?</source>
<translation>真的è¦åˆ é™¤è¿™ä¸ªé”®æ˜ å°„å—?</translation>
</message>
@@ -12695,10 +12515,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<source>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:bankEditorDialog-en</translation>
</message>
- <message>
- <source>Unsaved Changes</source>
- <translation type="obsolete">未ä¿å˜çš„å˜æ›´</translation>
- </message>
</context>
<context>
<name>Rosegarden::BeamCommand</name>
@@ -12808,92 +12624,206 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
</context>
<context>
- <name>Rosegarden::ChordNameRuler</name>
+ <name>Rosegarden::CheckForParallelsDialog</name>
<message>
- <location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
- <source><qt><p>Chord name ruler. This ruler analyzes your harmonies and attempts to guess what chords your composition contains. These chords cannot be printed or manipulated, and this is only a reference for your information.</p><p>Turn it on and off with the <b>View -> Rulers</b> menu.</p></qt></source>
- <translation><qt><p>和弦åç§°æ ‡å°º. 程åºåˆ†æžæ‚¨ä¹æ›²ä¸çš„和声并å°è¯•çŒœæµ‹ä¹æ›²ä¸åŒ…å«çš„和弦. 这些和弦ä¸èƒ½æ‰“å°æˆ–修改, 仅作为一ç§å‚考信æ¯.</p><p>点击èœå•é¡¹ <b>查看 -> æ ‡å°º</b> 打开或关é—该选项.</p></qt></translation>
+ <location filename="../../src/gui/dialogs/CheckForParallelsDialog.cpp" line="+46"/>
+ <source>Check for Parallels</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ClearTriggersCommand</name>
<message>
- <location filename="../../src/commands/edit/ClearTriggersCommand.h" line="+46"/>
- <source>&Clear Triggers</source>
- <translation>清除触å‘器(&C)</translation>
+ <location line="+28"/>
+ <source>Check for Unisons</source>
+ <translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Rosegarden::ClefDialog</name>
<message>
- <location filename="../../src/gui/dialogs/ClefDialog.cpp" line="+54"/>
- <location line="+5"/>
- <location line="+66"/>
- <source>Clef</source>
- <translation>è°±å·</translation>
+ <location line="+11"/>
+ <source>Check for Hidden Parallels</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Existing notes following clef change</source>
- <translation>现有音符伴éšè°±å·ä¿®æ”¹è€Œå˜åŒ–</translation>
+ <location line="+8"/>
+ <source>Start</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="-46"/>
- <source>Lower clef</source>
- <translation>更低的谱å·</translation>
+ <location line="+1"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="-12"/>
- <source>Up an Octave</source>
- <translation>高八度</translation>
+ <location line="+1"/>
+ <source>Export</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+42"/>
- <source>Down an Octave</source>
- <translation>低八度</translation>
+ <location line="+1"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="-11"/>
- <source>Higher clef</source>
- <translation>更高的谱å·</translation>
+ <location line="+206"/>
+ <location line="+188"/>
+ <source>bar</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+33"/>
- <source>Maintain current pitches</source>
- <translation>ä¿æŒå½“å‰çš„音高</translation>
+ <location line="-188"/>
+ <location line="+188"/>
+ <source> </source>
+ <translation type="unfinished"> </translation>
</message>
<message>
- <location line="+3"/>
- <source>Transpose into appropriate octave</source>
- <translation>移调到适当的八度音</translation>
+ <location line="-188"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>beat</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+160"/>
- <source>%1 down an octave</source>
- <translation>%1 é™ä½Žä¸€ä¸ªå…«åº¦</translation>
+ <location line="-320"/>
+ <location line="+188"/>
+ <location line="+132"/>
+ <source>fraction</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>%1 down two octaves</source>
- <translation>%1 é™ä½Žä¸¤ä¸ªå…«åº¦</translation>
+ <location line="-286"/>
+ <source>Restart</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>%1 up an octave</source>
- <translation>%1 å‡é«˜ä¸€ä¸ªå…«åº¦</translation>
+ <location line="+152"/>
+ <source>found multiple notes for</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>%1 up two octaves</source>
- <translation>%1 å‡é«˜ä¸¤ä¸ªå…«åº¦</translation>
+ <location line="+129"/>
+ <source>parallel at bar</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <source>Treble</source>
- <translation>高音谱å·</translation>
+ <location line="+2"/>
+ <source>parallels at bar</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+18"/>
+ <source>unisons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden fifths</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>hidden octaves</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ChordNameRuler</name>
+ <message>
+ <location filename="../../src/gui/rulers/ChordNameRuler.cpp" line="+89"/>
+ <source><qt><p>Chord name ruler. This ruler analyzes your harmonies and attempts to guess what chords your composition contains. These chords cannot be printed or manipulated, and this is only a reference for your information.</p><p>Turn it on and off with the <b>View -> Rulers</b> menu.</p></qt></source>
+ <translation><qt><p>和弦åç§°æ ‡å°º. 程åºåˆ†æžæ‚¨ä¹æ›²ä¸çš„和声并å°è¯•çŒœæµ‹ä¹æ›²ä¸åŒ…å«çš„和弦. 这些和弦ä¸èƒ½æ‰“å°æˆ–修改, 仅作为一ç§å‚考信æ¯.</p><p>点击èœå•é¡¹ <b>查看 -> æ ‡å°º</b> 打开或关é—该选项.</p></qt></translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ClearTriggersCommand</name>
+ <message>
+ <location filename="../../src/commands/edit/ClearTriggersCommand.h" line="+46"/>
+ <source>&Clear Triggers</source>
+ <translation>清除触å‘器(&C)</translation>
+ </message>
+</context>
+<context>
+ <name>Rosegarden::ClefDialog</name>
+ <message>
+ <location filename="../../src/gui/dialogs/ClefDialog.cpp" line="+54"/>
+ <location line="+5"/>
+ <location line="+66"/>
+ <source>Clef</source>
+ <translation>è°±å·</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Existing notes following clef change</source>
+ <translation>现有音符伴éšè°±å·ä¿®æ”¹è€Œå˜åŒ–</translation>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>Lower clef</source>
+ <translation>更低的谱å·</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Up an Octave</source>
+ <translation>高八度</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Down an Octave</source>
+ <translation>低八度</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Higher clef</source>
+ <translation>更高的谱å·</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Maintain current pitches</source>
+ <translation>ä¿æŒå½“å‰çš„音高</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Transpose into appropriate octave</source>
+ <translation>移调到适当的八度音</translation>
+ </message>
+ <message>
+ <location line="+160"/>
+ <source>%1 down an octave</source>
+ <translation>%1 é™ä½Žä¸€ä¸ªå…«åº¦</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 down two octaves</source>
+ <translation>%1 é™ä½Žä¸¤ä¸ªå…«åº¦</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 up an octave</source>
+ <translation>%1 å‡é«˜ä¸€ä¸ªå…«åº¦</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>%1 up two octaves</source>
+ <translation>%1 å‡é«˜ä¸¤ä¸ªå…«åº¦</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Treble</source>
+ <translation>高音谱å·</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>French violin</source>
<translation>法国å°æç´è°±å·</translation>
</message>
@@ -13131,7 +13061,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CompositionView</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+336"/>
+ <location filename="../../src/gui/editors/segment/compositionview/CompositionView.cpp" line="+276"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -13139,10 +13069,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ConfigureDialog</name>
<message>
- <source>Configure Rosegarden</source>
- <translation type="obsolete">é…置玫瑰å›</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/ConfigureDialog.cpp" line="+48"/>
<source>Rosegarden - Preferences</source>
<translation>Rosegarden - 设置</translation>
@@ -13360,7 +13286,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControlRulerWidget</name>
<message>
- <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+325"/>
+ <location filename="../../src/gui/rulers/ControlRulerWidget.cpp" line="+330"/>
<source>Velocity</source>
<translation>力度</translation>
</message>
@@ -13376,7 +13302,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::ControllerEventsRuler</name>
<message>
- <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+288"/>
+ <location filename="../../src/gui/rulers/ControllerEventsRuler.cpp" line="+284"/>
<source>Unsupported Event Type</source>
<translation>ä¸æ”¯æŒçš„事件类型</translation>
</message>
@@ -13391,12 +13317,13 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>控制器事件</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+138"/>
+ <location line="+22"/>
<source>Insert Line of Controllers</source>
<translation>输入控制器曲线</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+119"/>
<source>Controller Event Number</source>
<translation>控制器事件编å·</translation>
</message>
@@ -13404,7 +13331,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CopyCommand</name>
<message>
- <location filename="../../src/commands/edit/CopyCommand.h" line="+62"/>
+ <location filename="../../src/commands/edit/CopyCommand.h" line="+63"/>
<source>&Copy</source>
<translation>æ‹·è´(&C)</translation>
</message>
@@ -13414,7 +13341,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation type="unfinished">(摘è¦)</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
<source>(copied)</source>
<translation>(å·²å¤åˆ¶)</translation>
</message>
@@ -13484,7 +13411,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::CutCommand</name>
<message>
- <location filename="../../src/commands/edit/CutCommand.h" line="+50"/>
+ <location filename="../../src/commands/edit/CutCommand.h" line="+51"/>
<source>Cu&t</source>
<translation>剪切(&t)</translation>
</message>
@@ -13502,7 +13429,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<message>
<location filename="../../src/commands/segment/CutToTriggerSegmentCommand.cpp" line="+50"/>
<source>Make Ornament</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">制作装饰符å·</translation>
</message>
</context>
<context>
@@ -13524,10 +13451,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::DeleteRangeCommand</name>
<message>
- <source>Rejoin Command</source>
- <translation type="obsolete">é‡æ–°åˆå¹¶å‘½ä»¤</translation>
- </message>
- <message>
<location filename="../../src/commands/segment/DeleteRangeCommand.cpp" line="+322"/>
<source>Delete Range</source>
<translation>åˆ é™¤èŒƒå›´</translation>
@@ -13564,7 +13487,7 @@ Please select the ones you wish to delete permanently from the hard disk.
<translation>http://rosegardenmusic.com/wiki/doc:device-manager-en</translation>
</message>
<message>
- <location line="-853"/>
+ <location line="-844"/>
<source>[ No port ]</source>
<translation>[ æ— ç«¯å£ ]</translation>
</message>
@@ -13572,14 +13495,6 @@ Please select the ones you wish to delete permanently from the hard disk.
<context>
<name>Rosegarden::DiatonicPitchChooser</name>
<message>
- <source>D</source>
- <translation type="obsolete">ID</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/DiatonicPitchChooser.cpp" line="+59"/>
<source>C</source>
<comment>note name</comment>
@@ -13855,137 +13770,6 @@ Please select the ones you wish to delete permanently from the hard disk.
</message>
</context>
<context>
- <name>Rosegarden::EditView</name>
- <message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 控制器 %2 %3</translation>
- </message>
- <message>
- <source>Pitch Bend</source>
- <translation type="obsolete">音色弯曲</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">ä¸æ”¯æŒçš„事件类型</translation>
- </message>
- <message>
- <source>I</source>
- <translation type="obsolete">I</translation>
- </message>
- <message>
- <source>II</source>
- <translation type="obsolete">II</translation>
- </message>
- <message>
- <source>III</source>
- <translation type="obsolete">III</translation>
- </message>
- <message>
- <source>IV</source>
- <translation type="obsolete">IV</translation>
- </message>
- <message>
- <source>V</source>
- <translation type="obsolete">V</translation>
- </message>
- <message>
- <source>VI</source>
- <translation type="obsolete">VI</translation>
- </message>
- <message>
- <source>VII</source>
- <translation type="obsolete">VII</translation>
- </message>
- <message>
- <source>VIII</source>
- <translation type="obsolete">VIII</translation>
- </message>
- <message>
- <source>%1 flat</source>
- <translation type="obsolete">%1 å¹³å¦åŒ–</translation>
- </message>
- <message>
- <source>%1 sharp</source>
- <translation type="obsolete">%1 é”化</translation>
- </message>
- <message>
- <source>&Insert Note</source>
- <translation type="obsolete">æ’入音符(&I)</translation>
- </message>
- <message>
- <source>&Upper Octave</source>
- <translation type="obsolete">高八度(&U)</translation>
- </message>
- <message>
- <source>&Lower Octave</source>
- <translation type="obsolete">低八度(&L)</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">ä¼°è®¡çš„æ—¶é—´æ ‡è®°æ˜¾ç¤ºä¸º</translation>
- </message>
- <message>
- <source>Halving durations...</source>
- <translation type="obsolete">音长</translation>
- </message>
- <message>
- <source>Doubling durations...</source>
- <translation type="obsolete">音长</translation>
- </message>
- <message>
- <source>Rescaling...</source>
- <translation type="obsolete">é‡æ–°è°ƒæ•´(&R)...</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">å˜è°ƒ</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">输入è¦å˜è°ƒçš„åŠéŸ³æ•°å—：</translation>
- </message>
- <message>
- <source>Transposing...</source>
- <translation type="obsolete">æ£åœ¨å˜è°ƒ...</translation>
- </message>
- <message>
- <source>Transposing up one semitone...</source>
- <translation type="obsolete">æ£åœ¨å‡é«˜ä¸€ä¸ªåŠéŸ³...</translation>
- </message>
- <message>
- <source>Transposing up one octave...</source>
- <translation type="obsolete">æ£åœ¨å‡é«˜ä¸€ä¸ªå…«åº¦éŸ³é˜¶...</translation>
- </message>
- <message>
- <source>Transposing down one semitone...</source>
- <translation type="obsolete">æ£åœ¨é™ä½Žä¸€ä¸ªåŠéŸ³...</translation>
- </message>
- <message>
- <source>Transposing down one octave...</source>
- <translation type="obsolete">æ£åœ¨é™ä½Žä¸€ä¸ªå…«åº¦éŸ³é˜¶...</translation>
- </message>
- <message>
- <source>Inverting...</source>
- <translation type="obsolete">已开始...</translation>
- </message>
- <message>
- <source>Retrograding...</source>
- <translation type="obsolete">æ£åœ¨å½•åˆ¶...</translation>
- </message>
- <message>
- <source>Retrograde inverting...</source>
- <translation type="obsolete">æ£åœ¨å½•åˆ¶...</translation>
- </message>
- <message>
- <source>Jogging left...</source>
- <translation type="obsolete">æ£åœ¨å·¦ç§»ä¸€å¸§...</translation>
- </message>
- <message>
- <source>Jogging right...</source>
- <translation type="obsolete">æ£åœ¨å³ç§»ä¸€å¸§...</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::EditViewBase</name>
<message>
<location filename="../../src/gui/general/EditViewBase.cpp" line="+222"/>
@@ -14324,46 +14108,10 @@ This could cause problems if it overrides a different computed value later on.</
<translation type="unfinished">模æ¿</translation>
</message>
<message>
- <source>Flat - set %1 to value</source>
- <translation type="obsolete">å¹³å¦åŒ– ï¼ è®¾å®š %1 的值为</translation>
- </message>
- <message>
- <source>Alternating - set %1 to max and min on alternate events</source>
- <translation type="obsolete">交互 - 基于交互事件设定 %1 到最大和最å°</translation>
- </message>
- <message>
- <source>Crescendo - set %1 rising from min to max</source>
- <translation type="obsolete">æ¸å¼º - 设置 %1 从最å°åˆ°æœ€å¤§é€æ¸ä¸Šå‡</translation>
- </message>
- <message>
- <source>Diminuendo - set %1 falling from max to min</source>
- <translation type="obsolete">æ¸å¼± - 设置 %1 从最大到最å°é€æ¸ä¸‹é™</translation>
- </message>
- <message>
- <source>Ringing - set %1 alternating from max to min with both dying to zero</source>
- <translation type="obsolete">é˜»å°¼æŒ¯è¡ - 设定 %1 交互å¼åœ°ä»Žæœ€å¤§åˆ°æœ€å°ç›´è‡³å£°éŸ³è¶‹äºŽæ¶ˆå¤±</translation>
- </message>
- <message>
<location line="-81"/>
<source>Value</source>
<translation>值</translation>
</message>
- <message>
- <source>First Value</source>
- <translation type="obsolete">第一值</translation>
- </message>
- <message>
- <source>Second Value</source>
- <translation type="obsolete">第二值</translation>
- </message>
- <message>
- <source>Low Value</source>
- <translation type="obsolete">最低值</translation>
- </message>
- <message>
- <source>High Value</source>
- <translation type="obsolete">最高值</translation>
- </message>
</context>
<context>
<name>Rosegarden::EventQuantizeCommand</name>
@@ -14623,10 +14371,6 @@ This could cause problems if it overrides a different computed value later on.</
<source>http://rosegardenmusic.com/wiki/doc:eventView-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:eventView-en</translation>
</message>
- <message>
- <source>%1 - Triggered Segment: %2</source>
- <translation type="obsolete">创建å°èŠ‚</translation>
- </message>
</context>
<context>
<name>Rosegarden::ExpandFigurationCommand</name>
@@ -14762,22 +14506,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>æ£åœ¨ä¸‹è½½ %1...</translation>
</message>
<message>
- <source>Failed to connect to FTP server</source>
- <translation type="obsolete">连接 FTP æœåŠ¡å™¨å¤±è´¥</translation>
- </message>
- <message>
- <source>Login failed</source>
- <translation type="obsolete">登陆失败</translation>
- </message>
- <message>
- <source>Failed to change to correct directory</source>
- <translation type="obsolete">改å˜åˆ°å½“å‰è·¯å¾„失败</translation>
- </message>
- <message>
- <source>FTP download aborted</source>
- <translation type="obsolete">FTP 下载ä¸æ–</translation>
- </message>
- <message>
<location line="+292"/>
<source>Download cancelled</source>
<translation>下载已å–消</translation>
@@ -15040,10 +14768,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>图åƒæ€§èƒ½</translation>
</message>
<message>
- <source>Normal</source>
- <translation type="obsolete">æ£å¸¸</translation>
- </message>
- <message>
<location line="+6"/>
<source>Safe</source>
<translation>安全</translation>
@@ -15074,10 +14798,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>主窗å£</translation>
</message>
<message>
- <source>Matrix</source>
- <translation type="obsolete">å—模</translation>
- </message>
- <message>
<location line="+4"/>
<source>Notation</source>
<translation>ä¹è°±</translation>
@@ -15113,10 +14833,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>Adobe Acrobat Reader (éžè‡ªç”±è½¯ä»¶)</translation>
</message>
<message>
- <source>KPDF (KDE 3.x)</source>
- <translation type="obsolete">KPDF (KDE 3.x)</translation>
- </message>
- <message>
<location line="+4"/>
<source>Used to preview generated LilyPond output</source>
<translation>用于预览生æˆçš„ LilyPond 输出</translation>
@@ -15127,10 +14843,6 @@ Would you like to try and locate this file or skip it?</source>
<translation>命令行文件打å°ç¨‹åº</translation>
</message>
<message>
- <source>KPrinter (KDE 3)</source>
- <translation type="obsolete">KPrinter (KDE 3)</translation>
- </message>
- <message>
<location line="+5"/>
<source>Gtk-LP (GNOME)</source>
<translation>Gtk-LP (GNOME)</translation>
@@ -15712,7 +15424,7 @@ Example text from file:</source>
<translation>ä¹å™¨å‚æ•°</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+83"/>
<source>Track</source>
<translation>音轨</translation>
</message>
@@ -15720,7 +15432,7 @@ Example text from file:</source>
<context>
<name>Rosegarden::InstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+66"/>
+ <location filename="../../src/gui/editors/parameters/InstrumentParameterPanel.cpp" line="+69"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -16099,51 +15811,8 @@ Example text from file:</source>
</message>
</context>
<context>
- <name>Rosegarden::LatencyConfigurationPage</name>
+ <name>Rosegarden::LilyPondExporter</name>
<message>
- <source>Latency</source>
- <translation type="obsolete">潜ä¼æœŸ</translation>
- </message>
- <message>
- <source>Sequencer Latency</source>
- <translation type="obsolete">音åºå‘生器潜ä¼æœŸ</translation>
- </message>
- <message>
- <source>JACK latency</source>
- <translation type="obsolete">JACK 潜ä¼æœŸ</translation>
- </message>
- <message>
- <source>Use the "Fetch JACK latencies" button to discover the latency values set at
-the sequencer. It's recommended that you use the returned values but it's also
-possible to override them manually using the sliders. Note that if you change
-your JACK server parameters you should always fetch the latency values again.
-The latency values will be stored by Rosegarden for use next time.</source>
- <translation type="obsolete">ä½¿ç”¨â€œèŽ·å– JACK 潜ä¼æœŸâ€æŒ‰é’®æ¥æŸ¥çœ‹éŸ³åºå‘生器里设置的潜ä¼æœŸå€¼ã€‚
-建议您使用这些返回值，但是使用滑å—手工覆盖这些值也是å¯ä»¥çš„。
-请注æ„，如果您更改了您的 JACK æœåŠ¡å™¨å‚数，您应该总是é‡æ–°èŽ·å–
-潜ä¼æœŸå€¼ã€‚这些潜ä¼æœŸå€¼å°†è¢« Rosegarden ä¿å˜ä»¥å¤‡ä¸‹æ¬¡ä½¿ç”¨ã€‚</translation>
- </message>
- <message>
- <source>JACK playback latency (in ms)</source>
- <translation type="obsolete">JACK 回放潜ä¼æœŸ(ms)</translation>
- </message>
- <message>
- <source>JACK record latency (in ms)</source>
- <translation type="obsolete">JACK 录制潜ä¼æœŸ(ms)</translation>
- </message>
- <message>
- <source>Fetch JACK latencies</source>
- <translation type="obsolete">èŽ·å– JACK 潜ä¼æœŸ</translation>
- </message>
- <message>
- <source>JACK Latency</source>
- <translation type="obsolete">JACK 潜ä¼æœŸ</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::LilyPondExporter</name>
- <message>
- <location filename="../../src/document/io/LilyPondExporter.cpp" line="+630"/>
<source>LilyPond does not allow spaces or backslashes in filenames.
Would you like to use
@@ -16151,7 +15820,7 @@ Would you like to use
%1
instead?</source>
- <translation>Lilypond ä¸å…许文件åä¸å‡ºçŽ°ç©ºæ ¼æˆ–åæ–œæ .
+ <translation type="obsolete">Lilypond ä¸å…许文件åä¸å‡ºçŽ°ç©ºæ ¼æˆ–åæ–œæ .
您希望用
@@ -16160,39 +15829,16 @@ Would you like to use
æ¥ä»£æ›¿å—?</translation>
</message>
<message>
- <location line="+11"/>
<source>Export failed. The file could not be opened for writing.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">导出失败. æ— æ³•æ‰“å¼€æ–‡ä»¶ä»¥å†™å…¥.</translation>
</message>
<message>
- <location line="+169"/>
- <source>Export succeeded, but the composition was empty.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Export of unmuted tracks failed. There are no unmuted tracks or no segments on them.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export of selected track failed. There are no segments on the selected track.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Export of selected segments failed. No segments are selected.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1823"/>
<source>warning: overlong bar truncated here</source>
- <translation>è¦å‘Š: 过长的å°èŠ‚截æ–于æ¤</translation>
+ <translation type="obsolete">è¦å‘Š: 过长的å°èŠ‚截æ–于æ¤</translation>
</message>
<message>
- <location line="+11"/>
<source>warning: bar too short, padding with rests</source>
- <translation>è¦å‘Š: å°èŠ‚太çŸ, 以休æ¢ç¬¦å¡«å……</translation>
+ <translation type="obsolete">è¦å‘Š: å°èŠ‚太çŸ, 以休æ¢ç¬¦å¡«å……</translation>
</message>
</context>
<context>
@@ -16223,10 +15869,6 @@ Would you like to use
<translation><qt>选择è¦å¯¼å‡ºçš„音轨或片段</qt></translation>
</message>
<message>
- <source>Selected tracks</source>
- <translation type="obsolete">选ä¸çš„音轨</translation>
- </message>
- <message>
<location line="+16"/>
<source>Compatibility level</source>
<translation>兼容级别</translation>
@@ -16708,10 +16350,6 @@ Would you like to use
<context>
<name>Rosegarden::LoopRuler</name>
<message>
- <source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Double-click to start playback.</p></qt></source>
- <translation type="obsolete"><qt><p>点击并拖拽以移动æ’æ”¾æ¸¸æ ‡.</p><p>按ä½Shift并å•å‡»å¹¶æ‹–拽以为循环或编辑设置一个范围.</p><p>按ä½Shift并å•å‡»æ¥æ¸…除循环或范围.</p><p>åŒå‡»å¼€å§‹æ’放.</p></qt></translation>
- </message>
- <message>
<location filename="../../src/gui/rulers/LoopRuler.cpp" line="+80"/>
<source><qt><p>Click and drag to move the playback pointer.</p><p>Shift-click and drag to set a range for looping or editing.</p><p>Shift-click to clear the loop or range.</p><p>Ctrl-click and drag to move the playback pointer with snap to beat.</p><p>Double-click to start playback.</p></qt></source>
<translation type="unfinished"></translation>
@@ -16909,7 +16547,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<context>
<name>Rosegarden::MIDIInstrumentParameterPanel</name>
<message>
- <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-707"/>
+ <location filename="../../src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp" line="-653"/>
<source><qt>Set variations on the program above, if available in the studio</qt></source>
<translation type="unfinished"><qt>Set variations on the program above, if available in the studio</qt></translation>
</message>
@@ -16949,10 +16587,6 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>音色</translation>
</message>
<message>
- <source>Channel out</source>
- <translation type="obsolete">通é“</translation>
- </message>
- <message>
<location line="-46"/>
<source>Percussion</source>
<translation>打击ä¹å™¨</translation>
@@ -16998,12 +16632,7 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>从外部接收</translation>
</message>
<message>
- <location line="+77"/>
- <source>[ %1 ]</source>
- <translation>[ %1 ]</translation>
- </message>
- <message>
- <location line="+0"/>
+ <location line="+88"/>
<source>No connection</source>
<translation>æ— è¿žæŽ¥</translation>
</message>
@@ -17221,16 +16850,21 @@ delay at the start of playback due to the amount of data being transmitted.</sou
<translation>æ£åœ¨å½•éŸ³</translation>
</message>
<message>
- <source>Synth plugin </source>
- <translation type="obsolete">åŒæ¥æ’件</translation>
- </message>
- <message>
<location line="+124"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
</context>
<context>
+ <name>Rosegarden::MarkParallelCommand</name>
+ <message>
+ <location filename="../../src/commands/notation/MarkParallelCommand.h" line="+34"/>
+ <location filename="../../src/commands/notation/MarkParallelCommand.cpp" line="+26"/>
+ <source>Mark Parallel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Rosegarden::MarkerEditor</name>
<message>
<location filename="../../src/gui/editors/segment/MarkerEditor.cpp" line="+81"/>
@@ -17436,12 +17070,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixMover</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+187"/>
+ <location filename="../../src/gui/editors/matrix/MatrixMover.cpp" line="+191"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>æŒ‰ä½ Shift 键以é¿å…å¸é™„到节æ‹ç½‘æ ¼</translation>
</message>
<message>
- <location line="+117"/>
+ <location line="+114"/>
<source>Copy and Move Event</source>
<translation>æ‹·è´å¹¶ç§»åŠ¨äº‹ä»¶</translation>
</message>
@@ -17600,7 +17234,7 @@ Double-click to open the marker editor.</source>
<translation>改å˜åŠ›åº¦</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Click and drag to scale velocity of selected notes</source>
<translation>点击并拖拽以改å˜é€‰ä¸éŸ³ç¬¦çš„力度</translation>
</message>
@@ -17613,80 +17247,12 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MatrixView</name>
<message>
- <source>Instrument Parameters</source>
- <translation type="obsolete">ä¹å™¨å‚æ•°</translation>
- </message>
- <message>
- <source>Couldn't apply piano roll layout</source>
- <translation type="obsolete">æ— æ³•åº”ç”¨é’¢ç´è°±å¸ƒå±€</translation>
- </message>
- <message>
- <source> No selection </source>
- <translation type="obsolete"> æ²¡æœ‰é€‰ä¸ </translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">æ£åœ¨é‡åŒ–...</translation>
- </message>
- <message>
- <source>Collapsing notes...</source>
- <translation type="obsolete">æ£åœ¨åŽ‹ç¼©éŸ³ç¬¦...</translation>
- </message>
- <message>
- <source>Making legato...</source>
- <translation type="obsolete">æ£åœ¨åˆ¶ä½œç¾ŽåŒ–音符...</translation>
- </message>
- <message>
- <source>Note: %1 (%2.%3s)</source>
- <translation type="obsolete">时间：%1</translation>
- </message>
- <message>
- <source>%1 (%2)</source>
- <translation type="obsolete">%1 (以上)</translation>
- </message>
- <message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">时间：%1</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">æ£åœ¨æŠŠé€‰ä¸åŒºå‰ªåˆ‡åˆ°å‰ªè´´æ¿...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">æ£åœ¨æŠŠé€‰ä¸åŒºå¤åˆ¶åˆ°å‰ªè´´æ¿...</translation>
- </message>
- <message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">剪贴æ¿æ˜¯ç©ºçš„</translation>
- </message>
- <message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">æ£åœ¨æ’入剪贴æ¿å†…容...</translation>
- </message>
- <message>
- <source>Couldn't paste at this point</source>
- <translation type="obsolete">æ— æ³•ç²˜è´´åˆ°è¿™ç‚¹</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">æ£åœ¨åˆ 除选择区...</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1361"/>
+ <location filename="../../src/gui/editors/matrix/MatrixView.cpp" line="+1362"/>
<source>Unknown note insert action %1</source>
<translation>未知的音符æ’入行为 %1</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">æ£åœ¨æ’入音符</translation>
- </message>
- <message>
- <source>Unquantizing...</source>
- <translation type="obsolete">æ£åœ¨è§£é™¤é‡åŒ–...</translation>
- </message>
- <message>
- <location line="-1503"/>
+ <location line="-1504"/>
<source><untitled></source>
<translation><未命å></translation>
</message>
@@ -17708,18 +17274,6 @@ Double-click to open the marker editor.</source>
</translation>
</message>
<message>
- <source>%1 Controller %2 %3</source>
- <translation type="obsolete">%1 控制器 %2 %3</translation>
- </message>
- <message>
- <source>Pitch Bend</source>
- <translation type="obsolete">音色弯曲</translation>
- </message>
- <message>
- <source>Unsupported Event Type</source>
- <translation type="obsolete">ä¸æ”¯æŒçš„事件类型</translation>
- </message>
- <message>
<location line="+254"/>
<source> Grid: </source>
<translation> ç½‘æ ¼: </translation>
@@ -17760,7 +17314,7 @@ Double-click to open the marker editor.</source>
<translation>å…³</translation>
</message>
<message>
- <location line="+871"/>
+ <location line="+873"/>
<source>http://rosegardenmusic.com/wiki/doc:matrix-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:matrix-en</translation>
</message>
@@ -17776,8 +17330,7 @@ Double-click to open the marker editor.</source>
</message>
<message>
<location line="+13"/>
- <location line="+155"/>
- <location line="+95"/>
+ <location line="+249"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -17787,15 +17340,7 @@ Double-click to open the marker editor.</source>
<translation type="unfinished">估计的调å·æ˜¾ç¤º</translation>
</message>
<message>
- <source> Zoom: </source>
- <translation type="obsolete"> 缩放：</translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <location line="-864"/>
+ <location line="-863"/>
<source>Estimated time signature shown</source>
<translation type="unfinished">ä¼°è®¡çš„æ—¶é—´æ ‡è®°æ˜¾ç¤ºä¸º</translation>
</message>
@@ -17810,22 +17355,6 @@ Double-click to open the marker editor.</source>
<translation>åŠéŸ³ä¸ªæ•°:</translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">æ£åœ¨æå‡åŠ›åº¦...</translation>
- </message>
- <message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">æ£åœ¨é™ä½ŽåŠ›åº¦...</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">设定事件力度</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">æ£åœ¨è®¾å®šåŠ›åº¦...</translation>
- </message>
- <message>
<location line="-320"/>
<source>Trigger Segment</source>
<translation>触å‘片段</translation>
@@ -17836,32 +17365,15 @@ Double-click to open the marker editor.</source>
<translation>åˆ é™¤è§¦å‘器</translation>
</message>
<message>
- <location line="-824"/>
+ <location line="-826"/>
<source>Matrix</source>
<translation>é’¢ç´å·å¸˜çª—</translation>
</message>
- <message>
- <source>Percussion</source>
- <translation type="obsolete">打击ä¹å™¨</translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">音长</translation>
- </message>
- <message>
- <location line="+1432"/>
- <source>Can't insert note: No grid duration selected</source>
- <translation>ä¸èƒ½è¾“入音符: 没有选ä¸ç½‘æ ¼æ—¶é•¿</translation>
- </message>
- <message>
- <source> Chord </source>
- <translation type="obsolete"> 和弦</translation>
- </message>
</context>
<context>
<name>Rosegarden::MatrixWidget</name>
<message>
- <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-818"/>
+ <location filename="../../src/gui/editors/matrix/MatrixWidget.cpp" line="-853"/>
<source>Zoom</source>
<translation>缩放</translation>
</message>
@@ -17881,7 +17393,7 @@ Double-click to open the marker editor.</source>
<translation>é‡ç½®ç¼©æ”¾</translation>
</message>
<message>
- <location line="+1094"/>
+ <location line="+1129"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>转动æ¤è½®ä»¥æ”¹å˜å½“å‰ç‰‡æ®µ</qt></translation>
</message>
@@ -17988,13 +17500,6 @@ Double-click to open the marker editor.</source>
</message>
</context>
<context>
- <name>Rosegarden::MidiKeyMapTreeWidgetItem</name>
- <message>
- <source>Key Mapping</source>
- <translation type="obsolete">基调修改</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::MidiKeyMappingEditor</name>
<message>
<location filename="../../src/gui/studio/MidiKeyMappingEditor.cpp" line="+53"/>
@@ -18011,7 +17516,7 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MidiMixerWindow</name>
<message>
- <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+117"/>
+ <location filename="../../src/gui/studio/MidiMixerWindow.cpp" line="+129"/>
<source>MIDI Mixer</source>
<translation>MIDI 混音器</translation>
</message>
@@ -18026,7 +17531,7 @@ Double-click to open the marker editor.</source>
<translation>ä¹å™¨</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+517"/>
<source>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:midiMixerWindow-en</translation>
</message>
@@ -18158,417 +17663,158 @@ Double-click to open the marker editor.</source>
<context>
<name>Rosegarden::MoveTracksCommand</name>
<message>
- <location filename="../../src/commands/segment/MoveTracksCommand.h" line="+46"/>
- <source>Move Tracks...</source>
- <translation>移动音轨...</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::MultiKeyInsertionCommand</name>
- <message>
- <location filename="../../src/commands/notation/MultiKeyInsertionCommand.h" line="+58"/>
- <source>Change all to &Key %1...</source>
- <translation>全部改为调 %1(&K)...</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Add &Key Change...</source>
- <translation>æ·»åŠ è°ƒå·(&K)...</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::MusicXMLOptionsDialog</name>
- <message>
- <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="+60"/>
- <source>MusicXML Export</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Layout</source>
- <translation type="unfinished">布局</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Headers</source>
- <translation type="unfinished">题头</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Basic options</source>
- <translation type="unfinished">基本选项</translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Export content</source>
- <translation type="unfinished">导出内容</translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Choose which tracks or segments to export</qt></source>
- <translation type="unfinished"><qt>选择è¦å¯¼å‡ºçš„音轨或片段</qt></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>All tracks</source>
- <translation type="unfinished">所有音轨</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Non-muted tracks</source>
- <translation type="unfinished">未é™éŸ³éŸ³è½¨</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Selected track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Selected segments</source>
- <translation type="unfinished">选ä¸çš„片段</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Export track staff brackets</source>
- <translation type="unfinished">到处连谱å·</translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Track staff brackets are found in the <b>Track Parameters</b> box, and may be used to group staffs in various ways</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Advanced/Experimental options</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Compatibility level</source>
- <translation type="unfinished">兼容级别</translation>
- </message>
- <message>
- <location line="+2"/>
- <source><qt>Set the MusicXML version you want export</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source><qt><p>Choose the format of the MusicXML file.</p><p>The "partwise" format contains "part" elements that contain "measure" elements. The "timewise" format reverses this ordering.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Export grand staff instrument</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source><qt>Choose which bracket will create a grand staff system</qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-29"/>
- <source>MusicXML type</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>None</source>
- <translation type="unfinished">æ— </translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Don't export percussion tracks</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Use "<octave-shift>" for transposing instruments</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+45"/>
- <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NameSetEditor</name>
- <message>
- <source>Librarian</source>
- <translation type="obsolete">库管ç†ç¨‹åº</translation>
- </message>
- <message>
- <source>Name</source>
- <translation type="obsolete">å称</translation>
- </message>
- <message>
- <source>Email</source>
- <translation type="obsolete">电å邮件</translation>
- </message>
- <message>
- <source>The librarian maintains the Rosegarden device data for this device.
-If you've made modifications to suit your own device, it might be worth
-liaising with the librarian in order to publish your information for the benefit
-of others.</source>
- <translation type="obsolete">库管ç†å‘˜ä¸ºæ¤è®¾å¤‡ç»´æŠ¤å¸¸è§„音色库和指令列信æ¯ã€‚如果您已ç»
-修改了一个音色库以适应您自己的设备，那么出于对其他人利
-益的考虑有必è¦å’Œåº“管ç†å‘˜å–å¾—è”系以便å‘布您的音色库信æ¯ã€‚</translation>
- </message>
- <message>
- <location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
- <source>Provided by</source>
- <translation>æ供者</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewMatrixView</name>
- <message>
- <source>Matrix</source>
- <translation type="obsolete">å—模</translation>
- </message>
- <message>
- <source><untitled></source>
- <translation type="obsolete"><未命å></translation>
- </message>
- <message>
- <source>%1 - All Segments - %2</source>
- <translation type="obsolete">音长</translation>
- </message>
- <message>
- <source> Grid: </source>
- <translation type="obsolete"> æ …æ ¼ï¼š</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">æ— </translation>
- </message>
- <message>
- <source>Unit</source>
- <translation type="obsolete">å°èŠ‚</translation>
- </message>
- <message>
- <source>Beat</source>
- <translation type="obsolete">节æ‹</translation>
- </message>
- <message>
- <source>Bar</source>
- <translation type="obsolete">进程æ¡</translation>
- </message>
- <message>
- <source> Velocity: </source>
- <translation type="obsolete">力度：</translation>
- </message>
- <message>
- <source> Quantize: </source>
- <translation type="obsolete"> é‡åŒ–：</translation>
- </message>
- <message>
- <source> Zoom: </source>
- <translation type="obsolete"> 缩放：</translation>
- </message>
- <message>
- <source>%1%</source>
- <translation type="obsolete">%1%</translation>
- </message>
- <message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">设定事件力度</translation>
- </message>
- <message>
- <source>Trigger Segment</source>
- <translation type="obsolete">触å‘片段</translation>
- </message>
- <message>
- <source>Remove Triggers</source>
- <translation type="obsolete">åˆ é™¤æ‰€æœ‰æ ‡è®°(&R)</translation>
- </message>
- <message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">ä¼°è®¡çš„æ—¶é—´æ ‡è®°æ˜¾ç¤ºä¸º</translation>
- </message>
- <message>
- <source>Transpose</source>
- <translation type="obsolete">å˜è°ƒ</translation>
- </message>
- <message>
- <source>By number of semitones: </source>
- <translation type="obsolete">输入è¦å˜è°ƒçš„åŠéŸ³æ•°å—：</translation>
- </message>
- <message>
- <source>Can't insert note: No grid duration selected</source>
- <translation type="obsolete">没有音符音长被选ä¸</translation>
- </message>
-</context>
-<context>
- <name>Rosegarden::NewNotationView</name>
- <message>
- <source>Note &Font</source>
- <translation type="obsolete">音符å—体(&F)</translation>
- </message>
- <message>
- <source>Si&ze</source>
- <translation type="obsolete">大å°(&Z)</translation>
- </message>
- <message>
- <source> Font: </source>
- <translation type="obsolete"> å—体： </translation>
- </message>
- <message>
- <source> Size: </source>
- <translation type="obsolete"> 大å°ï¼š </translation>
- </message>
- <message>
- <source> Spacing: </source>
- <translation type="obsolete"> 间隔： </translation>
- </message>
- <message>
- <source>LilyPond Preview Options</source>
- <translation type="obsolete">Lilypond 导出选项</translation>
- </message>
- <message>
- <source>LilyPond preview options</source>
- <translation type="obsolete">Lilypond 导出选项</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">å¯¼å‡ºå¤±è´¥ã€‚æ— æ³•æ‰“å¼€æ–‡ä»¶ä»¥å†™å…¥ã€‚</translation>
- </message>
- <message>
- <source>Unknown font action %1</source>
- <translation type="obsolete">未知的å—体行为 %1</translation>
- </message>
- <message>
- <source>Unknown font size action %1</source>
- <translation type="obsolete">未知的å—体大å°è¡Œä¸º %1</translation>
- </message>
- <message>
- <source>Can't paste multiple Segments into one</source>
- <translation type="obsolete">æ— æ³•å°†å¤šä¸ªå°èŠ‚粘贴入一个文件</translation>
+ <location filename="../../src/commands/segment/MoveTracksCommand.h" line="+46"/>
+ <source>Move Tracks...</source>
+ <translation>移动音轨...</translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::MultiKeyInsertionCommand</name>
<message>
- <source>Rosegarden</source>
- <translation type="obsolete">玫瑰å›</translation>
+ <location filename="../../src/commands/notation/MultiKeyInsertionCommand.h" line="+58"/>
+ <source>Change all to &Key %1...</source>
+ <translation>全部改为调 %1(&K)...</translation>
</message>
<message>
- <source>S&pacing</source>
- <translation type="obsolete">é—´è·</translation>
+ <location line="+2"/>
+ <source>Add &Key Change...</source>
+ <translation>æ·»åŠ è°ƒå·(&K)...</translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::MusicXMLOptionsDialog</name>
<message>
- <source>Unknown font "%1", using default</source>
- <translation type="obsolete">未知的å—体“%1â€ï¼Œä½¿ç”¨é»˜è®¤å€¼</translation>
+ <location filename="../../src/gui/dialogs/MusicXMLOptionsDialog.cpp" line="+60"/>
+ <source>MusicXML Export</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Unknown spacing action %1</source>
- <translation type="obsolete">未知的间隔行为 %1</translation>
+ <location line="+16"/>
+ <source>Layout</source>
+ <translation type="unfinished">布局</translation>
</message>
<message>
- <source>Couldn't paste at this point.</source>
- <translation type="obsolete">æ— æ³•ç²˜è´´åˆ°è¿™ç‚¹ã€‚</translation>
+ <location line="+7"/>
+ <source>Headers</source>
+ <translation type="unfinished">题头</translation>
</message>
<message>
- <source>Clipboard is empty</source>
- <translation type="obsolete">剪贴æ¿æ˜¯ç©ºçš„</translation>
+ <location line="+6"/>
+ <source>Basic options</source>
+ <translation type="unfinished">基本选项</translation>
</message>
<message>
- <source>Inserting clipboard contents...</source>
- <translation type="obsolete">æ£åœ¨æ’入剪贴æ¿å†…容...</translation>
+ <location line="+12"/>
+ <source>Export content</source>
+ <translation type="unfinished">导出内容</translation>
</message>
<message>
- <source>Raising velocities...</source>
- <translation type="obsolete">æ£åœ¨æå‡åŠ›åº¦...</translation>
+ <location line="+2"/>
+ <source><qt>Choose which tracks or segments to export</qt></source>
+ <translation type="unfinished"><qt>选择è¦å¯¼å‡ºçš„音轨或片段</qt></translation>
</message>
<message>
- <source>Lowering velocities...</source>
- <translation type="obsolete">æ£åœ¨é™ä½ŽåŠ›åº¦...</translation>
+ <location line="+1"/>
+ <source>All tracks</source>
+ <translation type="unfinished">所有音轨</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">设定事件力度</translation>
+ <location line="+1"/>
+ <source>Non-muted tracks</source>
+ <translation type="unfinished">未é™éŸ³éŸ³è½¨</translation>
</message>
<message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">æ£åœ¨è®¾å®šåŠ›åº¦...</translation>
+ <location line="+1"/>
+ <source>Selected track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Unknown note insert action %1</source>
- <translation type="obsolete">未知的音符æ’入行为 %1</translation>
+ <location line="+1"/>
+ <source>Selected segments</source>
+ <translation type="unfinished">选ä¸çš„片段</translation>
</message>
<message>
- <source>Inserting note</source>
- <translation type="obsolete">æ£åœ¨æ’入音符</translation>
+ <location line="+3"/>
+ <source>Export track staff brackets</source>
+ <translation type="unfinished">到处连谱å·</translation>
</message>
<message>
- <source>Ornament bar %1</source>
- <translation type="obsolete">å°èŠ‚(&M)</translation>
+ <location line="+2"/>
+ <source><qt>Track staff brackets are found in the <b>Track Parameters</b> box, and may be used to group staffs in various ways</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">制作修饰符</translation>
+ <location line="+6"/>
+ <source>Advanced/Experimental options</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Use Ornament</source>
- <translation type="obsolete">使用修饰符</translation>
+ <location line="+11"/>
+ <source>Compatibility level</source>
+ <translation type="unfinished">兼容级别</translation>
</message>
<message>
- <source>Remove Ornaments</source>
- <translation type="obsolete">åˆ é™¤æ‰€æœ‰æ ‡è®°(&R)</translation>
+ <location line="+2"/>
+ <source><qt>Set the MusicXML version you want export</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Estimated key signature shown</source>
- <translation type="obsolete">ä¼°è®¡çš„åŸºè°ƒæ ‡è®°æ˜¾ç¤ºä¸º</translation>
+ <location line="+9"/>
+ <source><qt><p>Choose the format of the MusicXML file.</p><p>The "partwise" format contains "part" elements that contain "measure" elements. The "timewise" format reverses this ordering.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Sustain</source>
- <translation type="obsolete">æŒç»</translation>
+ <location line="+6"/>
+ <source>Export grand staff instrument</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Estimated time signature shown</source>
- <translation type="obsolete">ä¼°è®¡çš„æ—¶é—´æ ‡è®°æ˜¾ç¤ºä¸º</translation>
+ <location line="+6"/>
+ <source><qt>Choose which bracket will create a grand staff system</qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Can't insert note: No note duration selected</source>
- <translation type="obsolete">没有音符音长被选ä¸</translation>
+ <location line="+9"/>
+ <source><qt><p>Exporting percussion is still experimental.</p>Percussion can be exported "as notes" or "as percussion." When exporting "as notes" a percussion track is handled as a normal track.</p><p>If a track is exported "as percussion" it will be exported as a MusicXML percussion part. Since Rosegarden doesn't have percussion notation, MusicXML Export tries to convert the percussion track to percussion notation. This option is still <b>experimental</b>.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Time: %1 (%2.%3s)</source>
- <translation type="obsolete">时间：%1</translation>
+ <location line="+6"/>
+ <source><qt><p>Some transposing instruments (like a tenor or baritone sax) transpose over more than one octave. For such large transpositions some tools require an "<octave-shift>" element while other tools do not support this element at all.</p><p>When importing the MusicXML file into another tool, check transposing instruments carefully in both concert and notated pitch. When this is not correct toggling this option might help.</p></qt></source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">音长</translation>
+ <location line="-29"/>
+ <source>MusicXML type</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Triplet</source>
- <translation type="obsolete">三连音</translation>
+ <location line="+10"/>
+ <source>None</source>
+ <translation type="unfinished">æ— </translation>
</message>
<message>
- <source>Chord</source>
- <translation type="obsolete">和弦</translation>
+ <location line="+7"/>
+ <source>Don't export percussion tracks</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Grace</source>
- <translation type="obsolete">å–消装饰音(&R)</translation>
+ <location line="+8"/>
+ <source>Use "<octave-shift>" for transposing instruments</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Transpose</source>
- <translation type="obsolete">å˜è°ƒ</translation>
+ <location line="+45"/>
+ <source>http://rosegardenmusic.com/wiki/doc:manual-musicxmlexportoptions-en</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Rosegarden::NameSetEditor</name>
<message>
- <source>By number of semitones: </source>
- <translation type="obsolete">输入è¦å˜è°ƒçš„åŠéŸ³æ•°å—：</translation>
+ <location filename="../../src/gui/studio/NameSetEditor.cpp" line="+67"/>
+ <source>Provided by</source>
+ <translation>æ供者</translation>
</message>
</context>
<context>
@@ -18582,13 +17828,13 @@ of others.</source>
<context>
<name>Rosegarden::NotationConfigurationPage</name>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+53"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.h" line="+52"/>
<location line="+1"/>
<source>Notation</source>
<translation>ä¹è°±</translation>
</message>
<message>
- <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+81"/>
+ <location filename="../../src/gui/configuration/NotationConfigurationPage.cpp" line="+80"/>
<source>Default layout mode</source>
<translation>默认布局模å¼</translation>
</message>
@@ -18618,18 +17864,6 @@ of others.</source>
<translation>%1 % (æ£å¸¸)</translation>
</message>
<message>
- <source>Default duration factor</source>
- <translation type="obsolete">é»˜è®¤éŸ³é•¿å› æ•°</translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">æ— </translation>
- </message>
- <message>
- <source>Full</source>
- <translation type="obsolete">充满</translation>
- </message>
- <message>
<location line="+12"/>
<source>Show track headers (linear layout only)</source>
<translation>显示音轨头(仅对线性布局)</translation>
@@ -18841,10 +18075,6 @@ of others.</source>
<translation>多谱表视图的å—体大å°</translation>
</message>
<message>
- <source>Font size for printing (pt)</source>
- <translation type="obsolete">打å°å—体大å°(pt)</translation>
- </message>
- <message>
<location line="+18"/>
<source>Text font</source>
<translation>文本å—体</translation>
@@ -19155,14 +18385,6 @@ This is a bug (the program would previously have crashed by now)</source>
<context>
<name>Rosegarden::NotationView</name>
<message>
- <source>Starting...</source>
- <translation type="obsolete">已开始...</translation>
- </message>
- <message>
- <source>Preparing to print...</source>
- <translation type="obsolete">æ£åœ¨æ¸…除音频数æ®...</translation>
- </message>
- <message>
<location filename="../../src/gui/editors/notation/NotationView.cpp" line="+121"/>
<source>Note &Font</source>
<translation>音符å—体(&F)</translation>
@@ -19177,14 +18399,6 @@ This is a bug (the program would previously have crashed by now)</source>
<source>S&pacing</source>
<translation type="unfinished">é—´è·</translation>
</message>
- <message>
- <source>Du&ration Factor</source>
- <translation type="obsolete">音长 </translation>
- </message>
- <message>
- <source>None</source>
- <translation type="obsolete">æ— </translation>
- </message>
<message numerus="yes">
<location line="-8"/>
<source>%n pixel(s)</source>
@@ -19193,7 +18407,7 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+150"/>
+ <location line="+152"/>
<source> Font: </source>
<translation> å—体: </translation>
</message>
@@ -19213,48 +18427,12 @@ This is a bug (the program would previously have crashed by now)</source>
<translation> é—´éš”: </translation>
</message>
<message>
- <source> Ready.</source>
- <translation type="obsolete"> 已就绪。</translation>
- </message>
- <message>
- <source>Laying out score...</source>
- <translation type="obsolete">æ£åœ¨å¸ƒç½®ä¹è°±...</translation>
- </message>
- <message>
- <source>Laying out staff %1...</source>
- <translation type="obsolete">æ£åœ¨å¸ƒç½®äº”线谱 %1...</translation>
- </message>
- <message>
- <source>Reconciling staffs...</source>
- <translation type="obsolete">æ£åœ¨è°ƒå’Œäº”线谱...</translation>
- </message>
- <message>
- <location line="-115"/>
+ <location line="-117"/>
<source> No selection </source>
<translation> æœªé€‰ä¸ </translation>
</message>
<message>
- <source>Sizing and allocating canvas...</source>
- <translation type="obsolete">æ£åœ¨ä¼°è®¡è§„模和分é…画布...</translation>
- </message>
- <message>
- <source>note</source>
- <translation type="obsolete">音符</translation>
- </message>
- <message>
- <source>rest</source>
- <translation type="obsolete">休æ¢ç¬¦</translation>
- </message>
- <message>
- <source>%1 - All Segments - Notation</source>
- <translation type="obsolete">音长</translation>
- </message>
- <message>
- <source>Triplet</source>
- <translation type="obsolete">三连音</translation>
- </message>
- <message>
- <location line="+2653"/>
+ <location line="+2680"/>
<source>Chord</source>
<translation>和弦</translation>
</message>
@@ -19271,53 +18449,21 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>%1 %2</translation>
</message>
<message>
- <source>Hidden annotations</source>
- <translation type="obsolete">éšè—æ ‡æ³¨</translation>
- </message>
- <message>
- <location line="-2253"/>
+ <location line="-2278"/>
<source>Unknown spacing action %1</source>
<translation type="unfinished">未知的间隔行为 %1</translation>
</message>
<message>
- <source>Unknown proportion action %1</source>
- <translation type="obsolete">未知的å—体行为 %1</translation>
- </message>
- <message>
<location line="-51"/>
<source>Unknown font action %1</source>
<translation>未知的å—体行为 %1</translation>
</message>
<message>
- <source>Unknown font size %1</source>
- <translation type="obsolete">未知的å—ä½“å¤§å° %1</translation>
- </message>
- <message>
<location line="+26"/>
<source>Unknown font size action %1</source>
<translation>未知的å—体大å°è¡Œä¸º %1</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">æ£åœ¨æ‰“å°...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">æ£åœ¨æ‰“å°...</translation>
- </message>
- <message>
- <source>Printing LilyPond file...</source>
- <translation type="obsolete">æ£åœ¨å¯¼å‡º Lilypond 文件...</translation>
- </message>
- <message>
- <source>Failed to open a temporary file for LilyPond export.</source>
- <translation type="obsolete">选择一个或更多音频文件</translation>
- </message>
- <message>
- <source>Previewing LilyPond file...</source>
- <translation type="obsolete">æ£åœ¨å¯¼å‡º Lilypond 文件...</translation>
- </message>
- <message>
<location line="-147"/>
<source>LilyPond Preview Options</source>
<translation>Lilypond 导出选项</translation>
@@ -19328,37 +18474,17 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>Lilypond 导出选项</translation>
</message>
<message>
- <source>Exporting LilyPond file...</source>
- <translation type="obsolete">æ£åœ¨å¯¼å‡º Lilypond 文件...</translation>
- </message>
- <message>
- <source>Export failed. The file could not be opened for writing.</source>
- <translation type="obsolete">å¯¼å‡ºå¤±è´¥ã€‚æ— æ³•æ‰“å¼€æ–‡ä»¶ä»¥å†™å…¥ã€‚</translation>
- </message>
- <message>
- <source>Cutting selection to clipboard...</source>
- <translation type="obsolete">æ£åœ¨æŠŠé€‰ä¸åŒºå‰ªåˆ‡åˆ°å‰ªè´´æ¿...</translation>
- </message>
- <message>
- <source>Deleting selection...</source>
- <translation type="obsolete">æ£åœ¨åˆ 除选择区...</translation>
- </message>
- <message>
- <source>Copying selection to clipboard...</source>
- <translation type="obsolete">æ£åœ¨æŠŠé€‰ä¸åŒºå¤åˆ¶åˆ°å‰ªè´´æ¿...</translation>
- </message>
- <message>
- <location line="+296"/>
+ <location line="+298"/>
<source>Clipboard is empty</source>
<translation>剪贴æ¿æ˜¯ç©ºçš„</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-55"/>
<source>Can't paste multiple Segments into one</source>
<translation>æ— æ³•å°†å¤šä¸ªç‰‡æ®µç²˜è´´åˆ°ä¸€ä¸ªç‰‡æ®µé‡Œ</translation>
</message>
<message>
- <location line="-784"/>
+ <location line="-786"/>
<source><qt><p>Apply the interpretations selected on this toolbar to the selection.</p><p>If there is no selection, interpretations apply to the entire segment automatically.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -19370,23 +18496,22 @@ This is a bug (the program would previously have crashed by now)</source>
</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+88"/>
<location line="+173"/>
<location line="+52"/>
<location line="+57"/>
<location line="+26"/>
<location line="+25"/>
<location line="+103"/>
- <location line="+56"/>
- <location line="+898"/>
- <location line="+729"/>
- <location line="+830"/>
- <location line="+269"/>
+ <location line="+58"/>
+ <location line="+900"/>
+ <location line="+730"/>
+ <location line="+1111"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-3035"/>
+ <location line="-3052"/>
<source>Printing with LilyPond...</source>
<translation>æ£åœ¨ä½¿ç”¨ LilyPond 打å°...</translation>
</message>
@@ -19401,29 +18526,29 @@ This is a bug (the program would previously have crashed by now)</source>
<translation><qt><p>æ— æ³•ä¸º LilyPond 导出打开一个临时文件.</p><p>è¿™å¯èƒ½æ˜¯å› 为ç£ç›˜ <pre>%1</pre>的空间ä¸è¶³</p></qt></translation>
</message>
<message>
- <location line="+213"/>
- <location line="+56"/>
+ <location line="+214"/>
+ <location line="+58"/>
<source><qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-34"/>
<source>Inserting clipboard contents...</source>
<translation>æ£åœ¨æ’入剪贴æ¿å†…容...</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+56"/>
+ <location line="-26"/>
+ <location line="+58"/>
<source>Couldn't paste at this point.</source>
<translation>æ— æ³•ç²˜è´´åˆ°è¿™ç‚¹.</translation>
</message>
<message>
- <location line="+2811"/>
+ <location line="+2826"/>
<source>Move Events to Staff Above</source>
<translation>移动事件到上一谱表</translation>
</message>
<message>
- <location line="-2670"/>
+ <location line="-2683"/>
<source>Raising velocities...</source>
<translation>æ£åœ¨æå‡åŠ›åº¦...</translation>
</message>
@@ -19433,15 +18558,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>æ£åœ¨é™ä½ŽåŠ›åº¦...</translation>
</message>
<message>
- <source>Set Event Velocities</source>
- <translation type="obsolete">设定事件力度</translation>
- </message>
- <message>
- <source>Setting Velocities...</source>
- <translation type="obsolete">æ£åœ¨è®¾å®šåŠ›åº¦...</translation>
- </message>
- <message>
- <location line="+2817"/>
+ <location line="+2830"/>
<source>Edit Text Event</source>
<translation>编辑文本事件</translation>
</message>
@@ -19456,11 +18573,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>æ£åœ¨åŽ‹ç¼©éŸ³ç¬¦...</translation>
</message>
<message>
- <source>No note duration selected</source>
- <translation type="obsolete">没有音符音长被选ä¸</translation>
- </message>
- <message>
- <location line="-2134"/>
+ <location line="-2147"/>
<source>Unknown note insert action %1</source>
<translation>未知的音符æ’入行为 %1</translation>
</message>
@@ -19470,29 +18583,13 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>æ£åœ¨æ’入音符</translation>
</message>
<message>
- <source>No rest duration selected</source>
- <translation type="obsolete">没有已选ä¸çš„休æ¢ç¬¦æ—¶é•¿</translation>
- </message>
- <message>
- <source>No note or rest duration selected</source>
- <translation type="obsolete">没有已选ä¸çš„休æ¢ç¬¦æ—¶é•¿</translation>
- </message>
- <message>
- <source>Quantizing...</source>
- <translation type="obsolete">æ£åœ¨é‡åŒ–...</translation>
- </message>
- <message>
- <source>Interpreting selection...</source>
- <translation type="obsolete">æ£åœ¨è§£æžé€‰æ‹©åŒº...</translation>
- </message>
- <message>
- <location line="+2308"/>
+ <location line="+2321"/>
<location line="+10"/>
<source>Adding dot...</source>
<translation>æ£åœ¨æ·»åŠ 附点...</translation>
</message>
<message>
- <location line="-1929"/>
+ <location line="-1942"/>
<source>Ornament track %1 bar %2</source>
<translation type="unfinished"></translation>
</message>
@@ -19502,10 +18599,6 @@ This is a bug (the program would previously have crashed by now)</source>
<translation>è£…é¥°ç¬¦å· å°èŠ‚ %1</translation>
</message>
<message>
- <source>Make Ornament</source>
- <translation type="obsolete">制作装饰符å·</translation>
- </message>
- <message>
<location line="+38"/>
<source>Use Ornament</source>
<translation type="unfinished">使用修饰符</translation>
@@ -19541,7 +18634,7 @@ This is a bug (the program would previously have crashed by now)</source>
<translation type="unfinished">ä¿æŒ</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+17"/>
<source>There is no sustain controller defined for this device.
Please ensure the device is configured correctly in the Manage MIDI Devices dialog in the main window.</source>
<translation type="unfinished"></translation>
@@ -19552,7 +18645,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished">ä¼°è®¡çš„æ—¶é—´æ ‡è®°æ˜¾ç¤ºä¸º</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+168"/>
<source>%1%2 - Segment Track #%3 - Notation</source>
<translation>%1%2 - 片段 音轨 #%3 - ä¹è°±</translation>
</message>
@@ -19584,7 +18677,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>åŠéŸ³ä¸ªæ•°:</translation>
</message>
<message>
- <location line="+379"/>
+ <location line="+371"/>
<source>Time: %1 (%2.%3s)</source>
<translation>时间: %1 (%2.%3s)</translation>
</message>
@@ -19633,16 +18726,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<source>Cycling slashes...</source>
<translation>å¾ªçŽ¯åˆ‡æ¢ slashes...</translation>
</message>
- <message>
- <location line="-822"/>
- <source>Can't insert note: No note duration selected</source>
- <translation>æ— æ³•æ’入音符: 没有选ä¸éŸ³ç¬¦æ—¶å€¼</translation>
- </message>
</context>
<context>
<name>Rosegarden::NotationWidget</name>
<message>
- <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1429"/>
+ <location filename="../../src/gui/editors/notation/NotationWidget.cpp" line="-1461"/>
<source>Zoom</source>
<translation>缩放</translation>
</message>
@@ -19667,7 +18755,7 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>å…³é—音轨头</translation>
</message>
<message>
- <location line="+1439"/>
+ <location line="+1471"/>
<location line="+1"/>
<source><qt>Rotate wheel to change the active segment</qt></source>
<translation><qt>转动轮改å˜å½“å‰ç‰‡æ®µ</qt></translation>
@@ -19889,10 +18977,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<context>
<name>Rosegarden::PitchBendSequenceDialog</name>
<message>
- <source>Pitch Bend Sequence</source>
- <translation type="obsolete">弯音轮事件åºåˆ—</translation>
- </message>
- <message>
<location filename="../../src/gui/dialogs/PitchBendSequenceDialog.cpp" line="+129"/>
<source>Preset</source>
<translation>预设</translation>
@@ -19903,10 +18987,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>预设:</translation>
</message>
<message>
- <source>User</source>
- <translation type="obsolete">用户</translation>
- </message>
- <message>
<location line="-67"/>
<location line="+687"/>
<source>%1 Sequence</source>
@@ -20134,14 +19214,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <source>Value (%):</source>
- <translation type="obsolete">值 (%):</translation>
- </message>
- <message>
- <source>Duration (%):</source>
- <translation type="obsolete">时值 (%):</translation>
- </message>
- <message>
<location line="+50"/>
<source>Ramp duration (%):</source>
<translation type="unfinished"></translation>
@@ -20162,19 +19234,11 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation type="unfinished"></translation>
</message>
<message>
- <source>http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</source>
- <translation type="obsolete">http://rosegardenmusic.com/wiki/doc:pitchBendSequenceDialog-en</translation>
- </message>
- <message>
<location line="-28"/>
<source>Bend Sequence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resolution:</source>
- <translation type="obsolete">解æžåº¦:</translation>
- </message>
- <message>
<location line="+190"/>
<source>Invalid end time. Have you selected some events?</source>
<translation>æ— æ•ˆçš„ç»ˆæ¢æ—¶é—´. 确定选ä¸äº†ä¸€äº›äº‹ä»¶å—?</translation>
@@ -20505,10 +19569,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<context>
<name>Rosegarden::ProgressDialog</name>
<message>
- <source>Processing...</source>
- <translation type="obsolete">æ£åœ¨å¤„ç†...</translation>
- </message>
- <message>
<location filename="../../src/gui/widgets/ProgressDialog.cpp" line="+65"/>
<source>Rosegarden</source>
<translation type="unfinished">玫瑰å›</translation>
@@ -20705,23 +19765,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
</context>
<context>
- <name>Rosegarden::PropertyViewRuler</name>
- <message>
- <source>%1 controller</source>
- <translation type="obsolete">%1 控制器</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::QuantizeDialog</name>
<message>
<location filename="../../src/gui/dialogs/QuantizeDialog.cpp" line="+36"/>
<source>Quantize</source>
<translation>é‡åŒ–</translation>
</message>
- <message>
- <source>Advanced</source>
- <translation type="obsolete">高级</translation>
- </message>
</context>
<context>
<name>Rosegarden::QuantizeParameters</name>
@@ -20803,12 +19852,12 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
</message>
<message>
<location line="+2"/>
- <location line="+140"/>
+ <location line="+118"/>
<source>None</source>
<translation>æ— </translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-117"/>
<source>2-in-the-time-of-3</source>
<translation>2-in-the-time-of-3</translation>
</message>
@@ -20853,10 +19902,6 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>在é‡åŒ–åŽ</translation>
</message>
<message>
- <source>Show advanced options</source>
- <translation type="obsolete">高级选项</translation>
- </message>
- <message>
<location line="+6"/>
<source>Re-beam</source>
<translation>é‡æ–°è®¡ç®—符æ </translation>
@@ -20877,18 +19922,10 @@ Please ensure the device is configured correctly in the Manage MIDI Devices dial
<translation>拆分与连接é‡å 的和弦音</translation>
</message>
<message>
- <location line="+99"/>
+ <location line="+77"/>
<source>Full quantize</source>
<translation>完全é‡åŒ–</translation>
</message>
- <message>
- <source>Show Advanced Options</source>
- <translation type="obsolete">高级选项</translation>
- </message>
- <message>
- <source>Hide Advanced Options</source>
- <translation type="obsolete">高级选项</translation>
- </message>
</context>
<context>
<name>Rosegarden::RawNoteRuler</name>
@@ -21201,12 +20238,6 @@ There may be some incompatibilities with the file format.</source>
<context>
<name>Rosegarden::RosegardenDocument</name>
<message>
- <source>The current file has been modified.
-Do you want to save it?</source>
- <translation type="obsolete">当å‰æ–‡ä»¶å·²è¢«ä¿®æ”¹ã€‚
-您想ä¿å˜å®ƒå—？</translation>
- </message>
- <message>
<location filename="../../src/document/RosegardenDocument.cpp" line="+345"/>
<source>Rosegarden - Warning</source>
<translation>Rosegarden - è¦å‘Š</translation>
@@ -21230,8 +20261,8 @@ Do you want to save it?</source>
<location line="+55"/>
<location line="+45"/>
<location line="+42"/>
- <location line="+388"/>
- <location line="+648"/>
+ <location line="+405"/>
+ <location line="+658"/>
<location line="+25"/>
<location line="+3"/>
<location line="+37"/>
@@ -21243,7 +20274,7 @@ Do you want to save it?</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-2485"/>
+ <location line="-2512"/>
<source>Could not save document at %1</source>
<translation>æ— æ³•ä¿å˜æ–‡æ¡£åˆ° %1</translation>
</message>
@@ -21313,7 +20344,12 @@ Please select any you wish to delete permanently from the hard disk.
<translation>åˆå¹¶</translation>
</message>
<message>
- <location line="+492"/>
+ <location line="+504"/>
+ <source>'%1' is read-only. Please save to a different file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Could not create temporary file in directory of '%1': %2</source>
<translation>æ— æ³•åˆ›å»ºä¸´æ—¶æ–‡ä»¶äºŽ '%1': %2</translation>
</message>
@@ -21328,7 +20364,7 @@ Please select any you wish to delete permanently from the hard disk.
<translation>将临时输出文件 '%1'é‡å‘½å为输出文件 '%2' 失败</translation>
</message>
<message>
- <location line="+1818"/>
+ <location line="+1822"/>
<source>Warning</source>
<translation type="unfinished">è¦å‘Š</translation>
</message>
@@ -21337,14 +20373,12 @@ Please select any you wish to delete permanently from the hard disk.
<source>The audio file path does not exist or is not writable.
Please set the audio file path to a valid directory in Document Properties before recording audio.
Would you like to set it now?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Saving file...</source>
- <translation type="obsolete">æ£åœ¨ä¿å˜æ–‡ä»¶...</translation>
+ <translation type="unfinished">音频文件路径ä¸å˜åœ¨æˆ–ä¸å¯å†™.
+请于录音之å‰åœ¨æ–‡æ¡£å±žæ€§ä¸è®¾ç½®ä¸€ä¸ªæœ‰æ•ˆçš„音频文件路径.
+è¦çŽ°åœ¨è®¾ç½®å—?</translation>
</message>
<message>
- <location line="-1632"/>
+ <location line="-1633"/>
<source>Error while writing on '%1'</source>
<translation>写入 '%1' 时出错</translation>
</message>
@@ -21420,11 +20454,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<context>
<name>Rosegarden::RosegardenMainViewWidget</name>
<message>
- <source>No non-audio segments in composition</source>
- <translation type="obsolete">作å“里没有éžéŸ³é¢‘片段</translation>
- </message>
- <message>
- <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+303"/>
+ <location filename="../../src/gui/application/RosegardenMainViewWidget.cpp" line="+292"/>
<source>Selection must contain only audio or non-audio segments</source>
<translation>选择åªèƒ½åŒ…括音频或éžéŸ³é¢‘片段</translation>
</message>
@@ -21435,7 +20465,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<location line="+39"/>
<location line="+141"/>
<location line="+77"/>
- <location line="+764"/>
+ <location line="+757"/>
<location line="+3"/>
<location line="+61"/>
<location line="+6"/>
@@ -21444,7 +20474,7 @@ We recommend you re-save this file from this version of Rosegarden to ensure tha
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-1446"/>
+ <location line="-1439"/>
<location line="+148"/>
<location line="+188"/>
<location line="+39"/>
@@ -21465,7 +20495,7 @@ See Edit -> Preferences -> Audio.</source>
è§ ç¼–è¾‘ -> 选项 -> 音频.</translation>
</message>
<message>
- <location line="+764"/>
+ <location line="+757"/>
<source>Cannot add dropped file. JACK audio server is not available.</source>
<translation type="unfinished"></translation>
</message>
@@ -21475,10 +20505,6 @@ See Edit -> Preferences -> Audio.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>importing a remote audio file</source>
- <translation type="obsolete">æ£åœ¨å¯¼å‡ºéŸ³é¢‘文件...</translation>
- </message>
- <message>
<location line="+28"/>
<source>importing an audio file that needs to be converted or resampled</source>
<translation>å¯¼å…¥ä¸€ä¸ªéŸ³é¢‘æ–‡ä»¶ä»¥è¿›è¡Œæ ¼å¼è½¬æ¢æˆ–é‡æ–°é‡‡æ ·</translation>
@@ -21538,14 +20564,14 @@ See Edit -> Preferences -> Audio.</source>
<translation>æ£åœ¨å¯åŠ¨...</translation>
</message>
<message>
- <location line="+539"/>
+ <location line="+527"/>
<source> Zoom: </source>
<translation> 缩放: </translation>
</message>
<message>
- <location line="+143"/>
- <location line="+174"/>
- <location line="+491"/>
+ <location line="+139"/>
+ <location line="+171"/>
+ <location line="+514"/>
<location line="+471"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
@@ -21574,12 +20600,12 @@ Do you want to open it instead ?</source>
</message>
<message>
<location line="+147"/>
- <location line="+4815"/>
+ <location line="+4804"/>
<source>Untitled</source>
<translation>未命å</translation>
</message>
<message>
- <location line="-4802"/>
+ <location line="-4791"/>
<location line="+334"/>
<location line="+166"/>
<source>Could not save document at %1
@@ -21619,12 +20645,12 @@ Error was : %2</source>
</message>
<message>
<location line="-79"/>
- <location line="+6270"/>
+ <location line="+6216"/>
<source>All supported files</source>
<translation>所有支æŒçš„文件</translation>
</message>
<message>
- <location line="-6269"/>
+ <location line="-6215"/>
<location line="+34"/>
<location line="+215"/>
<source>Rosegarden files</source>
@@ -21644,33 +20670,33 @@ Error was : %2</source>
<location line="+1644"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
<location line="+645"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
- <location line="+2832"/>
+ <location line="+2789"/>
<source>All files</source>
<translation>所有文件</translation>
</message>
<message>
- <location line="-6272"/>
+ <location line="-6218"/>
<location line="+35"/>
<source>Open File</source>
<translation>打开文件</translation>
</message>
<message>
- <location line="-1096"/>
+ <location line="-1111"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+950"/>
+ <location line="+965"/>
<source>%1%2 - %3</source>
<translation>%1%2 - %3</translation>
</message>
@@ -21680,16 +20706,16 @@ Error was : %2</source>
<location line="+1863"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+268"/>
+ <location line="+262"/>
<location line="+36"/>
<location line="+207"/>
<location line="+36"/>
- <location line="+3732"/>
+ <location line="+3684"/>
<source>Cannot open file %1</source>
<translation>æ— æ³•æ‰“å¼€æ–‡ä»¶â€œ%1â€</translation>
</message>
<message>
- <location line="-6188"/>
+ <location line="-6134"/>
<source>Saving file...</source>
<translation>æ£åœ¨ä¿å˜æ–‡ä»¶...</translation>
</message>
@@ -21729,14 +20755,6 @@ Error was : %2</source>
<translation>æ£åœ¨å…³é—文件...</translation>
</message>
<message>
- <source>Printing...</source>
- <translation type="obsolete">æ£åœ¨æ‰“å°...</translation>
- </message>
- <message>
- <source>Previewing...</source>
- <translation type="obsolete">æ£åœ¨æ‰“å°...</translation>
- </message>
- <message>
<location line="+13"/>
<source>Exiting...</source>
<translation>æ£åœ¨é€€å‡º...</translation>
@@ -21794,12 +20812,12 @@ Error was : %2</source>
</message>
<message>
<location line="+33"/>
- <location line="+2839"/>
+ <location line="+2828"/>
<source>Warning</source>
<translation>è¦å‘Š</translation>
</message>
<message>
- <location line="-2767"/>
+ <location line="-2756"/>
<source>Jog Selection</source>
<translation type="unfinished">清除选择</translation>
</message>
@@ -21845,12 +20863,12 @@ Error was : %2</source>
</message>
<message>
<location line="+111"/>
- <location line="+2942"/>
+ <location line="+2931"/>
<source>Set Global Tempo</source>
<translation>设置全局速度</translation>
</message>
<message>
- <location line="-2869"/>
+ <location line="-2858"/>
<source>Toggle the toolbar...</source>
<translation>切æ¢å·¥å…·æ ...</translation>
</message>
@@ -21915,12 +20933,12 @@ Error was : %2</source>
</message>
<message>
<location line="+1"/>
- <location line="+1280"/>
+ <location line="+1274"/>
<source>Rosegarden Project files</source>
<translation>Rosegarden 项目文件</translation>
</message>
<message>
- <location line="+1408"/>
+ <location line="+1403"/>
<source><qt><p>You must choose a filename for this composition before recording audio.</p><p>Audio files will be saved to <b>%1</b> as <b>rg-[<i>filename</i>]-[<i>instrument</i>]-<i>date</i>_<i>time</i>-<i>n</i>.wav</b>. You may wish to rename audio instruments before recording as well. For more information, please see the <a style="color:gold" href="http://www.rosegardenmusic.com/wiki/doc:audio-filenames-en">Rosegarden Wiki</a>.</p></qt></source>
<translation type="unfinished"></translation>
</message>
@@ -21930,13 +20948,13 @@ Error was : %2</source>
<translation>输入</translation>
</message>
<message>
- <location line="+1133"/>
+ <location line="+1110"/>
<source>http://rosegardenmusic.com/wiki/doc:manual-en</source>
<translation>http://rosegardenmusic.com/wiki/doc:manual-en</translation>
</message>
<message>
- <location line="-6806"/>
- <location line="+312"/>
+ <location line="-6795"/>
+ <location line="+335"/>
<location line="+87"/>
<location line="+161"/>
<location line="+2"/>
@@ -21960,8 +20978,8 @@ Error was : %2</source>
<location line="+39"/>
<location line="+52"/>
<location line="+36"/>
- <location line="+122"/>
- <location line="+146"/>
+ <location line="+119"/>
+ <location line="+143"/>
<location line="+36"/>
<location line="+35"/>
<location line="+172"/>
@@ -21971,7 +20989,7 @@ Error was : %2</source>
<location line="+256"/>
<location line="+4"/>
<location line="+36"/>
- <location line="+46"/>
+ <location line="+41"/>
<location line="+34"/>
<location line="+34"/>
<location line="+66"/>
@@ -21989,8 +21007,8 @@ Error was : %2</source>
<location line="+96"/>
<location line="+122"/>
<location line="+13"/>
- <location line="+1238"/>
- <location line="+159"/>
+ <location line="+1215"/>
+ <location line="+139"/>
<location line="+18"/>
<location line="+3"/>
<location line="+10"/>
@@ -21999,12 +21017,12 @@ Error was : %2</source>
<translation>Rosegarden</translation>
</message>
<message>
- <location line="-252"/>
+ <location line="-232"/>
<source>http://rosegardenmusic.com/tutorials/</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+504"/>
+ <location line="+484"/>
<source><h3>Newer version available</h3></source>
<translation><h3>有更新的版本å¯ç”¨</h3></translation>
</message>
@@ -22014,7 +21032,7 @@ Error was : %2</source>
<translation><p>您æ£åœ¨ä½¿ç”¨çš„版本是 %1. 现在有版本 %2 å¯ç”¨.</p><p>详情请å‚è§ <a style="color:gold" href="http://www.rosegardenmusic.com/getting/">Rosegarden 网站</a>.</p></translation>
</message>
<message>
- <location line="-4587"/>
+ <location line="-4533"/>
<source>Open MIDI File</source>
<translation>打开 MIDI 文件</translation>
</message>
@@ -22024,12 +21042,12 @@ Error was : %2</source>
<translation>åˆå¹¶ MIDI 文件</translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+124"/>
<source>Importing MIDI file...</source>
<translation>æ£åœ¨å¯¼å…¥ MIDI 文件...</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+36"/>
<source>Calculating notation...</source>
<translation>æ£åœ¨è®¡ç®—ä¹è°±...</translation>
</message>
@@ -22061,68 +21079,23 @@ Error was : %2</source>
<translation>æ— æ³•è½½å…¥ X11 Rosegarden 文件. 文件å¯èƒ½å·²ç»æŸå.</translation>
</message>
<message>
- <source>Open Hydrogen File</source>
- <translation type="obsolete">打开 Hydrogen 文件</translation>
- </message>
- <message>
- <source>Importing Hydrogen file...</source>
- <translation type="obsolete">æ£åœ¨å¯¼å…¥ Hydrogen 文件...</translation>
- </message>
- <message>
- <source>Can't load Hydrogen file. It appears to be corrupted.</source>
- <translation type="obsolete">æ— æ³•è½½å…¥ Hydrogen 文件. 文件å¯èƒ½å·²ç»æŸå.</translation>
- </message>
- <message>
- <source>Export and import of Rosegarden Project files</source>
- <translation type="obsolete">æ£åœ¨å¯¼å…¥çŽ«ç‘°å› 2.1 文件...</translation>
- </message>
- <message>
- <source>The Rosegarden Project Packager helper script</source>
- <translation type="obsolete">玫瑰å›-4 文件</translation>
- </message>
- <message>
- <source>Notation previews through LilyPond</source>
- <translation type="obsolete">æ£åœ¨å¯¼å‡º Lilypond 文件...</translation>
- </message>
- <message>
- <source>%1 - for LilyPond preview support</source>
- <translation type="obsolete">Lilypond 导出选项</translation>
- </message>
- <message>
- <source>The Rosegarden Audio File Importer helper script</source>
- <translation type="obsolete">玫瑰å›éŸ³é¢‘文件管ç†å™¨</translation>
- </message>
- <message>
- <source>%1 - for audio file import</source>
- <translation type="obsolete">声音文件路径</translation>
- </message>
- <message>
- <source><ul></source>
- <translation type="obsolete"><默认></translation>
- </message>
- <message>
- <source><li>%1</li></source>
- <translation type="obsolete">-- %1 (从 %2)
-</translation>
- </message>
- <message>
- <location line="+1035"/>
+ <location line="+1030"/>
<source><qt><p>Failed to open a temporary file for LilyPond export.</p><p>This probably means you have run out of disk space on <pre>%1</pre></p></qt></source>
<translation><qt><p>为导出 LilyPond 而打开一个临时文件的æ“作失败.</p><p>å¯èƒ½æ˜¯å› 为ç£ç›˜ <pre>%1</pre>的空间ä¸è¶³</p></qt></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-215"/>
<source>The Rosegarden sequencer process has exited unexpectedly. Sound and recording will no longer be available for this session.
Please exit and restart Rosegarden to restore sound capability.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-4851"/>
+ <location line="-4849"/>
<source>Starting sequencer...</source>
<translation>å¯åŠ¨éŸ³åºå™¨...</translation>
</message>
<message>
- <location line="+1937"/>
+ <location line="+1941"/>
<source>Saving file%1with a new filename...</source>
<comment>'file%1with' is correct. %1 will either become ' ' or ' as a template ' at runtime</comment>
<translation>æ£åœ¨å°†æ–‡ä»¶%1ä¿å˜ä¸ºæ–°çš„文件å...</translation>
@@ -22170,7 +21143,7 @@ No segment will be split.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1394"/>
+ <location line="+1388"/>
<location line="+36"/>
<source>Open MusicXML File</source>
<translation type="unfinished"></translation>
@@ -22200,7 +21173,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<message>
<location line="+5"/>
<location line="+39"/>
- <location line="+39"/>
+ <location line="+34"/>
<location line="+34"/>
<location line="+34"/>
<location line="+113"/>
@@ -22208,7 +21181,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation>导出为...</translation>
</message>
<message>
- <location line="-240"/>
+ <location line="-235"/>
<source>Saving Rosegarden file to package failed: %1</source>
<translation>ä¿å˜ Rosegarden 文件为包失败: %1</translation>
</message>
@@ -22224,7 +21197,7 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation>æ ‡å‡† MIDI 文件</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+23"/>
<location line="+34"/>
<location line="+34"/>
<location line="+156"/>
@@ -22291,9 +21264,9 @@ For assistance with correct audio and MIDI configuration, go to http://rosegarde
<translation>æ£åœ¨å¯¼å‡º MusicXML 文件...</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-953"/>
<location line="+36"/>
- <location line="+904"/>
+ <location line="+899"/>
<source>XML files</source>
<translation>XML 文件</translation>
</message>
@@ -22386,21 +21359,17 @@ Would you like to set it now?</source>
<translation>è¾“å…¥æ–°æ ‡ç¾</translation>
</message>
<message>
- <location line="+1096"/>
+ <location line="+1073"/>
<source>Play List</source>
<translation>æ’放列表</translation>
</message>
<message>
- <source>http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</source>
- <translation type="obsolete">http://www.rosegardenmusic.com/tutorials/en/chapter-0.html</translation>
- </message>
- <message>
<location line="+51"/>
<source>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</source>
<translation>http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html</translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+98"/>
<source>Queueing MIDI panic events for tranmission...</source>
<translation type="unfinished"></translation>
</message>
@@ -22472,7 +21441,7 @@ Error was : %2</source>
<translation><qt><p>音频文件路径 "%1" å¯ç”¨, 但是ä¸å¯å†™.</p>%2</qt></translation>
</message>
<message>
- <location line="-5907"/>
+ <location line="-5853"/>
<source>The audio file path does not exist or is not writable.
You must set the audio file path to a valid directory in Document Properties before %1.
Would you like to set it now?</source>
@@ -22489,7 +21458,7 @@ Would you like to set it now?</source>
<translation><qt><p>点击并å‘上下左å³æ‹–拽æ¥æ”¹åŠ¨.</p><p>åŒå‡»ç›´æŽ¥ç¼–辑值.</p></qt></translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+412"/>
<source>Select a new value</source>
<translation>选择一个新的值</translation>
</message>
@@ -22541,7 +21510,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentColourCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentColourCommand.h" line="+44"/>
<source>Change Segment Color...</source>
<translation>改å˜ç‰‡æ®µé¢œè‰²...</translation>
</message>
@@ -22584,7 +21553,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentEraser</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+76"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentEraser.cpp" line="+105"/>
<source>Click on a segment to delete it</source>
<translation>ç‚¹å‡»ä¸€ä¸ªç‰‡æ®µä»¥åˆ é™¤</translation>
</message>
@@ -22617,7 +21586,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentJoinCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+50"/>
+ <location filename="../../src/commands/segment/SegmentJoinCommand.h" line="+48"/>
<source>&Join</source>
<translation type="unfinished">åˆå¹¶(&J)</translation>
</message>
@@ -22625,7 +21594,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentLabelCommand</name>
<message>
- <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+47"/>
+ <location filename="../../src/commands/segment/SegmentLabelCommand.h" line="+45"/>
<source>Re&label...</source>
<translation>é‡æ–°æ ‡æ³¨(&L)...</translation>
</message>
@@ -22662,22 +21631,22 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentMover</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+159"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentMover.cpp" line="+176"/>
<source>Move Segment</source>
<translation>移动片段</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Move Segments</source>
<translation>移动片段</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+81"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>æŒ‰ä½ Shift é”®é¿å…å¸é™„åˆ°ç½‘æ ¼</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+76"/>
<source>Click and drag to move a segment</source>
<translation>点击并拖拽以移动一个片段</translation>
</message>
@@ -22872,12 +21841,12 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentPencil</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+233"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentPencil.cpp" line="+244"/>
<source>Hold Shift to avoid snapping to bar lines</source>
<translation>按ä½Shift以é¿å…å¸é™„到å°èŠ‚线</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+50"/>
<source>Record or drop audio here</source>
<translation>录制或拖拽音频到æ¤</translation>
</message>
@@ -22953,7 +21922,7 @@ before new transposition can be applied.</source>
<context>
<name>Rosegarden::SegmentResizer</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+152"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentResizer.cpp" line="+162"/>
<source>Warning</source>
<translation>è¦å‘Š</translation>
</message>
@@ -22977,17 +21946,17 @@ Would you like to set it now?</source>
<translation>æ£åœ¨ç”ŸæˆéŸ³é¢‘预览...</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+54"/>
<source>Resize Segment</source>
<translation type="unfinished">调整片段大å°</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+44"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>æŒ‰ä½ Shift é”®é¿å…å¸é™„到节æ‹ç½‘æ ¼ä¸Š</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents</source>
<translation>æŒ‰ä½ Shift é”®é¿å…å¸é™„到节æ‹ç½‘æ ¼ä¸Š; åŒæ—¶æŒ‰ä½ Ctrl é”®</translation>
</message>
@@ -22997,7 +21966,7 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+109"/>
<source>Click and drag to resize a segment; hold Ctrl as well to rescale its contents</source>
<translation>点击并拖拽以调整一个片段的大å°; åŒæ—¶æŒ‰ä½ Ctrl 键拉伸内容</translation>
</message>
@@ -23010,24 +21979,24 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::SegmentSelector</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+78"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSelector.cpp" line="+81"/>
<source>Click and drag to select segments</source>
<translation>点击并拖拽以选ä¸ç‰‡æ®µ</translation>
</message>
<message numerus="yes">
- <location line="+169"/>
- <source>Move Segment(s)</source>
- <translation>
- <numerusform>移动片段</numerusform>
+ <location line="+207"/>
+ <source>Move %n Segment(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+154"/>
+ <location line="+141"/>
<source>Hold Shift to avoid snapping to beat grid</source>
<translation>æŒ‰ä½ Shift 以é¿å…å¸é™„到节æ‹ç½‘æ ¼</translation>
</message>
<message>
- <location line="+108"/>
+ <location line="+120"/>
<source>Click and drag to select segments; middle-click and drag to draw an empty segment</source>
<translation>点击并拖拽以选ä¸ç‰‡æ®µ; 点击ä¸é—´å¹¶æ‹–拽以绘制一个空白的片段</translation>
</message>
@@ -23052,19 +22021,11 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Click and drag to move segments; hold Ctrl as well to copy them</source>
- <translation type="obsolete">点击并拖拽以移动片段; åŒæ—¶æŒ‰ä½ Ctrl é”®å¯ä»¥æ‹·è´</translation>
- </message>
- <message>
<location line="-4"/>
<source>Click and drag to copy segments</source>
<translation>点击并拖拽以拷è´ç‰‡æ®µ</translation>
</message>
<message>
- <source>Click and drag to move segment; hold Ctrl as well to copy it; double-click to edit</source>
- <translation type="obsolete">点击并拖拽以移动片段; åŒæ—¶æŒ‰ä½ Ctrl é”®å¯ä»¥æ‹·è´; åŒå‡»ä»¥ç¼–辑</translation>
- </message>
- <message>
<location line="+6"/>
<source>Click and drag to copy segment</source>
<translation>点击并拖拽以拷è´ç‰‡æ®µ</translation>
@@ -23135,24 +22096,12 @@ Would you like to set it now?</source>
</message>
</context>
<context>
- <name>Rosegarden::SegmentSplitTwiceCommand</name>
- <message>
- <source>Split Twice Segment</source>
- <translation type="obsolete">拆分两个片段</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SegmentSplitter</name>
<message>
- <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+167"/>
+ <location filename="../../src/gui/editors/segment/compositionview/SegmentSplitter.cpp" line="+61"/>
<source>Click on a segment to split it in two; hold Shift to avoid snapping to beat grid</source>
<translation>点击一个片段以拆分; æŒ‰ä½ Shift 键以é¿å…å¸é™„åˆ°ç½‘æ ¼</translation>
</message>
- <message>
- <location line="+2"/>
- <source>Click on a segment to split it in two</source>
- <translation>点击一个片段以拆分æˆä¸¤ä»½</translation>
- </message>
</context>
<context>
<name>Rosegarden::SegmentSyncClefCommand</name>
@@ -23979,26 +22928,6 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation>Rosegarden</translation>
</message>
<message>
- <source>C#</source>
- <translation type="obsolete">C#%1</translation>
- </message>
- <message>
- <source>D</source>
- <translation type="obsolete">ID</translation>
- </message>
- <message>
- <source>F#</source>
- <translation type="obsolete">F#%1</translation>
- </message>
- <message>
- <source>G#</source>
- <translation type="obsolete">G#%1</translation>
- </message>
- <message>
- <source>A</source>
- <translation type="obsolete">A4</translation>
- </message>
- <message>
<location line="-276"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
@@ -24010,13 +22939,6 @@ Quitting other running applications may improve Rosegarden's performance.</
</message>
</context>
<context>
- <name>Rosegarden::Studio</name>
- <message>
- <source>Audio</source>
- <translation type="obsolete">音频</translation>
- </message>
-</context>
-<context>
<name>Rosegarden::SustainInsertionCommand</name>
<message>
<location filename="../../src/commands/notation/SustainInsertionCommand.h" line="+51"/>
@@ -24890,7 +23812,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<context>
<name>Rosegarden::TrackButtons</name>
<message>
- <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+255"/>
+ <location filename="../../src/gui/editors/segment/TrackButtons.cpp" line="+264"/>
<source><no instrument></source>
<translation><æ— ä¹å™¨></translation>
</message>
@@ -24905,19 +23827,7 @@ Quitting other running applications may improve Rosegarden's performance.</
<translation><未命å></translation>
</message>
<message>
- <source>Warning</source>
- <translation type="obsolete">è¦å‘Š</translation>
- </message>
- <message>
- <source>The audio file path does not exist or is not writable.
-Please set the audio file path to a valid directory in Document Properties before recording audio.
-Would you like to set it now?</source>
- <translation type="obsolete">音频文件路径ä¸å˜åœ¨æˆ–ä¸å¯å†™.
-请于录音之å‰åœ¨æ–‡æ¡£å±žæ€§é‡Œè®¾ç½®ä¸€ä¸ªæœ‰æ•ˆçš„音频文件路径.
-现在è¦è®¾ç½®å—?</translation>
- </message>
- <message>
- <location line="+816"/>
+ <location line="+849"/>
<source>Mute track</source>
<translation>音轨é™éŸ³</translation>
</message>
@@ -24930,39 +23840,31 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::TrackEditor</name>
<message>
- <source>Turn Repeating Segment into Real Copies</source>
- <translation type="obsolete">å°†é‡å¤çš„片段转æ¢ä¸ºçœŸå®žå‰¯æœ¬</translation>
- </message>
- <message>
- <source>Turn Repeating Segments into Real Copies</source>
- <translation type="obsolete">å°†é‡å¤çš„片段转æ¢ä¸ºçœŸå®žå‰¯æœ¬</translation>
- </message>
- <message>
- <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+502"/>
+ <location filename="../../src/gui/editors/segment/TrackEditor.cpp" line="+379"/>
<source>Delete Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+207"/>
+ <location line="+196"/>
<source>Delete Segments</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+37"/>
+ <location line="+23"/>
<source>Turn %n Repeating Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location line="+25"/>
+ <location line="+26"/>
<source>Turn %n Linked Segment(s) into Real Copies</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location line="+231"/>
+ <location line="+319"/>
<source>Rosegarden</source>
<translation>Rosegarden</translation>
</message>
@@ -25008,7 +23910,7 @@ Would you like to set it now?</source>
<context>
<name>Rosegarden::TrackParameterBox</name>
<message>
- <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-435"/>
+ <location filename="../../src/gui/editors/parameters/TrackParameterBox.cpp" line="-443"/>
<source>Track</source>
<translation>音轨</translation>
</message>
@@ -25019,12 +23921,12 @@ Would you like to set it now?</source>
</message>
<message>
<location line="+48"/>
- <location line="+652"/>
+ <location line="+660"/>
<source><untitled></source>
<translation><未命å></translation>
</message>
<message>
- <location line="-645"/>
+ <location line="-653"/>
<source>Playback parameters</source>
<translation>æ’放å‚æ•°</translation>
</message>
@@ -25165,7 +24067,103 @@ Would you like to set it now?</source>
<translation><qt><p>将把æ¤è°±è¡¨æ·»åŠ 到新创建的片段起点ä½ç½®</p></qt></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+2"/>
+ <source>treble</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">treble</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">bass</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>crotales</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">crotales</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>xylophone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">xylophone</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>guitar</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">guitar</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>contrabass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">contrabass</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">celesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>old celesta</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">old celesta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>french</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">french</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>soprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">soprano</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>mezzosoprano</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">mezzosoprano</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>alto</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">alto</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>tenor</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">次ä¸éŸ³</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>baritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">baritone</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>varbaritone</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">varbaritone</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>subbass</source>
+ <comment>Clef name</comment>
+ <translation type="unfinished">次低音</translation>
+ </message>
+ <message>
+ <location line="+39"/>
<source><qt><p>Choose the lowest suggested playable note, using a staff</p></qt></source>
<translation><qt><p>在一个谱表内选择建议æ’放的最低音符</p></qt></translation>
</message>
@@ -25195,87 +24193,71 @@ Would you like to set it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>treble</source>
- <translation>treble</translation>
+ <translation type="obsolete">treble</translation>
</message>
<message>
- <location line="+1"/>
<source>bass</source>
- <translation>bass</translation>
+ <translation type="obsolete">bass</translation>
</message>
<message>
- <location line="+1"/>
<source>crotales</source>
- <translation>crotales</translation>
+ <translation type="obsolete">crotales</translation>
</message>
<message>
- <location line="+1"/>
<source>xylophone</source>
- <translation>xylophone</translation>
+ <translation type="obsolete">xylophone</translation>
</message>
<message>
- <location line="+1"/>
<source>guitar</source>
- <translation>guitar</translation>
+ <translation type="obsolete">guitar</translation>
</message>
<message>
- <location line="+1"/>
<source>contrabass</source>
- <translation>contrabass</translation>
+ <translation type="obsolete">contrabass</translation>
</message>
<message>
- <location line="+1"/>
<source>celesta</source>
- <translation>celesta</translation>
+ <translation type="obsolete">celesta</translation>
</message>
<message>
- <location line="+1"/>
<source>old celesta</source>
- <translation>old celesta</translation>
+ <translation type="obsolete">old celesta</translation>
</message>
<message>
- <location line="+1"/>
<source>french</source>
- <translation>french</translation>
+ <translation type="obsolete">french</translation>
</message>
<message>
- <location line="+1"/>
<source>soprano</source>
- <translation>soprano</translation>
+ <translation type="obsolete">soprano</translation>
</message>
<message>
- <location line="+1"/>
<source>mezzosoprano</source>
- <translation>mezzosoprano</translation>
+ <translation type="obsolete">mezzosoprano</translation>
</message>
<message>
- <location line="+1"/>
<source>alto</source>
- <translation>alto</translation>
+ <translation type="obsolete">alto</translation>
</message>
<message>
- <location line="+1"/>
<source>tenor</source>
- <translation>次ä¸éŸ³</translation>
+ <translation type="obsolete">次ä¸éŸ³</translation>
</message>
<message>
- <location line="+1"/>
<source>baritone</source>
- <translation>baritone</translation>
+ <translation type="obsolete">baritone</translation>
</message>
<message>
- <location line="+1"/>
<source>varbaritone</source>
- <translation>varbaritone</translation>
+ <translation type="obsolete">varbaritone</translation>
</message>
<message>
- <location line="+1"/>
<source>subbass</source>
- <translation>次低音</translation>
+ <translation type="obsolete">次低音</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+36"/>
<source>Transpose</source>
<translation>移调</translation>
</message>
@@ -25316,7 +24298,7 @@ Would you like to set it now?</source>
<translation><qt><p>新的片段将使用æ¤é¢œè‰²åˆ›å»º</p></qt></translation>
</message>
<message>
- <location line="+186"/>
+ <location line="+194"/>
<location line="+1"/>
<source>Audio</source>
<translation>音频</translation>
@@ -25946,24 +24928,6 @@ Would you like to set it now?</source>
</message>
</context>
<context>
- <name>RosegardenApplication</name>
- <message>
- <source>Rosegarden - A sequencer and musical notation editor</source>
- <translation type="obsolete">Rosegarden(玫瑰å›) - 音åºå‘生器和音ä¹è®°å·ç¼–辑器</translation>
- </message>
- <message>
- <source>Rosegarden</source>
- <translation type="obsolete">玫瑰å›</translation>
- </message>
-</context>
-<context>
- <name>RosegardenDocument</name>
- <message>
- <source>(recorded)</source>
- <translation type="obsolete">%1 (已录制)</translation>
- </message>
-</context>
-<context>
<name>RosegardenTransport</name>
<message>
<location filename="../../src/gui/dialogs/RosegardenTransportUi.ui" line="+25"/>
diff --git a/data/mime/rosegarden.xml b/data/mime/rosegarden.xml
index c278428..22eec5d 100644
--- a/data/mime/rosegarden.xml
+++ b/data/mime/rosegarden.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="audio/x-rosegarden-composition">
+ <mime-type type="application/x-rosegarden-composition">
<sub-class-of type="application/x-gzip"/>
<comment>Rosegarden composition</comment>
<comment xml:lang="en">Rosegarden composition</comment>
<comment xml:lang="es">Composición de Rosegarden</comment>
<glob pattern="*.rg"/>
</mime-type>
- <mime-type type="audio/x-rosegarden-device">
+ <mime-type type="application/x-rosegarden-device">
<sub-class-of type="application/x-gzip"/>
<comment>Rosegarden MIDI device definition</comment>
<comment xml:lang="en">Rosegarden MIDI device definition</comment>
@@ -15,14 +15,14 @@
<comment xml:lang="fr">Description de peripherique Rosegarden</comment>
<glob pattern="*.rgd"/>
</mime-type>
- <mime-type type="audio/x-rosegarden-project">
+ <mime-type type="application/x-rosegarden-project">
<sub-class-of type="application/x-gzip"/>
<comment>Rosegarden project</comment>
<comment xml:lang="en">Rosegarden project</comment>
<comment xml:lang="es">Proyecto de Rosegarden</comment>
<glob pattern="*.rgp"/>
</mime-type>
- <mime-type type="audio/x-rosegarden-template">
+ <mime-type type="application/x-rosegarden-template">
<sub-class-of type="application/x-gzip"/>
<comment>Rosegarden template</comment>
<comment xml:lang="en">Rosegarden template</comment>
diff --git a/data/rc/notation.rc b/data/rc/notation.rc
index 9c3a849..12c5f39 100644
--- a/data/rc/notation.rc
+++ b/data/rc/notation.rc
@@ -130,6 +130,8 @@
<text>&Composition</text>
<Action name="add_tempo" text="Add Te&mpo Change..." icon="event-insert-tempo" />
<Action name="add_time_signature" text="Add Time Si&gnature Change..." icon="event-insert-timesig" />
+ <!-- AL -->
+ <Action name="check_for_parallels" text="Check for Parallels..." />
</Menu>
<Menu name="segment">
diff --git a/data/templates/SATB.rgt b/data/templates/SATB_2_Staves.rgt
similarity index 100%
rename from data/templates/SATB.rgt
rename to data/templates/SATB_2_Staves.rgt
diff --git a/data/templates/SATB_4_Staves.rgt b/data/templates/SATB_4_Staves.rgt
new file mode 100644
index 0000000..993945a
Binary files /dev/null and b/data/templates/SATB_4_Staves.rgt differ
diff --git a/src/base/AnalysisTypes.cpp b/src/base/AnalysisTypes.cpp
index 8dcb931..322109f 100644
--- a/src/base/AnalysisTypes.cpp
+++ b/src/base/AnalysisTypes.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file is Copyright 2002
@@ -1125,8 +1125,8 @@ AnalysisHelper::guessKeyAtTime(Composition &comp, timeT t,
{
typedef std::map<Key,unsigned int> MapKeys;
MapKeys keyCounts;
- segmentcontainer& segs = comp.getSegments();
- for (segmentcontainer::iterator i = segs.begin();
+ SegmentMultiSet& segs = comp.getSegments();
+ for (SegmentMultiSet::iterator i = segs.begin();
i != segs.end();
++i) {
Segment *s = *i;
diff --git a/src/base/AnalysisTypes.h b/src/base/AnalysisTypes.h
index b3192f0..05f4b17 100644
--- a/src/base/AnalysisTypes.h
+++ b/src/base/AnalysisTypes.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file is Copyright 2002
diff --git a/src/base/AudioDevice.cpp b/src/base/AudioDevice.cpp
index 05e564a..0f893f0 100644
--- a/src/base/AudioDevice.cpp
+++ b/src/base/AudioDevice.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/AudioDevice.h b/src/base/AudioDevice.h
index 028d16e..3d2f1c2 100644
--- a/src/base/AudioDevice.h
+++ b/src/base/AudioDevice.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/AudioLevel.cpp b/src/base/AudioLevel.cpp
index d77910c..2e5fc94 100644
--- a/src/base/AudioLevel.cpp
+++ b/src/base/AudioLevel.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/AudioLevel.h b/src/base/AudioLevel.h
index f8038e1..b45a81e 100644
--- a/src/base/AudioLevel.h
+++ b/src/base/AudioLevel.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/AudioPluginInstance.cpp b/src/base/AudioPluginInstance.cpp
index e5b1452..b262b98 100644
--- a/src/base/AudioPluginInstance.cpp
+++ b/src/base/AudioPluginInstance.cpp
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/AudioPluginInstance.h b/src/base/AudioPluginInstance.h
index 2a269ba..499b8cf 100644
--- a/src/base/AudioPluginInstance.h
+++ b/src/base/AudioPluginInstance.h
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/BaseProperties.cpp b/src/base/BaseProperties.cpp
index bbde217..50da015 100644
--- a/src/base/BaseProperties.cpp
+++ b/src/base/BaseProperties.cpp
@@ -1,7 +1,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -117,6 +117,9 @@ const PropertyName INVISIBLE = "invisible";
const PropertyName TMP = "temporary"; /// TODO : TMP -> REPEATING
const PropertyName LINKED_SEGMENT_IGNORE_UPDATE = "linkedsegmentignoreupdate";
+// indicates whether note is part of a parallel movement between two voices
+const PropertyName MEMBER_OF_PARALLEL = "member_of_parallel";
+
}
}
diff --git a/src/base/BaseProperties.h b/src/base/BaseProperties.h
index ff6d9b0..fdefcf1 100644
--- a/src/base/BaseProperties.h
+++ b/src/base/BaseProperties.h
@@ -1,7 +1,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -73,6 +73,7 @@ extern const PropertyName INVISIBLE;
extern const PropertyName TMP; /// TODO : TMP->REPEATING
extern const PropertyName LINKED_SEGMENT_IGNORE_UPDATE;
+extern const PropertyName MEMBER_OF_PARALLEL;
}
}
diff --git a/src/base/BasicQuantizer.cpp b/src/base/BasicQuantizer.cpp
index d7e6f22..560bb23 100644
--- a/src/base/BasicQuantizer.cpp
+++ b/src/base/BasicQuantizer.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/BasicQuantizer.h b/src/base/BasicQuantizer.h
index 64106e9..80e7120 100644
--- a/src/base/BasicQuantizer.h
+++ b/src/base/BasicQuantizer.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/ChannelInterval.cpp b/src/base/ChannelInterval.cpp
index c30f737..cf41816 100644
--- a/src/base/ChannelInterval.cpp
+++ b/src/base/ChannelInterval.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/Clipboard.cpp b/src/base/Clipboard.cpp
index 8d60a22..58adb1f 100644
--- a/src/base/Clipboard.cpp
+++ b/src/base/Clipboard.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -101,9 +101,9 @@ Clipboard::newSegment()
}
Segment *
-Clipboard::newSegment(const Segment *copyFrom)
+Clipboard::newSegment(const Segment *copyFrom, bool deep)
{
- Segment *s = copyFrom->clone();
+ Segment *s = copyFrom->clone(deep);
m_segments.insert(s);
// don't change m_partial as we are inserting a complete segment
return s;
diff --git a/src/base/Clipboard.h b/src/base/Clipboard.h
index 0653dab..eb86ca7 100644
--- a/src/base/Clipboard.h
+++ b/src/base/Clipboard.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -35,9 +35,8 @@ class EventSelection;
class Clipboard
{
public:
- typedef std::multiset<Segment *, Segment::SegmentCmp> segmentcontainer;
- typedef segmentcontainer::iterator iterator;
- typedef segmentcontainer::const_iterator const_iterator;
+ typedef SegmentMultiSet::iterator iterator;
+ typedef SegmentMultiSet::const_iterator const_iterator;
Clipboard();
Clipboard(const Clipboard &);
@@ -94,8 +93,13 @@ public:
* Add a new segment to the clipboard, containing copies of
* the events in copyFrom. (The clipboard retains ownership
* of the new segment.)
+ * The parameter deep is passed to the Segment::clone() method used to
+ * create the new segment. This parameter is added to help fixing #1446.
+ * It is related to linked segments and has nothing to do with the "deep
+ * copies" vs "aliases" mentioned in the comment before the above
+ * "class clipboard" line.
*/
- Segment *newSegment(const Segment *copyFrom);
+ Segment *newSegment(const Segment *copyFrom, bool deep = true);
/**
* Add one or more new segments to the clipboard, containing
@@ -184,7 +188,7 @@ public:
void removeAudioSegments();
private:
- segmentcontainer m_segments;
+ SegmentMultiSet m_segments;
bool m_partial;
TimeSignatureSelection m_timeSigSelection;
diff --git a/src/base/Colour.cpp b/src/base/Colour.cpp
index 6cb57de..5ad7409 100644
--- a/src/base/Colour.cpp
+++ b/src/base/Colour.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file is Copyright 2003
@@ -35,12 +35,7 @@ Colour::Colour()
Colour::Colour(unsigned int red, unsigned int green, unsigned int blue)
{
- this->setColour(red, green, blue);
-}
-
-Colour::Colour(const Colour& input)
-{
- this->setColour(input.getRed(), input.getGreen(), input.getBlue());
+ setColour(red, green, blue);
}
Colour::~Colour()
@@ -48,15 +43,6 @@ Colour::~Colour()
}
-Colour&
-Colour::operator= (const Colour& input)
-{
- // We don't have to check for assignment to self because it'll have
- // no nasty effects (in fact, it'll do what it should - nothing)
- this->setColour(input.getRed(), input.getGreen(), input.getBlue());
- return *this;
-}
-
void
Colour::setColour(unsigned int red, unsigned int green, unsigned int blue)
{
@@ -65,14 +51,6 @@ Colour::setColour(unsigned int red, unsigned int green, unsigned int blue)
(blue<=255) ? m_b=blue : m_b=0;
}
-void
-Colour::getColour(unsigned int &red, unsigned int &green, unsigned int &blue) const
-{
- red = m_r;
- green = m_g;
- blue = m_b;
-}
-
unsigned int
Colour::getRed() const
{
@@ -91,6 +69,28 @@ Colour::getGreen() const
return m_g;
}
+std::string
+Colour::dataToXmlString() const
+{
+ std::stringstream output;
+ output << "red=\"" << m_r
+ << "\" green=\"" << m_g
+ << "\" blue=\"" << m_b
+ << "\"";
+
+ return output.str();
+}
+
+#if 0
+void
+Colour::getColour(unsigned int &red, unsigned int &green, unsigned int &blue) const
+{
+ red = m_r;
+ green = m_g;
+ blue = m_b;
+}
+#endif
+#if 0
void
Colour::setRed(unsigned int red)
{
@@ -108,14 +108,16 @@ Colour::setGreen(unsigned int green)
{
(green<=255) ? m_g=green : m_g=0;
}
-
+#endif
+#if 0
Colour
Colour::getContrastingColour() const
{
Colour ret(255-m_r, 255-m_g, 255-m_b);
return ret;
}
-
+#endif
+#if 0
std::string
Colour::toXmlString() const
{
@@ -128,21 +130,9 @@ Colour::toXmlString() const
return output.str();
}
-
-std::string
-Colour::dataToXmlString() const
-{
- std::stringstream output;
- output << "red=\"" << m_r
- << "\" green=\"" << m_g
- << "\" blue=\"" << m_b
- << "\"";
-
- return output.str();
-}
-
+#endif
// Generic Colour routines:
-
+#if 0
Colour
getCombinationColour(const Colour &input1, const Colour &input2)
{
@@ -152,5 +142,6 @@ getCombinationColour(const Colour &input1, const Colour &input2)
return ret;
}
+#endif
}
diff --git a/src/base/Colour.h b/src/base/Colour.h
index 4c491bc..dde5acd 100644
--- a/src/base/Colour.h
+++ b/src/base/Colour.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file is Copyright 2003
@@ -17,8 +17,8 @@
COPYING included with this distribution for more information.
*/
-#ifndef RG_BASE_COLOUR_H
-#define RG_BASE_COLOUR_H
+#ifndef RG_COLOUR_H
+#define RG_COLOUR_H
#include <string>
@@ -26,10 +26,10 @@ namespace Rosegarden
{
/**
- * Colour is our internal colour storage mechanism; it's extremely basic
- * but does what it needs to
+ * ??? This class should be removed. QColor should be used instead everywhere
+ * this is used. The one feature that this class offers
+ * (dataToXmlString()) should be inlined into its caller.
*/
-
class Colour
{
public:
@@ -44,21 +44,7 @@ public:
* If out of specification (i.e. < 0 || > 255 the value will be set to 0.
*/
Colour(unsigned int red, unsigned int green, unsigned int blue);
- Colour(const Colour& input);
-
~Colour();
- Colour& operator= (const Colour& input);
-
- /**
- * Set the colour as appropriate; as with the constructor invalid values
- * will be set to 0.
- */
- void setColour(unsigned int red, unsigned int green, unsigned int blue);
-
- /**
- * Sets the three pointers to the values stored in the colour.
- */
- void getColour(unsigned int &red, unsigned int &green, unsigned int &blue) const;
/**
* Returns the current Red value of the colour as an integer.
@@ -75,44 +61,56 @@ public:
*/
unsigned int getGreen() const;
+ /// Called by ColourMap::toXmlString(). INLINE and REMOVE.
+ std::string dataToXmlString() const;
+
+ /**
+ * Sets the three pointers to the values stored in the colour.
+ */
+// void getColour(unsigned int &red, unsigned int &green, unsigned int &blue) const;
+
/**
* Sets the Red value of the current colour. If the value isn't
* between 0 and 255 inclusive, it will set to 0
*/
- void setRed(unsigned int input);
+// void setRed(unsigned int input);
/**
* Sets the Blue value of the current colour. If the value isn't
* between 0 and 255 inclusive, it will set to 0
*/
- void setBlue(unsigned int input);
+// void setBlue(unsigned int input);
/**
* Sets the Green value of the current colour. If the value isn't
* between 0 and 255 inclusive, it will set to 0
*/
- void setGreen(unsigned int input);
+// void setGreen(unsigned int input);
/**
* This uses a simple calculation to give us a contrasting colour.
* Useful for working out a visible text colour given
* any background colour
*/
- Colour getContrastingColour() const;
-
- std::string toXmlString() const;
+// Colour getContrastingColour() const;
- std::string dataToXmlString() const;
+// std::string toXmlString() const;
private:
unsigned int m_r, m_g, m_b;
+
+ /**
+ * Set the colour as appropriate; as with the constructor invalid values
+ * will be set to 0.
+ */
+ void setColour(unsigned int red, unsigned int green, unsigned int blue);
};
/**
* This works out a colour which is directly in between the two inputs.
* Useful for working out what overlapping Segments should be coloured as
*/
- Colour getCombinationColour(const Colour &input1, const Colour &input2);
+// Colour getCombinationColour(const Colour &input1, const Colour &input2);
}
diff --git a/src/base/ColourMap.cpp b/src/base/ColourMap.cpp
index 0fb3d2c..6cc7321 100644
--- a/src/base/ColourMap.cpp
+++ b/src/base/ColourMap.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file is Copyright 2003
diff --git a/src/base/ColourMap.h b/src/base/ColourMap.h
index 916059b..0e05612 100644
--- a/src/base/ColourMap.h
+++ b/src/base/ColourMap.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file is Copyright 2003
diff --git a/src/base/Composition.cpp b/src/base/Composition.cpp
index 6e9abcc..55a1f8d 100644
--- a/src/base/Composition.cpp
+++ b/src/base/Composition.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -300,12 +300,12 @@ Composition::weakDetachSegment(Segment *segment)
return true;
}
-// Add every segment in segmentcontainer
+// Add every segment in SegmentMultiSet
// @author Tom Breton (Tehom)
void
-Composition::addAllSegments(segmentcontainer segments)
+Composition::addAllSegments(SegmentMultiSet segments)
{
- for (segmentcontainer::iterator i = segments.begin();
+ for (SegmentMultiSet::iterator i = segments.begin();
i != segments.end();
++i)
{ addSegment(*i); }
@@ -320,12 +320,12 @@ Composition::addAllSegments(SegmentVec segments)
{ addSegment(*i); }
}
-// Detach every segment in segmentcontainer
+// Detach every segment in SegmentMultiSet
// @author Tom Breton (Tehom)
void
-Composition::detachAllSegments(segmentcontainer segments)
+Composition::detachAllSegments(SegmentMultiSet segments)
{
- for (segmentcontainer::iterator i = segments.begin();
+ for (SegmentMultiSet::iterator i = segments.begin();
i != segments.end();
++i)
{ detachSegment(*i); }
@@ -606,7 +606,7 @@ Composition::getDuration() const
{
timeT maxDuration = 0;
- for (segmentcontainer::const_iterator i = m_segments.begin();
+ for (SegmentMultiSet::const_iterator i = m_segments.begin();
i != m_segments.end(); ++i) {
timeT segmentTotal = (*i)->getEndTime();
@@ -1690,7 +1690,7 @@ void Composition::resetTrackIdAndPosition(TrackId oldId, TrackId newId,
// modify segment mappings
//
- for (segmentcontainer::const_iterator i = m_segments.begin();
+ for (SegmentMultiSet::const_iterator i = m_segments.begin();
i != m_segments.end(); ++i)
{
if ((*i)->getTrack() == oldId) (*i)->setTrack(newId);
@@ -2068,14 +2068,14 @@ Composition::getNewTrackId() const
// Get all the segments that the same instrument plays that plays
// segment s.
-// @return a segmentcontainer that includes s itself.
-segmentcontainer
+// @return a SegmentMultiSet that includes s itself.
+SegmentMultiSet
Composition::getInstrumentSegments(Segment *s, timeT t) const
{
- segmentcontainer segments;
+ SegmentMultiSet segments;
InstrumentId Instrument = getInstrumentId(s);
- const segmentcontainer& allSegments = getSegments();
+ const SegmentMultiSet& allSegments = getSegments();
for (Composition::iterator i = allSegments.begin();
i != allSegments.end();
++i)
@@ -2434,7 +2434,7 @@ Composition::setGeneralColourMap(Rosegarden::ColourMap &newmap)
void
Composition::distributeVerses()
{
- typedef std::map<int, segmentcontainer> SegmentMap;
+ typedef std::map<int, SegmentMultiSet> SegmentMap;
SegmentMap tracks;
SegmentMap repeats;
@@ -2449,7 +2449,7 @@ Composition::distributeVerses()
// Reset all verse indexes and look for repeated segments
repeats.clear();
- for (segmentcontainer::iterator j = i->second.begin(); j != i->second.end(); ++j) {
+ for (SegmentMultiSet::iterator j = i->second.begin(); j != i->second.end(); ++j) {
Segment* s = *j;
s->setVerse(0);
if (s->isPlainlyLinked()) {
@@ -2460,7 +2460,7 @@ Composition::distributeVerses()
// Set verse indexes where needed
for (SegmentMap::iterator j = repeats.begin(); j != repeats.end(); ++j) {
int verse = 0;
- for (segmentcontainer::iterator k = j->second.begin(); k != j->second.end(); ++k) {
+ for (SegmentMultiSet::iterator k = j->second.begin(); k != j->second.end(); ++k) {
Segment* s = *k;
s->setVerse(verse++);
}
diff --git a/src/base/Composition.h b/src/base/Composition.h
index 38c0e99..ad1d2df 100644
--- a/src/base/Composition.h
+++ b/src/base/Composition.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -66,8 +66,8 @@ class Composition : public XmlExportable
friend class Segment; // to call notifySegmentRepeatChanged()
public:
- typedef segmentcontainer::iterator iterator;
- typedef segmentcontainer::const_iterator const_iterator;
+ typedef SegmentMultiSet::iterator iterator;
+ typedef SegmentMultiSet::const_iterator const_iterator;
typedef std::vector<Segment *> SegmentVec;
@@ -209,7 +209,7 @@ public:
* Get all segments that play on the same instrument segment s
* plays on and start before t.
*/
- segmentcontainer getInstrumentSegments(Segment *s, timeT t) const;
+ SegmentMultiSet getInstrumentSegments(Segment *s, timeT t) const;
//////
//
@@ -240,8 +240,8 @@ public:
//
// SEGMENT
- segmentcontainer& getSegments() { return m_segments; }
- const segmentcontainer& getSegments() const { return m_segments; }
+ SegmentMultiSet& getSegments() { return m_segments; }
+ const SegmentMultiSet& getSegments() const { return m_segments; }
unsigned int getNbSegments() const { return m_segments.size(); }
@@ -337,15 +337,15 @@ public:
int getSegmentVoiceIndex(const Segment *) const;
/**
- * Add every segment in segmentcontainer
+ * Add every segment in SegmentMultiSet
*/
- void addAllSegments(segmentcontainer segments);
+ void addAllSegments(SegmentMultiSet segments);
void addAllSegments(SegmentVec segments);
/**
- * Detach every segment in segmentcontainer
+ * Detach every segment in SegmentMultiSet
*/
- void detachAllSegments(segmentcontainer segments);
+ void detachAllSegments(SegmentMultiSet segments);
void detachAllSegments(SegmentVec segments);
//////
@@ -955,7 +955,7 @@ protected:
//--------------- Data members ---------------------------------
//
trackcontainer m_tracks;
- segmentcontainer m_segments;
+ SegmentMultiSet m_segments;
// The tracks we are armed for record on
//
@@ -1188,6 +1188,8 @@ public:
/**
* Called after the composition's end marker time has been
* changed
+ *
+ * ??? rename: endTimeChanged() to differentiate from SegmentObserver.
*/
virtual void endMarkerTimeChanged(const Composition *, bool /* shorten */) { }
diff --git a/src/base/CompositionTimeSliceAdapter.cpp b/src/base/CompositionTimeSliceAdapter.cpp
index 2c74d66..a506c3d 100644
--- a/src/base/CompositionTimeSliceAdapter.cpp
+++ b/src/base/CompositionTimeSliceAdapter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file is Copyright 2002
diff --git a/src/base/CompositionTimeSliceAdapter.h b/src/base/CompositionTimeSliceAdapter.h
index 6c87ee8..46f287b 100644
--- a/src/base/CompositionTimeSliceAdapter.h
+++ b/src/base/CompositionTimeSliceAdapter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file is Copyright 2002
@@ -24,12 +24,14 @@
#include <utility>
#include "base/Segment.h"
+#include "base/Selection.h"
namespace Rosegarden {
+
class Event;
class Composition;
-class SegmentSelection;
+
/**
* CompositionTimeSliceAdapter provides the ability to iterate through
diff --git a/src/base/Configuration.cpp b/src/base/Configuration.cpp
index 64f2b02..0862822 100644
--- a/src/base/Configuration.cpp
+++ b/src/base/Configuration.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Configuration.h b/src/base/Configuration.h
index 00583f8..c941922 100644
--- a/src/base/Configuration.h
+++ b/src/base/Configuration.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/ControlParameter.cpp b/src/base/ControlParameter.cpp
index 2aed59a..a4f2ef9 100644
--- a/src/base/ControlParameter.cpp
+++ b/src/base/ControlParameter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/ControlParameter.h b/src/base/ControlParameter.h
index 56a62d3..4ea8f48 100644
--- a/src/base/ControlParameter.h
+++ b/src/base/ControlParameter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Controllable.h b/src/base/Controllable.h
index b679ebd..4316b89 100644
--- a/src/base/Controllable.h
+++ b/src/base/Controllable.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/ControllerContext.cpp b/src/base/ControllerContext.cpp
index a2ee710..8a25fef 100644
--- a/src/base/ControllerContext.cpp
+++ b/src/base/ControllerContext.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/ControllerContext.h b/src/base/ControllerContext.h
index 2f413d7..df965e9 100644
--- a/src/base/ControllerContext.h
+++ b/src/base/ControllerContext.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/Device.cpp b/src/base/Device.cpp
index e99af8a..815d7d5 100644
--- a/src/base/Device.cpp
+++ b/src/base/Device.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Device.h b/src/base/Device.h
index 9e712b5..e376bed 100644
--- a/src/base/Device.h
+++ b/src/base/Device.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Equation.cpp b/src/base/Equation.cpp
index c2b6aa5..358c83e 100644
--- a/src/base/Equation.cpp
+++ b/src/base/Equation.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Equation.h b/src/base/Equation.h
index bed0fb6..6235472 100644
--- a/src/base/Equation.h
+++ b/src/base/Equation.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Event.cpp b/src/base/Event.cpp
index 6e39d01..6b1b806 100644
--- a/src/base/Event.cpp
+++ b/src/base/Event.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -90,6 +90,15 @@ Event::EventData::getNotationDuration() const
else return static_cast<PropertyStore<Int> *>(i->second)->getData();
}
+timeT
+Event::getGreaterDuration()
+{
+ if (isa(Note::EventType)) {
+ return std::max(getDuration(), getNotationDuration());
+ }
+ return getDuration();
+}
+
void
Event::EventData::setTime(const PropertyName &name, timeT t, timeT deft)
{
diff --git a/src/base/Event.h b/src/base/Event.h
index 3dd02e8..14c5ab8 100644
--- a/src/base/Event.h
+++ b/src/base/Event.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -295,6 +295,14 @@ public:
timeT getNotationDuration() const { return m_data->getNotationDuration(); }
/**
+ * Return the greater of getDuration() or getNotationDuration() for note
+ * events. Return getDuration() for all other event types.
+ *
+ * \author Tito Latini
+ */
+ timeT getGreaterDuration();
+
+ /**
* Return whether this event's section of a triggered ornament
* is masked, for use when the event is part of a multiple-tied-note
* ornament trigger.
diff --git a/src/base/Exception.cpp b/src/base/Exception.cpp
index 58fbac5..9dc274f 100644
--- a/src/base/Exception.cpp
+++ b/src/base/Exception.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Exception.h b/src/base/Exception.h
index cd6f7cc..01d0504 100644
--- a/src/base/Exception.h
+++ b/src/base/Exception.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/FastVector.h b/src/base/FastVector.h
index ba85a8d..f8b1ced 100644
--- a/src/base/FastVector.h
+++ b/src/base/FastVector.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Instrument.cpp b/src/base/Instrument.cpp
index 775b2c0..1f8682a 100644
--- a/src/base/Instrument.cpp
+++ b/src/base/Instrument.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -13,7 +13,10 @@
COPYING included with this distribution for more information.
*/
+#define RG_MODULE_STRING "[Instrument]"
+
#include "Instrument.h"
+#include "InstrumentStaticSignals.h"
#include "sound/Midi.h"
#include "MidiDevice.h"
#include "base/AllocateChannels.h"
@@ -24,6 +27,7 @@
#include <cassert>
+#include <algorithm> // std::find()
#include <sstream>
#include <cstdio>
#include <iostream>
@@ -280,6 +284,8 @@ Instrument::Instrument(const Instrument &ins):
}
}
+#if 0
+// ??? Never used. See comments in header for more.
Instrument &
Instrument::operator=(const Instrument &ins)
{
@@ -295,7 +301,7 @@ Instrument::operator=(const Instrument &ins)
m_transpose = ins.getMidiTranspose();
m_pan = ins.getPan();
m_volume = ins.getVolume();
- m_fixed = false;
+ m_fixed = false; // ??? This is not an assignment operator. It's a partialCopy().
m_level = ins.getLevel();
m_recordLevel = ins.getRecordLevel();
m_device = ins.getDevice();
@@ -315,7 +321,7 @@ Instrument::operator=(const Instrument &ins)
return *this;
}
-
+#endif
Instrument::~Instrument()
{
@@ -372,6 +378,18 @@ Instrument::getAlias() const
}
void
+Instrument::sendChannelSetup()
+{
+ // MIDI only
+ if (m_type != Midi)
+ return;
+
+ if (hasFixedChannel()) {
+ StudioControl::sendChannelSetup(this, m_channel);
+ }
+}
+
+void
Instrument::
setProgram(const MidiProgram &program)
{
@@ -383,6 +401,56 @@ setProgram(const MidiProgram &program)
}
}
+bool
+Instrument::isProgramValid() const
+{
+ MidiDevice *md = dynamic_cast<MidiDevice *>(m_device);
+ if (!md)
+ return false;
+
+ // Check the bank against the list of valid banks.
+
+ BankList validBanks = md->getBanks(isPercussion());
+
+ bool bankValid = false;
+
+ // For each valid bank
+ for (BankList::const_iterator oBankIter = validBanks.begin();
+ oBankIter != validBanks.end();
+ ++oBankIter)
+ {
+ if (oBankIter->partialCompare(m_program.getBank())) {
+ bankValid = true;
+ break;
+ }
+ }
+
+ if (!bankValid)
+ return false;
+
+ // Check the program change against the list of program changes
+ // for this bank.
+
+ ProgramList programList = md->getPrograms(m_program.getBank());
+
+ bool programChangeValid = false;
+
+ // For each program in this bank
+ for (ProgramList::const_iterator programIter = programList.begin();
+ programIter != programList.end();
+ ++programIter) {
+ if (programIter->partialCompare(m_program)) {
+ programChangeValid = true;
+ break;
+ }
+ }
+
+ if (!programChangeValid)
+ return false;
+
+ return true;
+}
+
void
Instrument::setProgramChange(MidiByte program)
{
@@ -426,6 +494,28 @@ Instrument::getLSB() const
}
void
+Instrument::pickFirstProgram(bool percussion)
+{
+ MidiDevice *md = dynamic_cast<MidiDevice *>(m_device);
+ if (!md)
+ return;
+
+ BankList banks = md->getBanks(percussion);
+ if (banks.empty())
+ return;
+
+ // Get the programs for the first bank.
+ ProgramList programs = md->getPrograms(banks.front());
+ if (programs.empty())
+ return;
+
+ // setProgram() will notify the rest of the system of this change.
+ m_sendBankSelect = true;
+ m_sendProgramChange = true;
+ setProgram(programs.front());
+}
+
+void
Instrument::setPercussion(bool percussion)
{
setProgram(MidiProgram(MidiBank(percussion,
@@ -700,6 +790,32 @@ releaseFixedChannel(void)
ControlBlock::getInstance()->instrumentChangedFixity(getId());
}
+QSharedPointer<InstrumentStaticSignals>
+Instrument::getStaticSignals()
+{
+ // Keep the static instance here so there is no way to get
+ // to it other than to call getStaticSignals().
+ static QSharedPointer<InstrumentStaticSignals> instrumentStaticSignals;
+
+ // Delayed creation to avoid static construction order fiasco.
+ if (!instrumentStaticSignals)
+ instrumentStaticSignals =
+ QSharedPointer<InstrumentStaticSignals>(new InstrumentStaticSignals);
+
+ // If you want to avoid the complementary static destruction order
+ // fiasco, hold on to a copy of this in a member QSharedPointer. This
+ // is only really an issue if your object also has static lifespan.
+ // Still, it's a good habit.
+
+ return instrumentStaticSignals;
+}
+
+void
+Instrument::changed()
+{
+ emit getStaticSignals()->changed(this);
+}
+
/***** Buss *****/
diff --git a/src/base/Instrument.h b/src/base/Instrument.h
index 99e920d..c4909fa 100644
--- a/src/base/Instrument.h
+++ b/src/base/Instrument.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -23,6 +23,7 @@
#include "MidiProgram.h"
#include <QString>
+#include <QSharedPointer>
#include <QCoreApplication>
// An Instrument connects a Track (which itself contains
@@ -66,6 +67,8 @@ typedef unsigned int BussId;
//
class Device;
+class InstrumentStaticSignals;
+
class PluginContainer
{
public:
@@ -117,11 +120,9 @@ public:
MidiByte channel,
Device *device);
-
- // Copy constructor and assignment
+ // Copy constructor
//
Instrument(const Instrument &);
- Instrument &operator=(const Instrument &);
~Instrument();
@@ -187,6 +188,8 @@ public:
void setProgram(const MidiProgram &program);
const MidiProgram &getProgram() const { return m_program; }
+ /// Checks the bank and program change against the Device.
+ bool isProgramValid() const;
void setSendBankSelect(bool value) {
m_sendBankSelect = value;
@@ -229,6 +232,9 @@ public:
void setLSB(MidiByte msb);
MidiByte getLSB() const;
+ /// Pick the first valid program in the connected Device.
+ void pickFirstProgram(bool percussion);
+
void setPercussion(bool percussion);
bool isPercussion() const;
@@ -285,6 +291,22 @@ public:
void sendWholeDeviceDestroyed(void)
{ emit wholeDeviceDestroyed(); }
+ /// Send out program changes, etc..., for fixed channels.
+ /**
+ * See StudioControl::sendChannelSetup().
+ */
+ void sendChannelSetup();
+
+ /// For connecting to Instrument's static signals.
+ /**
+ * It's a good idea to hold on to a copy of this QSharedPointer in
+ * a member variable to make sure the InstrumentStaticSignals
+ * instance is still around when your object is destroyed.
+ */
+ static QSharedPointer<InstrumentStaticSignals> getStaticSignals();
+ /// Emit InstrumentStaticSignals::changed().
+ void changed();
+
signals:
// Like QObject::destroyed, but implies that the whole device is
// being destroyed so we needn't bother freeing channels on it.
@@ -302,6 +324,15 @@ public:
void channelBecomesUnfixed(void);
private:
+ // ??? Hiding because, fortunately, this is never used.
+ // As it was implemented, it is not an assignment operator. It
+ // does not copy the m_fixed field. As such, it should be given
+ // a name other than "=" to differentiate its effect from that
+ // of a proper operator=. E.g. partialCopy(). It should then
+ // be implemented using the default operator=() which should be
+ // made private. However, that can't be done until C++11.
+ Instrument &operator=(const Instrument &);
+
InstrumentId m_id;
std::string m_name;
std::string m_alias;
diff --git a/src/sound/Audit.cpp b/src/base/InstrumentStaticSignals.cpp
similarity index 69%
copy from src/sound/Audit.cpp
copy to src/base/InstrumentStaticSignals.cpp
index 844bce4..56708da 100644
--- a/src/sound/Audit.cpp
+++ b/src/base/InstrumentStaticSignals.cpp
@@ -3,9 +3,9 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
-
+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
@@ -13,25 +13,18 @@
COPYING included with this distribution for more information.
*/
-#include "Audit.h"
+#define RG_MODULE_STRING "[InstrumentStaticSignals]"
+
+#include "InstrumentStaticSignals.h"
+#include "Instrument.h"
namespace Rosegarden
{
-Audit::~Audit()
-{
- std::string s = str();
- std::cerr << s;
- m_audit += s;
-}
-std::string
-Audit::getAudit()
-{
- return m_audit;
-}
+// Nothing yet.
-std::string Audit::m_audit;
}
+#include "InstrumentStaticSignals.moc"
diff --git a/src/base/InstrumentStaticSignals.h b/src/base/InstrumentStaticSignals.h
new file mode 100644
index 0000000..cd9f912
--- /dev/null
+++ b/src/base/InstrumentStaticSignals.h
@@ -0,0 +1,76 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
+
+/*
+ Rosegarden
+ A sequencer and musical notation editor.
+ Copyright 2000-2015 the Rosegarden development team.
+ See the AUTHORS file for more details.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version. See the file
+ COPYING included with this distribution for more information.
+*/
+
+#ifndef RG_INSTRUMENTSTATICSIGNALS_H
+#define RG_INSTRUMENTSTATICSIGNALS_H
+
+#include <QObject>
+
+namespace Rosegarden
+{
+
+
+class Instrument;
+
+/// Signals for all Instrument instances.
+/**
+ * Allows observers to subscribe for signals from all Instrument
+ * objects.
+ *
+ * Previously, static signals for Instrument were kept in
+ * RosegardenMainWindow. This class moves them closer to Instrument.
+ *
+ * See Instrument::getStaticSignals().
+ *
+ * It would be nice if Qt offered proper static signals so that
+ * this class wasn't necessary. An alternative non-static design
+ * would be to have observers connect directly to the Instrument
+ * objects. Studio would need to let the observers know when
+ * new Instruments were created.
+ */
+class InstrumentStaticSignals : public QObject
+{
+ Q_OBJECT
+
+signals:
+ /// An Instrument object has changed.
+ /**
+ * When connecting, use Instrument::getStaticSignals() to get
+ * the object instance. Search the codebase on
+ * "Instrument::getStaticSignals()" for connect() examples.
+ *
+ * Controllers can cause a very high rate of update notification when
+ * the user makes rapid changes using a knob or slider.
+ * Handlers of this signal should be prepared to deal with this.
+ * They should check for changes relevant to them, and bail if there
+ * are none. As of this writing, only the MIPP has been rewritten
+ * to deal with this properly. All other handlers should be reviewed
+ * and modified as needed.
+ *
+ * Formerly RosegardenMainWindow::instrumentParametersChanged().
+ */
+ void changed(Instrument *);
+
+private:
+ // Since Qt4 makes signals "protected" we do this to give Instrument
+ // the ability to directly emit the signals. When we upgrade to
+ // Qt5, we can remove this.
+ friend class Instrument;
+};
+
+
+}
+
+#endif // RG_INSTRUMENTSTATICSIGNALS_H
diff --git a/src/base/LayoutEngine.h b/src/base/LayoutEngine.h
index 1d14139..1346268 100644
--- a/src/base/LayoutEngine.h
+++ b/src/base/LayoutEngine.h
@@ -2,7 +2,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/LegatoQuantizer.cpp b/src/base/LegatoQuantizer.cpp
index 57bd4e7..63745b3 100644
--- a/src/base/LegatoQuantizer.cpp
+++ b/src/base/LegatoQuantizer.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/LegatoQuantizer.h b/src/base/LegatoQuantizer.h
index 1b22019..332152e 100644
--- a/src/base/LegatoQuantizer.h
+++ b/src/base/LegatoQuantizer.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Marker.cpp b/src/base/Marker.cpp
index d0d0a00..89e98c2 100644
--- a/src/base/Marker.cpp
+++ b/src/base/Marker.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Marker.h b/src/base/Marker.h
index bf98b06..02c5923 100644
--- a/src/base/Marker.h
+++ b/src/base/Marker.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/MidiDevice.cpp b/src/base/MidiDevice.cpp
index 6be04c1..b4e4bdf 100644
--- a/src/base/MidiDevice.cpp
+++ b/src/base/MidiDevice.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -72,7 +72,7 @@ MidiDevice::MidiDevice(DeviceId id,
MidiDevice::MidiDevice(DeviceId id,
InstrumentId ibase,
- const MidiDevice &dev) :
+ const MidiDevice &dev) :
Device(id, dev.getName(), Device::Midi),
m_programList(dev.m_programList),
m_bankList(dev.m_bankList),
@@ -163,13 +163,13 @@ MidiDevice::operator=(const MidiDevice &dev)
//
if (dev.getMetronome())
{
- if (m_metronome) delete m_metronome;
- m_metronome = new MidiMetronome(*dev.getMetronome());
+ if (m_metronome) delete m_metronome;
+ m_metronome = new MidiMetronome(*dev.getMetronome());
}
else
{
- delete m_metronome;
- m_metronome = 0;
+ delete m_metronome;
+ m_metronome = 0;
}
if (m_allocator) { delete m_allocator; }
@@ -208,12 +208,10 @@ void
MidiDevice::createInstruments(InstrumentId base)
{
for (int i = 0; i < 16; ++i) {
- Instrument *instrument = new Instrument
- (base + i, Instrument::Midi, "", i, this);
- if (isPercussionNumber(i)) {
- instrument->setFixedChannel();
- }
- addInstrument(instrument);
+ Instrument *instrument = new Instrument
+ (base + i, Instrument::Midi, "", i, this);
+ instrument->setFixedChannel();
+ addInstrument(instrument);
}
renameInstruments();
}
@@ -243,7 +241,7 @@ MidiDevice::generatePresentationList()
{
if ((*it)->getId() >= MidiInstrumentBase) {
m_presentationInstrumentList.push_back(*it);
- }
+ }
}
}
@@ -338,8 +336,8 @@ MidiDevice::addProgram(const MidiProgram &prog)
{
// Refuse duplicates
for (ProgramList::const_iterator it = m_programList.begin();
- it != m_programList.end(); ++it) {
- if (*it == prog) return;
+ it != m_programList.end(); ++it) {
+ if (it->partialCompare(prog)) return;
}
m_programList.push_back(prog);
@@ -364,8 +362,8 @@ MidiDevice::getBanks(bool percussion) const
BankList banks;
for (BankList::const_iterator it = m_bankList.begin();
- it != m_bankList.end(); ++it) {
- if (it->isPercussion() == percussion) banks.push_back(*it);
+ it != m_bankList.end(); ++it) {
+ if (it->isPercussion() == percussion) banks.push_back(*it);
}
return banks;
@@ -377,9 +375,9 @@ MidiDevice::getBanksByMSB(bool percussion, MidiByte msb) const
BankList banks;
for (BankList::const_iterator it = m_bankList.begin();
- it != m_bankList.end(); ++it) {
- if (it->isPercussion() == percussion && it->getMSB() == msb)
- banks.push_back(*it);
+ it != m_bankList.end(); ++it) {
+ if (it->isPercussion() == percussion && it->getMSB() == msb)
+ banks.push_back(*it);
}
return banks;
@@ -391,9 +389,9 @@ MidiDevice::getBanksByLSB(bool percussion, MidiByte lsb) const
BankList banks;
for (BankList::const_iterator it = m_bankList.begin();
- it != m_bankList.end(); ++it) {
- if (it->isPercussion() == percussion && it->getLSB() == lsb)
- banks.push_back(*it);
+ it != m_bankList.end(); ++it) {
+ if (it->isPercussion() == percussion && it->getLSB() == lsb)
+ banks.push_back(*it);
}
return banks;
@@ -403,8 +401,8 @@ const MidiBank *
MidiDevice::getBankByName(const std::string &name) const
{
for (BankList::const_iterator i = m_bankList.begin();
- i != m_bankList.end(); ++i) {
- if (i->getName() == name) return &(*i);
+ i != m_bankList.end(); ++i) {
+ if (i->getName() == name) return &(*i);
}
return 0;
}
@@ -415,14 +413,14 @@ MidiDevice::getDistinctMSBs(bool percussion, int lsb) const
std::set<MidiByte> msbs;
for (BankList::const_iterator it = m_bankList.begin();
- it != m_bankList.end(); ++it) {
- if (it->isPercussion() == percussion &&
- (lsb == -1 || it->getLSB() == lsb)) msbs.insert(it->getMSB());
+ it != m_bankList.end(); ++it) {
+ if (it->isPercussion() == percussion &&
+ (lsb == -1 || it->getLSB() == lsb)) msbs.insert(it->getMSB());
}
MidiByteList v;
for (std::set<MidiByte>::iterator i = msbs.begin(); i != msbs.end(); ++i) {
- v.push_back(*i);
+ v.push_back(*i);
}
return v;
@@ -434,14 +432,14 @@ MidiDevice::getDistinctLSBs(bool percussion, int msb) const
std::set<MidiByte> lsbs;
for (BankList::const_iterator it = m_bankList.begin();
- it != m_bankList.end(); ++it) {
- if (it->isPercussion() == percussion &&
- (msb == -1 || it->getMSB() == msb)) lsbs.insert(it->getLSB());
+ it != m_bankList.end(); ++it) {
+ if (it->isPercussion() == percussion &&
+ (msb == -1 || it->getMSB() == msb)) lsbs.insert(it->getLSB());
}
MidiByteList v;
for (std::set<MidiByte>::iterator i = lsbs.begin(); i != lsbs.end(); ++i) {
- v.push_back(*i);
+ v.push_back(*i);
}
return v;
@@ -453,20 +451,42 @@ MidiDevice::getPrograms(const MidiBank &bank) const
ProgramList programs;
for (ProgramList::const_iterator it = m_programList.begin();
- it != m_programList.end(); ++it) {
- if (it->getBank() == bank) programs.push_back(*it);
+ it != m_programList.end(); ++it) {
+ if (it->getBank().partialCompare(bank)) programs.push_back(*it);
}
return programs;
}
+ProgramList
+MidiDevice::getPrograms0thVariation(bool percussion, const MidiBank &bank) const
+{
+ // If we aren't in variations mode, just use getPrograms().
+ if (m_variationType == NoVariations)
+ return getPrograms(bank);
+
+ // Get the variation bank list for this bank
+ BankList bankList;
+ if (m_variationType == VariationFromMSB) {
+ bankList = getBanksByLSB(percussion, bank.getLSB());
+ } else {
+ bankList = getBanksByMSB(percussion, bank.getMSB());
+ }
+
+ if (!bankList.empty()) {
+ MidiBank firstBank = bankList.front();
+ return getPrograms(firstBank);
+ }
+
+ return ProgramList();
+}
std::string
MidiDevice::getBankName(const MidiBank &bank) const
{
for (BankList::const_iterator it = m_bankList.begin();
- it != m_bankList.end(); ++it) {
- if (*it == bank) return it->getName();
+ it != m_bankList.end(); ++it) {
+ if ((*it).partialCompare(bank)) return it->getName();
}
return "";
}
@@ -482,8 +502,8 @@ const MidiKeyMapping *
MidiDevice::getKeyMappingByName(const std::string &name) const
{
for (KeyMappingList::const_iterator i = m_keyMappingList.begin();
- i != m_keyMappingList.end(); ++i) {
- if (i->getName() == name) return &(*i);
+ i != m_keyMappingList.end(); ++i) {
+ if (i->getName() == name) return &(*i);
}
return 0;
}
@@ -494,11 +514,11 @@ MidiDevice::getKeyMappingForProgram(const MidiProgram &program) const
ProgramList::const_iterator it;
for (it = m_programList.begin(); it != m_programList.end(); ++it) {
- if (*it == program) {
- std::string kmn = it->getKeyMapping();
- if (kmn == "") return 0;
- return getKeyMappingByName(kmn);
- }
+ if (it->partialCompare(program)) {
+ std::string kmn = it->getKeyMapping();
+ if (kmn == "") return 0;
+ return getKeyMappingByName(kmn);
+ }
}
return 0;
@@ -506,14 +526,14 @@ MidiDevice::getKeyMappingForProgram(const MidiProgram &program) const
void
MidiDevice::setKeyMappingForProgram(const MidiProgram &program,
- std::string mapping)
+ std::string mapping)
{
ProgramList::iterator it;
for (it = m_programList.begin(); it != m_programList.end(); ++it) {
- if (*it == program) {
- it->setKeyMapping(mapping);
- }
+ if (it->partialCompare(program)) {
+ it->setKeyMapping(mapping);
+ }
}
}
@@ -525,13 +545,13 @@ MidiDevice::toXmlString()
midiDevice << " <device id=\"" << m_id
<< "\" name=\"" << m_name
- << "\" direction=\"" << (m_direction == Play ?
- "play" : "record")
- << "\" variation=\"" << (m_variationType == VariationFromLSB ?
- "LSB" :
- m_variationType == VariationFromMSB ?
- "MSB" : "")
- << "\" connection=\"" << encode(m_connection)
+ << "\" direction=\"" << (m_direction == Play ?
+ "play" : "record")
+ << "\" variation=\"" << (m_variationType == VariationFromLSB ?
+ "LSB" :
+ m_variationType == VariationFromMSB ?
+ "MSB" : "")
+ << "\" connection=\"" << encode(m_connection)
<< "\" type=\"midi\">" << std::endl << std::endl;
midiDevice << " <librarian name=\"" << encode(m_librarian.first)
@@ -566,7 +586,7 @@ MidiDevice::toXmlString()
{
midiDevice << " <bank "
<< "name=\"" << encode(it->getName()) << "\" "
- << "percussion=\"" << (it->isPercussion() ? "true" : "false") << "\" "
+ << "percussion=\"" << (it->isPercussion() ? "true" : "false") << "\" "
<< "msb=\"" << (int)it->getMSB() << "\" "
<< "lsb=\"" << (int)it->getLSB() << "\">"
<< std::endl;
@@ -575,7 +595,7 @@ MidiDevice::toXmlString()
//
for (pt = m_programList.begin(); pt != m_programList.end(); ++pt)
{
- if (pt->getBank() == *it)
+ if (pt->getBank().partialCompare(*it))
{
midiDevice << " <program "
<< "id=\"" << (int)pt->getProgram() << "\" "
@@ -612,13 +632,13 @@ MidiDevice::toXmlString()
midiDevice << " <keymapping "
<< "name=\"" << encode(kit->getName()) << "\">\n";
- for (MidiKeyMapping::KeyNameMap::const_iterator nmi =
- kit->getMap().begin(); nmi != kit->getMap().end(); ++nmi) {
- midiDevice << " <key number=\"" << (int)nmi->first
- << "\" name=\"" << encode(nmi->second) << "\"/>\n";
- }
+ for (MidiKeyMapping::KeyNameMap::const_iterator nmi =
+ kit->getMap().begin(); nmi != kit->getMap().end(); ++nmi) {
+ midiDevice << " <key number=\"" << (int)nmi->first
+ << "\" name=\"" << encode(nmi->second) << "\"/>\n";
+ }
- midiDevice << " </keymapping>\n";
+ midiDevice << " </keymapping>\n";
}
midiDevice << " </device>" << std::endl;
@@ -685,7 +705,7 @@ MidiDevice::getProgramName(const MidiProgram &program) const
for (it = m_programList.begin(); it != m_programList.end(); ++it)
{
- if (*it == program) return it->getName();
+ if (it->partialCompare(program)) return it->getName();
}
return std::string("");
@@ -723,7 +743,7 @@ MidiDevice::mergeBankList(const BankList &bankList)
{
for (oIt = m_bankList.begin(); oIt != m_bankList.end(); ++oIt)
{
- if (*it == *oIt)
+ if ((*it).partialCompare(*oIt))
{
clash = true;
break;
@@ -749,7 +769,7 @@ MidiDevice::mergeProgramList(const ProgramList &programList)
{
for (oIt = m_programList.begin(); oIt != m_programList.end(); ++oIt)
{
- if (*it == *oIt)
+ if (it->partialCompare(*oIt))
{
clash = true;
break;
@@ -774,7 +794,7 @@ MidiDevice::mergeKeyMappingList(const KeyMappingList &keyMappingList)
{
for (oIt = m_keyMappingList.begin(); oIt != m_keyMappingList.end(); ++oIt)
{
- if (it->getName() == oIt->getName())
+ if (it->getName() == oIt->getName())
{
clash = true;
break;
diff --git a/src/base/MidiDevice.h b/src/base/MidiDevice.h
index 2ced14b..fee6492 100644
--- a/src/base/MidiDevice.h
+++ b/src/base/MidiDevice.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -95,6 +95,8 @@ public:
const ProgramList &getPrograms() const { return m_programList; }
ProgramList getPrograms(const MidiBank &bank) const;
+ /// Used by the UI to display all programs in variations mode.
+ ProgramList getPrograms0thVariation(bool percussion, const MidiBank &bank) const;
const KeyMappingList &getKeyMappings() const { return m_keyMappingList; }
const MidiKeyMapping *getKeyMappingByName(const std::string &) const;
diff --git a/src/base/MidiMetronome.h b/src/base/MidiMetronome.h
index 210e1f0..cecef6f 100644
--- a/src/base/MidiMetronome.h
+++ b/src/base/MidiMetronome.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/MidiProgram.cpp b/src/base/MidiProgram.cpp
index fc02168..fa9cdcb 100644
--- a/src/base/MidiProgram.cpp
+++ b/src/base/MidiProgram.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -30,11 +30,24 @@ MidiBank::MidiBank(bool percussion, MidiByte msb, MidiByte lsb, std::string name
}
bool
-MidiBank::operator==(const MidiBank &b) const
+MidiBank::operator==(const MidiBank &rhs) const
{
- return m_percussion == b.m_percussion && m_msb == b.m_msb && m_lsb == b.m_lsb;
+ // Complete compare.
+ // If you need to compare everything except the name, use partialCompare().
+ return (m_percussion == rhs.m_percussion &&
+ m_msb == rhs.m_msb &&
+ m_lsb == rhs.m_lsb &&
+ m_name == rhs.m_name); // See partialCompare() which doesn't compare the name.
}
-
+
+bool
+MidiBank::partialCompare(const MidiBank &rhs) const
+{
+ return (m_percussion == rhs.m_percussion &&
+ m_msb == rhs.m_msb &&
+ m_lsb == rhs.m_lsb);
+}
+
bool
MidiBank::isPercussion() const
{
@@ -79,11 +92,20 @@ MidiProgram::MidiProgram(const MidiBank &bank, MidiByte program, std::string nam
}
bool
-MidiProgram::operator==(const MidiProgram &p) const
+MidiProgram::partialCompare(const MidiProgram &rhs) const
{
- return m_bank == p.m_bank && m_program == p.m_program;
+ return m_bank.partialCompare(rhs.m_bank) && m_program == rhs.m_program;
}
-
+
+bool
+MidiProgram::partialCompareWithName(const MidiProgram &rhs) const
+{
+ return (m_name == rhs.m_name &&
+ m_program == rhs.m_program &&
+ m_bank.getMSB() == rhs.m_bank.getMSB() &&
+ m_bank.getLSB() == rhs.m_bank.getLSB());
+}
+
const MidiBank &
MidiProgram::getBank() const
{
diff --git a/src/base/MidiProgram.h b/src/base/MidiProgram.h
index e53c0de..1f70565 100644
--- a/src/base/MidiProgram.h
+++ b/src/base/MidiProgram.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -25,21 +25,39 @@ namespace Rosegarden
typedef unsigned char MidiByte;
typedef unsigned int InstrumentId;
+/**
+ * ??? This data structure doesn't match the concept of a bank. A bank
+ * is a container of programs. There is no such containment here. If
+ * there were, it is possible that much of the code that works with
+ * banks would be simplified. E.g. there are many places throughout
+ * the system where a program list is searched for all programs in a
+ * bank. That would be eliminated.
+ */
class MidiBank
{
public:
MidiBank();
MidiBank(bool percussion, MidiByte msb, MidiByte lsb, std::string name = "");
- // comparator disregards name
- bool operator==(const MidiBank &b) const;
-
bool isPercussion() const;
MidiByte getMSB() const;
MidiByte getLSB() const;
- std::string getName() const;
void setName(std::string name);
+ std::string getName() const;
+
+ /// A full comparison of all fields.
+ /**
+ * This probably isn't what you want. See partialCompare().
+ */
+ bool operator==(const MidiBank &rhs) const;
+ bool operator!=(const MidiBank &rhs) const { return !operator==(rhs); }
+ /// Compare all fields except name.
+ /**
+ * Since MidiProgram stores a partial MidiBank object (without name),
+ * a partial comparison such as this is frequently needed.
+ */
+ bool partialCompare(const MidiBank &rhs) const;
private:
bool m_percussion;
@@ -57,9 +75,6 @@ public:
MidiProgram(const MidiBank &bank, MidiByte program, std::string name = "",
std::string keyMapping = "");
- // comparator disregards name
- bool operator==(const MidiProgram &p) const;
-
const MidiBank& getBank() const;
MidiByte getProgram() const;
const std::string &getName() const;
@@ -68,6 +83,13 @@ public:
void setName(const std::string &name);
void setKeyMapping(const std::string &name);
+ // Only compares m_bank and m_program. Does not compare m_name or
+ // m_keyMapping.
+ bool partialCompare(const MidiProgram &rhs) const;
+ // Only compares m_bank, m_program, and m_name. Does not compare
+ // m_keyMapping.
+ bool partialCompareWithName(const MidiProgram &rhs) const;
+
private:
MidiBank m_bank;
MidiByte m_program;
@@ -77,6 +99,21 @@ private:
typedef std::vector<MidiProgram> ProgramList;
+inline bool
+partialCompareWithName(const ProgramList &lhs, const ProgramList &rhs)
+{
+ if (lhs.size() != rhs.size())
+ return false;
+
+ for (unsigned i = 0; i < lhs.size(); ++i) {
+ if (!lhs[i].partialCompareWithName(rhs[i])) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
class MidiKeyMapping
{
public:
diff --git a/src/base/MidiTypes.cpp b/src/base/MidiTypes.cpp
index ca640d2..a91dcbd 100644
--- a/src/base/MidiTypes.cpp
+++ b/src/base/MidiTypes.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/MidiTypes.h b/src/base/MidiTypes.h
index c0b6b41..7e4a1b0 100644
--- a/src/base/MidiTypes.h
+++ b/src/base/MidiTypes.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/NotationQuantizer.cpp b/src/base/NotationQuantizer.cpp
index cc81e3d..52c04bc 100644
--- a/src/base/NotationQuantizer.cpp
+++ b/src/base/NotationQuantizer.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/NotationQuantizer.h b/src/base/NotationQuantizer.h
index 13b9ddd..b51b059 100644
--- a/src/base/NotationQuantizer.h
+++ b/src/base/NotationQuantizer.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/NotationRules.h b/src/base/NotationRules.h
index 82cdd60..ba833f4 100644
--- a/src/base/NotationRules.h
+++ b/src/base/NotationRules.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/NotationTypes.cpp b/src/base/NotationTypes.cpp
index 18ab55f..133b884 100644
--- a/src/base/NotationTypes.cpp
+++ b/src/base/NotationTypes.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/NotationTypes.h b/src/base/NotationTypes.h
index e07b668..f1efe76 100644
--- a/src/base/NotationTypes.h
+++ b/src/base/NotationTypes.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/OverlapRange.h b/src/base/OverlapRange.h
index 83fca77..05a6f02 100644
--- a/src/base/OverlapRange.h
+++ b/src/base/OverlapRange.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Overlaps.h b/src/base/Overlaps.h
index f00f0c4..4a4ca1c 100644
--- a/src/base/Overlaps.h
+++ b/src/base/Overlaps.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Profiler.cpp b/src/base/Profiler.cpp
index 75aec0a..edfc040 100644
--- a/src/base/Profiler.cpp
+++ b/src/base/Profiler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/Profiler.h b/src/base/Profiler.h
index 6f4bcc5..42be86b 100644
--- a/src/base/Profiler.h
+++ b/src/base/Profiler.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/Property.cpp b/src/base/Property.cpp
index 07fde42..eab9b60 100644
--- a/src/base/Property.cpp
+++ b/src/base/Property.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Property.h b/src/base/Property.h
index 68d996c..1efdea0 100644
--- a/src/base/Property.h
+++ b/src/base/Property.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/PropertyMap.cpp b/src/base/PropertyMap.cpp
index 884dbc9..27cabc4 100644
--- a/src/base/PropertyMap.cpp
+++ b/src/base/PropertyMap.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/PropertyMap.h b/src/base/PropertyMap.h
index 0527b16..a8f0f7c 100644
--- a/src/base/PropertyMap.h
+++ b/src/base/PropertyMap.h
@@ -1,7 +1,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/PropertyName.cpp b/src/base/PropertyName.cpp
index 6b1a9c7..8f25648 100644
--- a/src/base/PropertyName.cpp
+++ b/src/base/PropertyName.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/PropertyName.h b/src/base/PropertyName.h
index c74519f..7e2b41f 100644
--- a/src/base/PropertyName.h
+++ b/src/base/PropertyName.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Quantizer.cpp b/src/base/Quantizer.cpp
index c78cebe..83f29ae 100644
--- a/src/base/Quantizer.cpp
+++ b/src/base/Quantizer.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -76,6 +76,11 @@ Quantizer::quantize(Segment *s,
{
Q_ASSERT(m_toInsert.size() == 0);
+ m_normalizeRegion.first =
+ (from != s->end() ? (*from)->getAbsoluteTime() : s->getStartTime());
+ m_normalizeRegion.second =
+ (to != s->end() ? (*to)->getAbsoluteTime() : s->getEndTime());
+
quantizeRange(s, from, to);
insertNewEvents(s);
@@ -88,6 +93,9 @@ Quantizer::quantize(EventSelection *selection)
Segment &segment = selection->getSegment();
+ m_normalizeRegion.first = segment.getStartTime();
+ m_normalizeRegion.second = segment.getEndTime();
+
// Attempt to handle non-contiguous selections.
// We have to be a bit careful here, because the rest-
@@ -126,7 +134,10 @@ Quantizer::quantize(EventSelection *selection)
// Push the new events to the selection
for (int i = 0; i < int(m_toInsert.size()); ++i) {
- selection->addEvent(m_toInsert[i]);
+ if (m_toInsert[i]->getAbsoluteTime() < segment.getEndTime()) {
+ // Select only the events inside the segment.
+ selection->addEvent(m_toInsert[i]);
+ }
}
// and then to the segment
@@ -447,19 +458,58 @@ Quantizer::insertNewEvents(Segment *s) const
{
size_t sz = m_toInsert.size();
- timeT minTime = m_normalizeRegion.first,
- maxTime = m_normalizeRegion.second;
+ timeT startTime = m_normalizeRegion.first;
+ timeT endTime = m_normalizeRegion.second;
+ timeT minTime = (sz > 0 ? endTime : 0);
+ timeT maxTime = (sz > 0 ? startTime : 0);
for (size_t i = 0; i < sz; ++i) {
timeT myTime = m_toInsert[i]->getAbsoluteTime();
timeT myDur = m_toInsert[i]->getDuration();
- if (i == 0 || myTime < minTime) minTime = myTime;
- if (i == 0 || myTime + myDur > maxTime) maxTime = myTime + myDur;
+
+ if (endTime > 0 && myTime >= endTime) {
+ cerr << "Quantizer::insertNewEvents(): ignoring event outside the segment at "
+ << myTime << endl;
+ continue;
+ }
+
+ if (myTime < minTime) minTime = myTime;
+ if (myTime + myDur > maxTime) maxTime = myTime + myDur;
s->insert(m_toInsert[i]);
}
+ if (minTime < startTime) {
+ minTime = startTime;
+ } else if (minTime > startTime) {
+ timeT barStart = s->getBarStartForTime(minTime);
+
+ if (barStart <= startTime) {
+ minTime = startTime;
+ } else if (minTime != barStart) {
+ minTime = barStart;
+ } else {
+ // Maybe some events are quantized from the previous bar.
+ minTime = std::max(startTime, s->getBarStartForTime(barStart - 1));
+ }
+ }
+
+ if (endTime > 0) {
+ if (maxTime > endTime) {
+ maxTime = endTime;
+ } else if (maxTime < endTime) {
+ timeT barEnd = s->getBarEndForTime(maxTime);
+
+ if (barEnd >= endTime) {
+ maxTime = endTime;
+ } else {
+ // Maybe some quantized events occupied two bars.
+ maxTime = std::min(endTime, s->getBarEndForTime(barEnd + 1));
+ }
+ }
+ }
+
#ifdef DEBUG_NOTATION_QUANTIZER
cout << "Quantizer::insertNewEvents: sz is " << sz
<< ", minTime " << minTime << ", maxTime " << maxTime
diff --git a/src/base/Quantizer.h b/src/base/Quantizer.h
index 1ea9ef5..4c7f2e9 100644
--- a/src/base/Quantizer.h
+++ b/src/base/Quantizer.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/RealTime.cpp b/src/base/RealTime.cpp
index 9bed0ba..f2ade2f 100644
--- a/src/base/RealTime.cpp
+++ b/src/base/RealTime.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/RealTime.h b/src/base/RealTime.h
index d3a1a12..1d4c374 100644
--- a/src/base/RealTime.h
+++ b/src/base/RealTime.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/RefreshStatus.h b/src/base/RefreshStatus.h
index 81f7837..e80bf6e 100644
--- a/src/base/RefreshStatus.h
+++ b/src/base/RefreshStatus.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/RulerScale.cpp b/src/base/RulerScale.cpp
index 199f7d2..21ceeba 100644
--- a/src/base/RulerScale.cpp
+++ b/src/base/RulerScale.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/RulerScale.h b/src/base/RulerScale.h
index fbd5ba3..a831bd8 100644
--- a/src/base/RulerScale.h
+++ b/src/base/RulerScale.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/ScriptAPI.cpp b/src/base/ScriptAPI.cpp
index cf3aabe..83926bb 100644
--- a/src/base/ScriptAPI.cpp
+++ b/src/base/ScriptAPI.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/ScriptAPI.h b/src/base/ScriptAPI.h
index 4ba5a93..44df05f 100644
--- a/src/base/ScriptAPI.h
+++ b/src/base/ScriptAPI.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Segment.cpp b/src/base/Segment.cpp
index d884544..2d146d5 100644
--- a/src/base/Segment.cpp
+++ b/src/base/Segment.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -381,7 +381,7 @@ Segment::setStartTime(timeT t)
m_clefKeyList
1 is done explicitly here. 3, 4, 5, and 7 are done en masse
- below. 6 is accomplished via AllEventsChanged. 2 is no longer
+ below. 6 is accomplished via allEventsChanged. 2 is no longer
wanted since we need to insert the same event.
**/
@@ -390,7 +390,7 @@ Segment::setStartTime(timeT t)
// whole set.
for (iterator i = begin(); i != end(); ++i) {
Event *e = *i;
- // AllEventsChanged is allowed to assume the address points to
+ // allEventsChanged is allowed to assume the address points to
// the Event it knew about, so we need the same object to be
// removed and added, so we can't use copyMoving.
e->unsafeChangeTime(dt);
@@ -418,7 +418,7 @@ Segment::setStartTime(timeT t)
7. Thru notifyAdd, added clefs and keys to m_clefKeyList
1 and 7 are done explicitly here. 2, 3 & 5 are done en masse.
- 6 is accomplished via AllEventsChanged. 4 works because we
+ 6 is accomplished via allEventsChanged. 4 works because we
keep the same event object.
**/
for (int i = 0; i < int(events.size()); ++i) {
@@ -430,7 +430,7 @@ Segment::setStartTime(timeT t)
// Handle updates and notifications just once.
for (ObserverSet::const_iterator i = m_observers.begin();
i != m_observers.end(); ++i) {
- (*i)->AllEventsChanged(this);
+ (*i)->allEventsChanged(this);
}
notifyEndMarkerChange(dt < 0);
notifyStartChanged(m_startTime);
@@ -559,7 +559,7 @@ Segment::insert(Event *e)
// Event Start Time
timeT t0 = e->getAbsoluteTime();
// Event End Time
- timeT t1 = t0 + e->getDuration();
+ timeT t1 = t0 + e->getGreaterDuration();
// If this event starts before the segment start time
if (t0 < m_startTime ||
@@ -584,8 +584,7 @@ Segment::insert(Event *e)
iterator i = EventContainer::insert(e);
notifyAdd(e);
- updateRefreshStatuses(e->getAbsoluteTime(),
- e->getAbsoluteTime() + e->getDuration());
+ updateRefreshStatuses(e->getAbsoluteTime(), t1);
return i;
}
@@ -595,7 +594,7 @@ Segment::updateEndTime()
{
m_endTime = m_startTime;
for (iterator i = begin(); i != end(); ++i) {
- timeT t = (*i)->getAbsoluteTime() + (*i)->getDuration();
+ timeT t = (*i)->getAbsoluteTime() + (*i)->getGreaterDuration();
if (t > m_endTime) m_endTime = t;
}
}
@@ -608,9 +607,8 @@ Segment::erase(iterator pos)
Q_CHECK_PTR(e);
-
timeT t0 = e->getAbsoluteTime();
- timeT t1 = t0 + e->getDuration();
+ timeT t1 = t0 + e->getGreaterDuration();
EventContainer::erase(pos);
notifyRemove(e);
@@ -638,7 +636,7 @@ Segment::erase(iterator from, iterator to)
{
timeT startTime = 0, endTime = m_endTime;
if (from != end()) startTime = (*from)->getAbsoluteTime();
- if (to != end()) endTime = (*to)->getAbsoluteTime() + (*to)->getDuration();
+ if (to != end()) endTime = (*to)->getAbsoluteTime() + (*to)->getGreaterDuration();
// Not very efficient, but without an observer event for
// multiple erase we can't do any better.
@@ -914,7 +912,8 @@ Segment::normalizeRests(timeT startTime, timeT endTime)
for (iterator i = ia, j = i; i != ib && i != end(); i = j) {
++j;
if ((*i)->isa(Note::EventRestType) &&
- !(*i)->has(BaseProperties::BEAMED_GROUP_TUPLET_BASE)) {
+ !(*i)->has(BaseProperties::BEAMED_GROUP_TUPLET_BASE) &&
+ !(*i)->has(BaseProperties::INVISIBLE)) {
#ifdef DEBUG_NORMALIZE_RESTS
cerr << "normalizeRests: erasing rest at " << (*i)->getAbsoluteTime() << endl;
#endif
@@ -1696,7 +1695,7 @@ Segment::countVerses()
}
}
-segmentcontainer&
+SegmentMultiSet&
Segment::
getCompositionSegments(void)
{
@@ -1750,9 +1749,9 @@ Segment::dumpObservers()
void
SegmentObserver::
-AllEventsChanged(const Segment *s)
+allEventsChanged(const Segment *s)
{
- Profiler profiler("SegmentObserver::AllEventsChanged");
+ Profiler profiler("SegmentObserver::allEventsChanged");
for (Segment::iterator i = s->begin(); i != s->end(); ++i) {
Event *e = *i;
eventRemoved(s, e);
diff --git a/src/base/Segment.h b/src/base/Segment.h
index 141b816..ef511f4 100644
--- a/src/base/Segment.h
+++ b/src/base/Segment.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -61,7 +61,11 @@ class BasicCommand;
* EventContainer is a precursor to Segment, used in code that needs
* to store events but doesn't need all the ancillary data and
* behaviors that Segment provides.
- **/
+ *
+ * ??? The STL container classes are not intended to be derived from.
+ * They provide no virtual dtor. EventContainer should instead
+ * have a std::multiset member object.
+ */
class EventContainer : public std::multiset<Event*, Event::EventCmp>
{
public:
@@ -95,7 +99,7 @@ public:
/// A Segment contains either Internal representation or Audio
typedef enum {
- Internal,
+ Internal, // ??? rename: MIDI
Audio
} SegmentType;
@@ -153,6 +157,8 @@ public:
* Get the Segment type (Internal or Audio)
*/
SegmentType getType() const { return m_type; }
+ bool isMIDI() const { return (m_type == Internal); }
+ bool isAudio() const { return (m_type == Audio); }
/**
* Get the element name this class will have when serialised
@@ -727,10 +733,15 @@ public:
}
};
- typedef std::multiset<Segment*, Segment::SegmentCmp> segmentcontainer;
+ // This is a std::multiset because the segments aren't indexed by
+ // pointer address, they are indexed by track, then start time on
+ // a track (see SegmentCmp). And it is not unusual for two
+ // Segments to start at the same time on the same track.
+ // ??? rename: SegmentMultiSet
+ typedef std::multiset<Segment *, Segment::SegmentCmp> SegmentMultiSet;
// Get the segments in the current composition.
- static segmentcontainer& getCompositionSegments(void);
+ static SegmentMultiSet& getCompositionSegments(void);
void addObserver(SegmentObserver *obs) { m_observers.push_back(obs); }
void removeObserver(SegmentObserver *obs) { m_observers.remove(obs); }
@@ -988,7 +999,8 @@ private:
int m_verse; // Used to distribute lyrics among repeated segments
};
-typedef Segment::segmentcontainer segmentcontainer;
+// Make it a global name.
+typedef Segment::SegmentMultiSet SegmentMultiSet;
/// Base class interface for Segment notifications.
/**
@@ -1011,7 +1023,7 @@ public:
// Exists just for performance reasons. Called in lieu of calling
// eventAdded or eventRemoved many times. The default just calls
// both eventRemoved() and eventAdded() on every event.
- virtual void AllEventsChanged(const Segment *);
+ virtual void allEventsChanged(const Segment *);
/**
* Called after a change in the segment that will change the way its displays,
@@ -1033,7 +1045,8 @@ public:
/**
* Called from the segment dtor
- * MUST BE IMPLEMENTED BY ALL OBSERVERS
+ * All observers must implement this and call removeObserver() to
+ * remove themselves as observers.
*/
virtual void segmentDeleted(const Segment *) = 0;
};
diff --git a/src/base/SegmentLinker.cpp b/src/base/SegmentLinker.cpp
index d1d713a..2efa9af 100644
--- a/src/base/SegmentLinker.cpp
+++ b/src/base/SegmentLinker.cpp
@@ -227,16 +227,19 @@ SegmentLinker::linkedSegmentChanged(Segment *s, const timeT from,
itr != s->findTime(to); ++itr) {
const Event *e = *itr;
- timeT eventT = (e->getAbsoluteTime()-sourceSegStartTime)
+ timeT eventT = (e->getAbsoluteTime() - sourceSegStartTime)
+ segStartTime;
+ timeT eventNotationT = (e->getNotationAbsoluteTime() - sourceSegStartTime)
+ + segStartTime;
+
int semitones =
linkedSegToUpdate->getLinkTransposeParams().m_semitones -
s->getLinkTransposeParams().m_semitones;
int steps = linkedSegToUpdate->getLinkTransposeParams().m_steps -
s->getLinkTransposeParams().m_steps;
- insertMappedEvent(linkedSegToUpdate,e,eventT,semitones,steps);
+ insertMappedEvent(linkedSegToUpdate,e,eventT,eventNotationT,semitones,steps);
}
// Now only send one resize notification to observers if needed.
@@ -247,7 +250,7 @@ SegmentLinker::linkedSegmentChanged(Segment *s, const timeT from,
}
void
-SegmentLinker::insertMappedEvent(Segment *seg, const Event *e, timeT t,
+SegmentLinker::insertMappedEvent(Segment *seg, const Event *e, timeT t, timeT nt,
int semitones, int steps)
{
bool ignore;
@@ -255,9 +258,14 @@ SegmentLinker::insertMappedEvent(Segment *seg, const Event *e, timeT t,
&& ignore) {
return;
}
-
- Event *refSegEvent = new Event(*e,t);
-
+
+ Event *refSegEvent = new Event(*e,
+ t,
+ e->getDuration(),
+ e->getSubOrdering(),
+ nt,
+ e->getNotationDuration());
+
bool needsInsertion = true;
//correct for temporal (and pitch shift??) here eventually...
@@ -352,9 +360,11 @@ SegmentLinker::refreshSegment(Segment *seg)
const Event *refEvent = *segitr;
timeT refEventTime = refEvent->getAbsoluteTime() - sourceSegStartTime;
- timeT freshEventTime = refEventTime+startTime;
-
- insertMappedEvent(seg,refEvent,freshEventTime,
+ timeT freshEventTime = refEventTime + startTime;
+ timeT refEventNotationTime = refEvent->getNotationAbsoluteTime() - sourceSegStartTime;
+ timeT freshEventNotationTime = refEventNotationTime + startTime;
+
+ insertMappedEvent(seg,refEvent,freshEventTime,freshEventNotationTime,
seg->getLinkTransposeParams().m_semitones,
seg->getLinkTransposeParams().m_steps);
}
diff --git a/src/base/SegmentLinker.h b/src/base/SegmentLinker.h
index 05d3548..2236165 100644
--- a/src/base/SegmentLinker.h
+++ b/src/base/SegmentLinker.h
@@ -80,7 +80,7 @@ private:
void linkedSegmentChanged(Segment* s, const timeT from, const timeT to);
void eraseNonIgnored(Segment *s, Segment::const_iterator itrFrom,
Segment::const_iterator itrTo);
- void insertMappedEvent(Segment *seg, const Event *e, timeT t,
+ void insertMappedEvent(Segment *seg, const Event *e, timeT t, timeT nt,
int semitones, int steps);
LinkedSegmentParamsList::iterator findParamsItrForSegment(Segment *s);
static void handleImpliedCMajor(Segment *s);
diff --git a/src/base/SegmentMatrixHelper.cpp b/src/base/SegmentMatrixHelper.cpp
index e716115..acd9c78 100644
--- a/src/base/SegmentMatrixHelper.cpp
+++ b/src/base/SegmentMatrixHelper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/SegmentMatrixHelper.h b/src/base/SegmentMatrixHelper.h
index 5e46f2a..f494fdc 100644
--- a/src/base/SegmentMatrixHelper.h
+++ b/src/base/SegmentMatrixHelper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/SegmentNotationHelper.cpp b/src/base/SegmentNotationHelper.cpp
index e38e531..88b6cd1 100644
--- a/src/base/SegmentNotationHelper.cpp
+++ b/src/base/SegmentNotationHelper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -664,25 +664,34 @@ SegmentNotationHelper::makeThisNoteViable(iterator noteItr, bool splitAtBars)
// Behaviour differs from TimeSignature::getDurationListForInterval
timeT acc = 0;
+ timeT qt = (*i)->getNotationAbsoluteTime();
timeT required = (*i)->getNotationDuration();
+ timeT maxdur = (*i)->getAbsoluteTime() + (*i)->getDuration() - qt;
+
+ if (maxdur <= 0) {
+ return *noteItr;
+ }
// While we've not yet accumulated the required amount of time, build
// the duration list (dl).
while (acc < required) {
timeT remaining = required - acc;
if (splitAtBars) {
- timeT thisNoteStart = (*i)->getNotationAbsoluteTime() + acc;
+ timeT thisNoteStart = qt + acc;
timeT toNextBar =
segment().getBarEndForTime(thisNoteStart) - thisNoteStart;
if (toNextBar > 0 && remaining > toNextBar)
remaining = toNextBar;
}
timeT component = Note::getNearestNote(remaining).getDuration();
- if (component > (required - acc))
- dl.push_back(required - acc);
- else
- dl.push_back(component);
+ timeT dur = (component > (required - acc) ? (required - acc) : component);
+ if (maxdur <= dur) {
+ // Split point doesn't preseve performance time
+ break;
+ }
+ dl.push_back(dur);
acc += component;
+ maxdur -= dur;
}
if (dl.size() < 2) {
@@ -1198,9 +1207,10 @@ SegmentNotationHelper::deleteNote(Event *e, bool collapseRest)
// replace-note-by-rest option. We still lose in the case where
// another note starts before this one, overlaps it, but then also
// ends before it does -- but I think we can live with that.
-
+
iterator j = i;
- timeT endTime = (*i)->getAbsoluteTime() + (*i)->getDuration();
+ timeT dur = (*i)->getGreaterDuration();
+ timeT endTime = (*i)->getAbsoluteTime() + dur;
while (j != end() && (*j)->getAbsoluteTime() < endTime) {
@@ -1230,7 +1240,7 @@ SegmentNotationHelper::deleteNote(Event *e, bool collapseRest)
if (e->has(BEAMED_GROUP_TUPLET_BASE)==false){
// replace with a rest
Event *newRest = new Event(Note::EventRestType,
- e->getAbsoluteTime(), e->getDuration(),
+ e->getAbsoluteTime(), dur,
Note::EventRestSubOrdering);
insert(newRest);
erase(i);
diff --git a/src/base/SegmentNotationHelper.h b/src/base/SegmentNotationHelper.h
index 3009fcd..e61d1f5 100644
--- a/src/base/SegmentNotationHelper.h
+++ b/src/base/SegmentNotationHelper.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/SegmentPerformanceHelper.cpp b/src/base/SegmentPerformanceHelper.cpp
index 4efc598..d3a1d29 100644
--- a/src/base/SegmentPerformanceHelper.cpp
+++ b/src/base/SegmentPerformanceHelper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/SegmentPerformanceHelper.h b/src/base/SegmentPerformanceHelper.h
index 78cc2eb..430477e 100644
--- a/src/base/SegmentPerformanceHelper.h
+++ b/src/base/SegmentPerformanceHelper.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Selection.cpp b/src/base/Selection.cpp
index ee570fd..0d8aecb 100644
--- a/src/base/Selection.cpp
+++ b/src/base/Selection.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ EventSelection::EventSelection(Segment& t, timeT beginTime, timeT endTime, bool
if (i != t.end()) {
m_beginTime = (*i)->getAbsoluteTime();
while (i != j) {
- m_endTime = (*i)->getAbsoluteTime() + (*i)->getDuration();
+ m_endTime = (*i)->getAbsoluteTime() + (*i)->getGreaterDuration();
m_segmentEvents.insert(*i);
++i;
}
@@ -59,7 +59,7 @@ EventSelection::EventSelection(Segment& t, timeT beginTime, timeT endTime, bool
while (i != t.begin() && i != t.end() && i != j) {
- if ((*i)->getAbsoluteTime() + (*i)->getDuration() > beginTime)
+ if ((*i)->getAbsoluteTime() + (*i)->getGreaterDuration() > beginTime)
{
m_segmentEvents.insert(*i); // duplicates are filtered automatically
m_beginTime = (*i)->getAbsoluteTime();
@@ -87,9 +87,11 @@ EventSelection::EventSelection(const EventSelection &sel) :
EventSelection::~EventSelection()
{
- // Notify observers of deconstruction
- for (ObserverSet::const_iterator i = m_observers.begin(); i != m_observers.end(); ++i) {
- (*i)->eventSelectionDestroyed(this);
+ if (!m_observers.empty()) {
+ // Notify observers of deconstruction
+ for (ObserverSet::const_iterator i = m_observers.begin(); i != m_observers.end(); ++i) {
+ (*i)->eventSelectionDestroyed(this);
+ }
}
m_originalSegment.removeObserver(this);
}
@@ -115,7 +117,7 @@ EventSelection::insertThisEvent(Event *e)
m_haveRealStartTime = true;
}
- timeT eventDuration = e->getDuration();
+ timeT eventDuration = e->getGreaterDuration();
if (eventDuration == 0) eventDuration = 1;
timeT eventEndTime = e->getAbsoluteTime() + eventDuration;
@@ -173,7 +175,7 @@ EventSelection::addRemoveEvent(Event *e, EventFuncPtr insertEraseFn,
// it.
//}
- timeT eventDuration = e->getDuration();
+ timeT eventDuration = e->getGreaterDuration();
if (eventDuration == 0) eventDuration = 1;
timeT eventStartTime = e->getAbsoluteTime();
@@ -462,18 +464,6 @@ EventSelection::dump() const
}
-/** SegmentSelection **/
-
-bool SegmentSelection::hasNonAudioSegment() const
-{
- for (const_iterator i = begin(); i != end(); ++i) {
- if ((*i)->getType() == Segment::Internal)
- return true;
- }
- return false;
-}
-
-
/** Templates that define methods of TimewiseSelection **/
template <typename ElementInfo>
diff --git a/src/base/Selection.h b/src/base/Selection.h
index adb0bf4..f06e3e5 100644
--- a/src/base/Selection.h
+++ b/src/base/Selection.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -214,12 +214,7 @@ protected:
* SegmentSelection is much simpler than EventSelection, we don't
* need to do much with this really
*/
-
-class SegmentSelection : public std::set<Segment *>
-{
-public:
- bool hasNonAudioSegment() const;
-};
+typedef std::set<Segment *> SegmentSelection;
/**
* Template for a selection that includes only elements of type
diff --git a/src/base/Sets.cpp b/src/base/Sets.cpp
index 555dc48..814b08d 100644
--- a/src/base/Sets.cpp
+++ b/src/base/Sets.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Sets.h b/src/base/Sets.h
index 1d0c22c..add48f1 100644
--- a/src/base/Sets.h
+++ b/src/base/Sets.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/SnapGrid.cpp b/src/base/SnapGrid.cpp
index f2eeda7..e708648 100644
--- a/src/base/SnapGrid.cpp
+++ b/src/base/SnapGrid.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/SnapGrid.h b/src/base/SnapGrid.h
index 897769e..1a7a064 100644
--- a/src/base/SnapGrid.h
+++ b/src/base/SnapGrid.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/SoftSynthDevice.cpp b/src/base/SoftSynthDevice.cpp
index fb71eeb..4f1afd4 100644
--- a/src/base/SoftSynthDevice.cpp
+++ b/src/base/SoftSynthDevice.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/SoftSynthDevice.h b/src/base/SoftSynthDevice.h
index 507224a..a196602 100644
--- a/src/base/SoftSynthDevice.h
+++ b/src/base/SoftSynthDevice.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/StaffExportTypes.h b/src/base/StaffExportTypes.h
index 16cf952..b8e07cc 100644
--- a/src/base/StaffExportTypes.h
+++ b/src/base/StaffExportTypes.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file Coypright 2009 D. Michael McIntyre
diff --git a/src/base/Studio.cpp b/src/base/Studio.cpp
index 92a6dc9..2dfbc6d 100644
--- a/src/base/Studio.cpp
+++ b/src/base/Studio.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -586,7 +586,7 @@ Studio::unassignAllInstruments()
(*iit)->setSendProgramChange(false);
(*iit)->setNaturalChannel(channel);
channel = ( channel + 1 ) % 16;
- (*iit)->releaseFixedChannel();
+ (*iit)->setFixedChannel();
(*iit)->setSendPan(false);
(*iit)->setSendVolume(false);
diff --git a/src/base/Studio.h b/src/base/Studio.h
index 00faded..6def3d5 100644
--- a/src/base/Studio.h
+++ b/src/base/Studio.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/ThingFactory.h b/src/base/ThingFactory.h
index 6a838af..50adaae 100644
--- a/src/base/ThingFactory.h
+++ b/src/base/ThingFactory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/base/TimeT.h b/src/base/TimeT.h
index 09870e5..b78fec9 100644
--- a/src/base/TimeT.h
+++ b/src/base/TimeT.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/Track.cpp b/src/base/Track.cpp
index 43c3ae7..5fd266a 100644
--- a/src/base/Track.cpp
+++ b/src/base/Track.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/Track.h b/src/base/Track.h
index e94099c..6849cff 100644
--- a/src/base/Track.h
+++ b/src/base/Track.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/TriggerSegment.cpp b/src/base/TriggerSegment.cpp
index d78be8f..08ab30f 100644
--- a/src/base/TriggerSegment.cpp
+++ b/src/base/TriggerSegment.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/TriggerSegment.h b/src/base/TriggerSegment.h
index 05fca2f..d25c8a6 100644
--- a/src/base/TriggerSegment.h
+++ b/src/base/TriggerSegment.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/UrlHash.cpp b/src/base/UrlHash.cpp
index 5c1e452..a36eb3f 100644
--- a/src/base/UrlHash.cpp
+++ b/src/base/UrlHash.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/base/UrlHash.h b/src/base/UrlHash.h
index 2a182e6..518717c 100644
--- a/src/base/UrlHash.h
+++ b/src/base/UrlHash.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/base/ViewElement.cpp b/src/base/ViewElement.cpp
index ad23d30..392ddbf 100644
--- a/src/base/ViewElement.cpp
+++ b/src/base/ViewElement.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/ViewElement.h b/src/base/ViewElement.h
index 66fe762..811e728 100644
--- a/src/base/ViewElement.h
+++ b/src/base/ViewElement.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/ViewSegment.cpp b/src/base/ViewSegment.cpp
index 732e337..e89e16c 100644
--- a/src/base/ViewSegment.cpp
+++ b/src/base/ViewSegment.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/ViewSegment.h b/src/base/ViewSegment.h
index 9fd5ca3..2ff27f6 100644
--- a/src/base/ViewSegment.h
+++ b/src/base/ViewSegment.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/XmlExportable.cpp b/src/base/XmlExportable.cpp
index 65cfb15..cf6621d 100644
--- a/src/base/XmlExportable.cpp
+++ b/src/base/XmlExportable.cpp
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/XmlExportable.h b/src/base/XmlExportable.h
index 73579d3..deb3581 100644
--- a/src/base/XmlExportable.h
+++ b/src/base/XmlExportable.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/base/figuration/SegmentFigData.cpp b/src/base/figuration/SegmentFigData.cpp
index 8a621e0..f7b5760 100644
--- a/src/base/figuration/SegmentFigData.cpp
+++ b/src/base/figuration/SegmentFigData.cpp
@@ -356,10 +356,10 @@ getInvolvedSegments(bool onlyIfNeedTag, MacroCommand* command)
typedef SegmentFigDataMap::value_type ValueType;
SegmentFigDataMap storedScans;
- segmentcontainer ss = Segment::getCompositionSegments();
+ SegmentMultiSet ss = Segment::getCompositionSegments();
// Loop thru all segments with scanSegment.
- for (segmentcontainer::iterator i = ss.begin();
+ for (SegmentMultiSet::iterator i = ss.begin();
i != ss.end();
++i) {
SegmentFigData segmentData(*i);
diff --git a/src/base/parameterpattern/AlternatingParameterPattern.cpp b/src/base/parameterpattern/AlternatingParameterPattern.cpp
index 9d6de67..b8e020f 100644
--- a/src/base/parameterpattern/AlternatingParameterPattern.cpp
+++ b/src/base/parameterpattern/AlternatingParameterPattern.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/AlternatingParameterPattern.h b/src/base/parameterpattern/AlternatingParameterPattern.h
index 8c54796..d50a25b 100644
--- a/src/base/parameterpattern/AlternatingParameterPattern.h
+++ b/src/base/parameterpattern/AlternatingParameterPattern.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/FlatParameterPattern.cpp b/src/base/parameterpattern/FlatParameterPattern.cpp
index 90643bc..9bdac60 100644
--- a/src/base/parameterpattern/FlatParameterPattern.cpp
+++ b/src/base/parameterpattern/FlatParameterPattern.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/FlatParameterPattern.h b/src/base/parameterpattern/FlatParameterPattern.h
index e7b0cc0..099170a 100644
--- a/src/base/parameterpattern/FlatParameterPattern.h
+++ b/src/base/parameterpattern/FlatParameterPattern.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/HalfSinePattern.cpp b/src/base/parameterpattern/HalfSinePattern.cpp
index 950cbb1..b7a6bec 100644
--- a/src/base/parameterpattern/HalfSinePattern.cpp
+++ b/src/base/parameterpattern/HalfSinePattern.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/HalfSinePattern.h b/src/base/parameterpattern/HalfSinePattern.h
index 813a147..6dc10ce 100644
--- a/src/base/parameterpattern/HalfSinePattern.h
+++ b/src/base/parameterpattern/HalfSinePattern.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/IncreaseParameterPattern.cpp b/src/base/parameterpattern/IncreaseParameterPattern.cpp
index b8e474e..0d2927c 100644
--- a/src/base/parameterpattern/IncreaseParameterPattern.cpp
+++ b/src/base/parameterpattern/IncreaseParameterPattern.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/IncreaseParameterPattern.h b/src/base/parameterpattern/IncreaseParameterPattern.h
index fc5162d..b6ae620 100644
--- a/src/base/parameterpattern/IncreaseParameterPattern.h
+++ b/src/base/parameterpattern/IncreaseParameterPattern.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/LinearParameterPattern.cpp b/src/base/parameterpattern/LinearParameterPattern.cpp
index 7d0dfbc..e866731 100644
--- a/src/base/parameterpattern/LinearParameterPattern.cpp
+++ b/src/base/parameterpattern/LinearParameterPattern.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/LinearParameterPattern.h b/src/base/parameterpattern/LinearParameterPattern.h
index 47acc70..59676f5 100644
--- a/src/base/parameterpattern/LinearParameterPattern.h
+++ b/src/base/parameterpattern/LinearParameterPattern.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/ParameterPattern.cpp b/src/base/parameterpattern/ParameterPattern.cpp
index eaf804f..c4fd492 100644
--- a/src/base/parameterpattern/ParameterPattern.cpp
+++ b/src/base/parameterpattern/ParameterPattern.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/ParameterPattern.h b/src/base/parameterpattern/ParameterPattern.h
index 55a2f8b..71c3cac 100644
--- a/src/base/parameterpattern/ParameterPattern.h
+++ b/src/base/parameterpattern/ParameterPattern.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/QuarterSinePattern.cpp b/src/base/parameterpattern/QuarterSinePattern.cpp
index 23165f7..b5f3022 100644
--- a/src/base/parameterpattern/QuarterSinePattern.cpp
+++ b/src/base/parameterpattern/QuarterSinePattern.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/QuarterSinePattern.h b/src/base/parameterpattern/QuarterSinePattern.h
index c318d83..f88e23b 100644
--- a/src/base/parameterpattern/QuarterSinePattern.h
+++ b/src/base/parameterpattern/QuarterSinePattern.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/RelativeRamp.cpp b/src/base/parameterpattern/RelativeRamp.cpp
index 49cf34a..7c26d0e 100644
--- a/src/base/parameterpattern/RelativeRamp.cpp
+++ b/src/base/parameterpattern/RelativeRamp.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/RelativeRamp.h b/src/base/parameterpattern/RelativeRamp.h
index 57b4902..128fdb9 100644
--- a/src/base/parameterpattern/RelativeRamp.h
+++ b/src/base/parameterpattern/RelativeRamp.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/RingingParameterPattern.cpp b/src/base/parameterpattern/RingingParameterPattern.cpp
index ceb2dad..c72f4a0 100644
--- a/src/base/parameterpattern/RingingParameterPattern.cpp
+++ b/src/base/parameterpattern/RingingParameterPattern.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/RingingParameterPattern.h b/src/base/parameterpattern/RingingParameterPattern.h
index aa93b6b..9f36141 100644
--- a/src/base/parameterpattern/RingingParameterPattern.h
+++ b/src/base/parameterpattern/RingingParameterPattern.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/SelectionSituation.cpp b/src/base/parameterpattern/SelectionSituation.cpp
index 1e99181..6b1efac 100644
--- a/src/base/parameterpattern/SelectionSituation.cpp
+++ b/src/base/parameterpattern/SelectionSituation.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/base/parameterpattern/SelectionSituation.h b/src/base/parameterpattern/SelectionSituation.h
index 09345a9..323a8b8 100644
--- a/src/base/parameterpattern/SelectionSituation.h
+++ b/src/base/parameterpattern/SelectionSituation.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/AddDotCommand.cpp b/src/commands/edit/AddDotCommand.cpp
index bf1b7c6..c5e4c57 100644
--- a/src/commands/edit/AddDotCommand.cpp
+++ b/src/commands/edit/AddDotCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/AddDotCommand.h b/src/commands/edit/AddDotCommand.h
index 96c4505..ec45f5b 100644
--- a/src/commands/edit/AddDotCommand.h
+++ b/src/commands/edit/AddDotCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/AddMarkerCommand.cpp b/src/commands/edit/AddMarkerCommand.cpp
index 47e5282..0509a27 100644
--- a/src/commands/edit/AddMarkerCommand.cpp
+++ b/src/commands/edit/AddMarkerCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/AddMarkerCommand.h b/src/commands/edit/AddMarkerCommand.h
index 1f89dc8..c77be0b 100644
--- a/src/commands/edit/AddMarkerCommand.h
+++ b/src/commands/edit/AddMarkerCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/ChangeVelocityCommand.cpp b/src/commands/edit/ChangeVelocityCommand.cpp
index bffb4a5..f502cfa 100644
--- a/src/commands/edit/ChangeVelocityCommand.cpp
+++ b/src/commands/edit/ChangeVelocityCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/ChangeVelocityCommand.h b/src/commands/edit/ChangeVelocityCommand.h
index 0f25095..6b02dd7 100644
--- a/src/commands/edit/ChangeVelocityCommand.h
+++ b/src/commands/edit/ChangeVelocityCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/ClearTriggersCommand.cpp b/src/commands/edit/ClearTriggersCommand.cpp
index fbbfd8d..1edb908 100644
--- a/src/commands/edit/ClearTriggersCommand.cpp
+++ b/src/commands/edit/ClearTriggersCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/ClearTriggersCommand.h b/src/commands/edit/ClearTriggersCommand.h
index d71cac5..d4d4e1e 100644
--- a/src/commands/edit/ClearTriggersCommand.h
+++ b/src/commands/edit/ClearTriggersCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/CollapseNotesCommand.cpp b/src/commands/edit/CollapseNotesCommand.cpp
index cccef5d..923c89a 100644
--- a/src/commands/edit/CollapseNotesCommand.cpp
+++ b/src/commands/edit/CollapseNotesCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/CollapseNotesCommand.h b/src/commands/edit/CollapseNotesCommand.h
index 026b57d..7ddbaf1 100644
--- a/src/commands/edit/CollapseNotesCommand.h
+++ b/src/commands/edit/CollapseNotesCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/CopyCommand.cpp b/src/commands/edit/CopyCommand.cpp
index be700d0..7c51300 100644
--- a/src/commands/edit/CopyCommand.cpp
+++ b/src/commands/edit/CopyCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -52,7 +52,8 @@ CopyCommand::CopyCommand(SegmentSelection &selection,
for (SegmentSelection::iterator i = selection.begin();
i != selection.end(); ++i) {
std::string label = (*i)->getLabel();
- m_sourceClipboard->newSegment(*i)->setLabel(
+ // Fix #1446 : Make a deep copy only when segment is truly linked.
+ m_sourceClipboard->newSegment(*i, (*i)->isTrulyLinked())->setLabel(
appendLabel(label, qstrtostr(tr("(copied)"))));
}
}
diff --git a/src/commands/edit/CopyCommand.h b/src/commands/edit/CopyCommand.h
index b6b4639..e4a7fff 100644
--- a/src/commands/edit/CopyCommand.h
+++ b/src/commands/edit/CopyCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -22,6 +22,7 @@
#include "document/Command.h"
#include <QString>
#include "base/Event.h"
+#include "base/Selection.h"
#include <QCoreApplication>
@@ -30,7 +31,7 @@
namespace Rosegarden
{
-class SegmentSelection;
+
class EventSelection;
class Composition;
class Clipboard;
diff --git a/src/commands/edit/CutAndCloseCommand.cpp b/src/commands/edit/CutAndCloseCommand.cpp
index d4f7651..81ed49c 100644
--- a/src/commands/edit/CutAndCloseCommand.cpp
+++ b/src/commands/edit/CutAndCloseCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/CutAndCloseCommand.h b/src/commands/edit/CutAndCloseCommand.h
index 7b33460..5709689 100644
--- a/src/commands/edit/CutAndCloseCommand.h
+++ b/src/commands/edit/CutAndCloseCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/CutCommand.cpp b/src/commands/edit/CutCommand.cpp
index b20f45f..98c8afd 100644
--- a/src/commands/edit/CutCommand.cpp
+++ b/src/commands/edit/CutCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/CutCommand.h b/src/commands/edit/CutCommand.h
index 9baed71..88858a9 100644
--- a/src/commands/edit/CutCommand.h
+++ b/src/commands/edit/CutCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -22,12 +22,13 @@
#include <QString>
#include <QCoreApplication>
#include "document/Command.h"
+#include "base/Selection.h"
namespace Rosegarden
{
-class SegmentSelection;
+
class EventSelection;
class Clipboard;
diff --git a/src/commands/edit/EraseCommand.cpp b/src/commands/edit/EraseCommand.cpp
index 7cb8165..e8c3341 100644
--- a/src/commands/edit/EraseCommand.cpp
+++ b/src/commands/edit/EraseCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -22,7 +22,9 @@
#include "misc/Debug.h"
#include "base/NotationTypes.h"
#include "base/Selection.h"
+#include "base/BaseProperties.h"
#include "document/BasicSelectionCommand.h"
+#include "gui/editors/notation/NotationProperties.h"
#include <QString>
@@ -68,6 +70,73 @@ EraseCommand::eraseInSegment(EventSelection *selection)
if ((*i)->isa(Clef::EventType) ||
(*i)->isa(Key ::EventType)) {
erasedLongEffectEvent = true;
+ } else if ((*i)->isa(Indication::EventType)) {
+
+ try {
+ int graceToAdjust = 0;
+ int minGraceSubOrdering = 0;
+ int maxDeltaGraceSubOrdering = 0;
+ int indicationSubOrdering = (*i)->getSubOrdering();
+ int minSubOrdering = 0;
+
+ // Adjust suborderings of any existing grace notes if necessary.
+
+ Segment::iterator h, j;
+ segment.getTimeSlice((*i)->getAbsoluteTime(), h, j);
+ for (Segment::iterator k = h; k != j; ++k) {
+ if ((*k)->has(BaseProperties::IS_GRACE_NOTE)) {
+ if ((*k)->getSubOrdering() < indicationSubOrdering) {
+ ++graceToAdjust;
+ if ((*k)->getSubOrdering() < minGraceSubOrdering) {
+ minGraceSubOrdering = (*k)->getSubOrdering();
+ maxDeltaGraceSubOrdering =
+ indicationSubOrdering - minGraceSubOrdering;
+ }
+ }
+ } else if ((*i) != (*k) &&
+ (*k)->getSubOrdering() < minSubOrdering) {
+ minSubOrdering = (*k)->getSubOrdering();
+ }
+ }
+
+ if (graceToAdjust > 0 &&
+ minGraceSubOrdering < indicationSubOrdering &&
+ minSubOrdering > indicationSubOrdering &&
+ maxDeltaGraceSubOrdering >= graceToAdjust) {
+ int incr = minSubOrdering - indicationSubOrdering;
+ std::vector<Event *> toInsert, toErase;
+ for (Segment::iterator k = h; k != j; ++k) {
+ if ((*k)->has(BaseProperties::IS_GRACE_NOTE) &&
+ (*k)->getSubOrdering() < indicationSubOrdering) {
+ // Subordering of the grace note is incremented to
+ // avoid (a rare) relevant decrement of that value.
+ toErase.push_back(*k);
+ toInsert.push_back
+ (new Event(**k,
+ (*k)->getAbsoluteTime(),
+ (*k)->getDuration(),
+ (*k)->getSubOrdering() + incr,
+ (*k)->getNotationAbsoluteTime(),
+ (*k)->getNotationDuration()));
+ }
+ }
+ for (std::vector<Event *>::iterator k = toErase.begin();
+ k != toErase.end(); ++k) segment.eraseSingle(*k);
+ for (std::vector<Event *>::iterator k = toInsert.begin();
+ k != toInsert.end(); ++k) segment.insert(*k);
+ }
+
+ Indication indication(**i);
+ if (indication.isOttavaType()) {
+
+ for (Segment::iterator j = segment.findTime ((*i)->getAbsoluteTime());
+ j != segment.findTime
+ ((*i)->getAbsoluteTime() + indication.getIndicationDuration());
+ ++j) {
+ (*j)->unset(NotationProperties::OTTAVA_SHIFT);
+ }
+ }
+ } catch (...) {}
}
// We used to do this by calling SegmentNotationHelper::deleteEvent
diff --git a/src/commands/edit/EraseCommand.h b/src/commands/edit/EraseCommand.h
index 77e37c8..e148eab 100644
--- a/src/commands/edit/EraseCommand.h
+++ b/src/commands/edit/EraseCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/EventEditCommand.cpp b/src/commands/edit/EventEditCommand.cpp
index 65d6d0d..7a827a8 100644
--- a/src/commands/edit/EventEditCommand.cpp
+++ b/src/commands/edit/EventEditCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/EventEditCommand.h b/src/commands/edit/EventEditCommand.h
index e5c11a7..0b2b100 100644
--- a/src/commands/edit/EventEditCommand.h
+++ b/src/commands/edit/EventEditCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/EventInsertionCommand.cpp b/src/commands/edit/EventInsertionCommand.cpp
index 6fbee13..7dde590 100644
--- a/src/commands/edit/EventInsertionCommand.cpp
+++ b/src/commands/edit/EventInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/EventInsertionCommand.h b/src/commands/edit/EventInsertionCommand.h
index 8301405..3ee21d2 100644
--- a/src/commands/edit/EventInsertionCommand.h
+++ b/src/commands/edit/EventInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/EventQuantizeCommand.cpp b/src/commands/edit/EventQuantizeCommand.cpp
index d8e8512..b4a2084 100644
--- a/src/commands/edit/EventQuantizeCommand.cpp
+++ b/src/commands/edit/EventQuantizeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -137,6 +137,8 @@ EventQuantizeCommand::modifySegment()
settings.endGroup();
}
+ timeT endTime = segment.getEndTime();
+
if (m_selection) {
m_quantizer->quantize(m_selection);
@@ -146,6 +148,10 @@ EventQuantizeCommand::modifySegment()
segment.findTime(getEndTime()));
}
+ if (segment.getEndTime() < endTime) {
+ segment.setEndTime(endTime);
+ }
+
if (m_progressTotal > 0) {
if (rebeam || makeviable || decounterpoint) {
emit setValue(m_progressTotal + m_progressPerCall / 2);
diff --git a/src/commands/edit/EventQuantizeCommand.h b/src/commands/edit/EventQuantizeCommand.h
index 5beb82a..781f19e 100644
--- a/src/commands/edit/EventQuantizeCommand.h
+++ b/src/commands/edit/EventQuantizeCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/EventUnquantizeCommand.cpp b/src/commands/edit/EventUnquantizeCommand.cpp
index e92b897..dab0d3d 100644
--- a/src/commands/edit/EventUnquantizeCommand.cpp
+++ b/src/commands/edit/EventUnquantizeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/EventUnquantizeCommand.h b/src/commands/edit/EventUnquantizeCommand.h
index 5d63d92..fe5625c 100644
--- a/src/commands/edit/EventUnquantizeCommand.h
+++ b/src/commands/edit/EventUnquantizeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/InsertTriggerNoteCommand.cpp b/src/commands/edit/InsertTriggerNoteCommand.cpp
index 0a8f139..651ade9 100644
--- a/src/commands/edit/InsertTriggerNoteCommand.cpp
+++ b/src/commands/edit/InsertTriggerNoteCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/InsertTriggerNoteCommand.h b/src/commands/edit/InsertTriggerNoteCommand.h
index 0f294f9..57a73fd 100644
--- a/src/commands/edit/InsertTriggerNoteCommand.h
+++ b/src/commands/edit/InsertTriggerNoteCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/InvertCommand.cpp b/src/commands/edit/InvertCommand.cpp
index 4b938af..ecb09d3 100644
--- a/src/commands/edit/InvertCommand.cpp
+++ b/src/commands/edit/InvertCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/InvertCommand.h b/src/commands/edit/InvertCommand.h
index 3db38cd..c13b75e 100644
--- a/src/commands/edit/InvertCommand.h
+++ b/src/commands/edit/InvertCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/ModifyMarkerCommand.cpp b/src/commands/edit/ModifyMarkerCommand.cpp
index 9dbc76e..1e4a3fb 100644
--- a/src/commands/edit/ModifyMarkerCommand.cpp
+++ b/src/commands/edit/ModifyMarkerCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/ModifyMarkerCommand.h b/src/commands/edit/ModifyMarkerCommand.h
index 33e8259..9c6ac74 100644
--- a/src/commands/edit/ModifyMarkerCommand.h
+++ b/src/commands/edit/ModifyMarkerCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/MoveAcrossSegmentsCommand.cpp b/src/commands/edit/MoveAcrossSegmentsCommand.cpp
index 46959da..c113ed5 100644
--- a/src/commands/edit/MoveAcrossSegmentsCommand.cpp
+++ b/src/commands/edit/MoveAcrossSegmentsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/MoveAcrossSegmentsCommand.h b/src/commands/edit/MoveAcrossSegmentsCommand.h
index 7f90c68..7ef2623 100644
--- a/src/commands/edit/MoveAcrossSegmentsCommand.h
+++ b/src/commands/edit/MoveAcrossSegmentsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/MoveCommand.cpp b/src/commands/edit/MoveCommand.cpp
index d066932..d00f162 100644
--- a/src/commands/edit/MoveCommand.cpp
+++ b/src/commands/edit/MoveCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/MoveCommand.h b/src/commands/edit/MoveCommand.h
index 1b0e13a..53b77a4 100644
--- a/src/commands/edit/MoveCommand.h
+++ b/src/commands/edit/MoveCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/PasteEventsCommand.cpp b/src/commands/edit/PasteEventsCommand.cpp
index 1e270c7..4dd163a 100644
--- a/src/commands/edit/PasteEventsCommand.cpp
+++ b/src/commands/edit/PasteEventsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -144,18 +144,51 @@ PasteEventsCommand::isPossible()
return false;
}
- if (m_pasteType != Restricted) {
- return true;
- }
-
Segment *source = m_clipboard->getSingleSegment();
+ Segment *destination(&getSegment());
- timeT pasteTime = getStartTime();
+ timeT pasteTime = std::max(getStartTime(), destination->getStartTime());
timeT origin = source->getStartTime();
timeT duration = source->getEndTime() - origin;
+ if (m_pasteType == MatrixOverlay) {
+ // Compute the duration of the source without the rests at the end.
+ Segment::iterator last = source->end();
+ for (--last ; last != source->begin(); --last) {
+ if (!(*last)->isa(Note::EventRestType)) {
+ break;
+ }
+ duration = (*last)->getAbsoluteTime() - origin;
+ }
+ }
+
RG_DEBUG << "PasteEventsCommand::isPossible: paste time is " << pasteTime << ", origin is " << origin << ", duration is " << duration << endl;
+ if (pasteTime + duration > destination->getEndTime()) {
+ return false;
+ }
+
+ if (m_pasteType == OpenAndPaste &&
+ destination->begin() != destination->end()) {
+ timeT lastEnd = destination->getEndTime();
+ // Ignore the rests at the end of the destination segment.
+ Segment::iterator last = destination->end();
+ for (--last ; last != destination->begin(); --last) {
+ if (!(*last)->isa(Note::EventRestType)) {
+ break;
+ }
+ lastEnd = (*last)->getAbsoluteTime();
+ }
+
+ if (lastEnd + duration > destination->getEndTime()) {
+ return false;
+ }
+ }
+
+ if (m_pasteType != Restricted) {
+ return true;
+ }
+
SegmentNotationHelper helper(getSegment());
return helper.removeRests(pasteTime, duration, true);
}
@@ -169,12 +202,13 @@ PasteEventsCommand::modifySegment()
return ;
Segment *source = m_clipboard->getSingleSegment();
+ Segment *destination(&getSegment());
- timeT pasteTime = getStartTime();
+ timeT destEndTime = destination->getEndTime();
+ timeT pasteTime = std::max(getStartTime(), destination->getStartTime());
timeT origin = source->getStartTime();
timeT duration = source->getEndTime() - origin;
- Segment *destination(&getSegment());
SegmentNotationHelper helper(*destination);
RG_DEBUG << "PasteEventsCommand::modifySegment() : paste type = "
@@ -201,10 +235,15 @@ PasteEventsCommand::modifySegment()
// we do the actual paste after this switch statement
// (except where individual cases do the work and return)
- case Restricted:
- if (!helper.removeRests(pasteTime, duration))
- return ;
- break;
+ case Restricted: {
+ // removeRests() changes the duration destructively but the
+ // variable "duration" is used by normalizeRests()
+ timeT d = duration;
+ if (!helper.removeRests(pasteTime, d)) {
+ return;
+ }
+ break;
+ }
case Simple:
destination->erase(destination->findTime(pasteTime),
@@ -212,38 +251,59 @@ PasteEventsCommand::modifySegment()
break;
case OpenAndPaste: {
- std::vector<Event *> copies;
+ timeT endTime = pasteTime + duration;
+ std::vector<Event *> copies, toErase;
for (Segment::iterator i = destination->findTime(pasteTime);
- i != destination->end(); ++i) {
+ i != destination->end(); ++i) {
Event *e = (*i)->copyMoving(duration);
+ timeT myTime =
+ e->getAbsoluteTime() + e->getGreaterDuration() + duration;
+
+ toErase.push_back(*i);
+
+ if (e->isa(Note::EventRestType)) {
+ if (myTime > destEndTime) {
+ continue;
+ }
+ }
if (e->has(BEAMED_GROUP_ID)) {
e->set
<Int>(BEAMED_GROUP_ID, groupIdMap[e->get
<Int>(BEAMED_GROUP_ID)]);
}
+ if (myTime > endTime) {
+ endTime = myTime;
+ }
copies.push_back(e);
}
- destination->erase(destination->findTime(pasteTime),
- destination->end());
+ for (size_t i = 0; i < toErase.size(); ++i) {
+ destination->eraseSingle(toErase[i]);
+ }
for (size_t i = 0; i < copies.size(); ++i) {
destination->insert(copies[i]);
m_pastedEvents.addEvent(copies[i]);
}
+ endTime = std::min(destEndTime, destination->getBarEndForTime(endTime));
+ duration = endTime - pasteTime;
break;
}
case NoteOverlay:
for (Segment::iterator i = source->begin(); i != source->end(); ++i) {
- if ((*i)->isa(Note::EventRestType))
+ if ((*i)->isa(Note::EventRestType)) {
continue;
+ }
+
Event *e = (*i)->copyMoving(pasteTime - origin);
+
if (e->has(BEAMED_GROUP_ID)) {
e->set<Int>(BEAMED_GROUP_ID,
groupIdMap[e->get<Int>(BEAMED_GROUP_ID)]);
}
+
if ((*i)->isa(Note::EventType)) {
// e is model event: we retain ownership of it
Segment::iterator i = helper.insertNote(e);
@@ -260,9 +320,9 @@ PasteEventsCommand::modifySegment()
case MatrixOverlay:
for (Segment::iterator i = source->begin(); i != source->end(); ++i) {
-
- if ((*i)->isa(Note::EventRestType))
+ if ((*i)->isa(Note::EventRestType)) {
continue;
+ }
Event *e = (*i)->copyMoving(pasteTime - origin);
@@ -283,12 +343,12 @@ PasteEventsCommand::modifySegment()
m_pastedEvents.addEvent(e);
}
-// destination->normalizeRests(pasteTime, pasteTime + duration);
-
- // We ran the normalizeRests() calls like this as far back as I can go
- // in history, and since normalizeRests() has been implicated in a
- // string of recent paste bugs, we're going with the historical version:
- destination->normalizeRests(source->getStartTime(), source->getEndTime());
+ timeT endTime = pasteTime + duration;
+ if (endTime > destEndTime) {
+ endTime = destEndTime;
+ }
+
+ destination->normalizeRests(pasteTime, endTime);
return ;
}
@@ -306,13 +366,7 @@ PasteEventsCommand::modifySegment()
m_pastedEvents.addEvent(e);
}
-// destination->normalizeRests(pasteTime, pasteTime + duration);
-
-
- // We ran the normalizeRests() calls like this as far back as I can go
- // in history, and since normalizeRests() has been implicated in a
- // string of recent paste bugs, we're going with the historical version:
- destination->normalizeRests(source->getStartTime(), source->getEndTime());
+ destination->normalizeRests(pasteTime, pasteTime + duration);
}
EventSelection
diff --git a/src/commands/edit/PasteEventsCommand.h b/src/commands/edit/PasteEventsCommand.h
index 19eb7c2..60b8ef9 100644
--- a/src/commands/edit/PasteEventsCommand.h
+++ b/src/commands/edit/PasteEventsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/PasteSegmentsCommand.cpp b/src/commands/edit/PasteSegmentsCommand.cpp
index e351307..25ac17a 100644
--- a/src/commands/edit/PasteSegmentsCommand.cpp
+++ b/src/commands/edit/PasteSegmentsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/PasteSegmentsCommand.h b/src/commands/edit/PasteSegmentsCommand.h
index caf9237..60c5904 100644
--- a/src/commands/edit/PasteSegmentsCommand.h
+++ b/src/commands/edit/PasteSegmentsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/PlaceControllersCommand.cpp b/src/commands/edit/PlaceControllersCommand.cpp
index ccac8d5..d28eab9 100644
--- a/src/commands/edit/PlaceControllersCommand.cpp
+++ b/src/commands/edit/PlaceControllersCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/PlaceControllersCommand.h b/src/commands/edit/PlaceControllersCommand.h
index dfe3a04..14e3a8b 100644
--- a/src/commands/edit/PlaceControllersCommand.h
+++ b/src/commands/edit/PlaceControllersCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/RemoveMarkerCommand.cpp b/src/commands/edit/RemoveMarkerCommand.cpp
index 980fc8d..cf3df2b 100644
--- a/src/commands/edit/RemoveMarkerCommand.cpp
+++ b/src/commands/edit/RemoveMarkerCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/RemoveMarkerCommand.h b/src/commands/edit/RemoveMarkerCommand.h
index 34b958d..c79439c 100644
--- a/src/commands/edit/RemoveMarkerCommand.h
+++ b/src/commands/edit/RemoveMarkerCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/RescaleCommand.cpp b/src/commands/edit/RescaleCommand.cpp
index 41a5779..f55ec1e 100644
--- a/src/commands/edit/RescaleCommand.cpp
+++ b/src/commands/edit/RescaleCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/RescaleCommand.h b/src/commands/edit/RescaleCommand.h
index d37b480..146163f 100644
--- a/src/commands/edit/RescaleCommand.h
+++ b/src/commands/edit/RescaleCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/RetrogradeCommand.cpp b/src/commands/edit/RetrogradeCommand.cpp
index 45116f3..9a042cd 100644
--- a/src/commands/edit/RetrogradeCommand.cpp
+++ b/src/commands/edit/RetrogradeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/RetrogradeCommand.h b/src/commands/edit/RetrogradeCommand.h
index f16018c..5c48a14 100644
--- a/src/commands/edit/RetrogradeCommand.h
+++ b/src/commands/edit/RetrogradeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/RetrogradeInvertCommand.cpp b/src/commands/edit/RetrogradeInvertCommand.cpp
index 02db6f8..6446472 100644
--- a/src/commands/edit/RetrogradeInvertCommand.cpp
+++ b/src/commands/edit/RetrogradeInvertCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/RetrogradeInvertCommand.h b/src/commands/edit/RetrogradeInvertCommand.h
index 4d37fd1..781cdb9 100644
--- a/src/commands/edit/RetrogradeInvertCommand.h
+++ b/src/commands/edit/RetrogradeInvertCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SelectAddEvenNotesCommand.cpp b/src/commands/edit/SelectAddEvenNotesCommand.cpp
index 26e6884..3afb33f 100644
--- a/src/commands/edit/SelectAddEvenNotesCommand.cpp
+++ b/src/commands/edit/SelectAddEvenNotesCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SelectAddEvenNotesCommand.h b/src/commands/edit/SelectAddEvenNotesCommand.h
index 80d3573..7340886 100644
--- a/src/commands/edit/SelectAddEvenNotesCommand.h
+++ b/src/commands/edit/SelectAddEvenNotesCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SelectionPropertyCommand.cpp b/src/commands/edit/SelectionPropertyCommand.cpp
index cb10e57..db535f3 100644
--- a/src/commands/edit/SelectionPropertyCommand.cpp
+++ b/src/commands/edit/SelectionPropertyCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SelectionPropertyCommand.h b/src/commands/edit/SelectionPropertyCommand.h
index cf3ea84..9920860 100644
--- a/src/commands/edit/SelectionPropertyCommand.h
+++ b/src/commands/edit/SelectionPropertyCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SetLyricsCommand.cpp b/src/commands/edit/SetLyricsCommand.cpp
index 96e1504..3862b98 100644
--- a/src/commands/edit/SetLyricsCommand.cpp
+++ b/src/commands/edit/SetLyricsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SetLyricsCommand.h b/src/commands/edit/SetLyricsCommand.h
index caec79f..ba640aa 100644
--- a/src/commands/edit/SetLyricsCommand.h
+++ b/src/commands/edit/SetLyricsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SetNoteTypeCommand.cpp b/src/commands/edit/SetNoteTypeCommand.cpp
index e75583f..3f2911d 100644
--- a/src/commands/edit/SetNoteTypeCommand.cpp
+++ b/src/commands/edit/SetNoteTypeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SetNoteTypeCommand.h b/src/commands/edit/SetNoteTypeCommand.h
index ed1d8f1..cf26fcc 100644
--- a/src/commands/edit/SetNoteTypeCommand.h
+++ b/src/commands/edit/SetNoteTypeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SetTriggerCommand.cpp b/src/commands/edit/SetTriggerCommand.cpp
index fd624e4..ef7a55c 100644
--- a/src/commands/edit/SetTriggerCommand.cpp
+++ b/src/commands/edit/SetTriggerCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/SetTriggerCommand.h b/src/commands/edit/SetTriggerCommand.h
index 1a44888..893df7d 100644
--- a/src/commands/edit/SetTriggerCommand.h
+++ b/src/commands/edit/SetTriggerCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/TransposeCommand.cpp b/src/commands/edit/TransposeCommand.cpp
index 653d187..76aa9c3 100644
--- a/src/commands/edit/TransposeCommand.cpp
+++ b/src/commands/edit/TransposeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/edit/TransposeCommand.h b/src/commands/edit/TransposeCommand.h
index 07267eb..de3e491 100644
--- a/src/commands/edit/TransposeCommand.h
+++ b/src/commands/edit/TransposeCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/matrix/MatrixEraseCommand.cpp b/src/commands/matrix/MatrixEraseCommand.cpp
index 3fe9cba..0b30644 100644
--- a/src/commands/matrix/MatrixEraseCommand.cpp
+++ b/src/commands/matrix/MatrixEraseCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/matrix/MatrixEraseCommand.h b/src/commands/matrix/MatrixEraseCommand.h
index 2604c5d..a6bcf22 100644
--- a/src/commands/matrix/MatrixEraseCommand.h
+++ b/src/commands/matrix/MatrixEraseCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/matrix/MatrixInsertionCommand.cpp b/src/commands/matrix/MatrixInsertionCommand.cpp
index 482bf27..2fab86f 100644
--- a/src/commands/matrix/MatrixInsertionCommand.cpp
+++ b/src/commands/matrix/MatrixInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/matrix/MatrixInsertionCommand.h b/src/commands/matrix/MatrixInsertionCommand.h
index 09d9f57..6b180c9 100644
--- a/src/commands/matrix/MatrixInsertionCommand.h
+++ b/src/commands/matrix/MatrixInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/matrix/MatrixModifyCommand.cpp b/src/commands/matrix/MatrixModifyCommand.cpp
index 65601bf..97616b6 100644
--- a/src/commands/matrix/MatrixModifyCommand.cpp
+++ b/src/commands/matrix/MatrixModifyCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/matrix/MatrixModifyCommand.h b/src/commands/matrix/MatrixModifyCommand.h
index 59eacef..de3c490 100644
--- a/src/commands/matrix/MatrixModifyCommand.h
+++ b/src/commands/matrix/MatrixModifyCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/matrix/MatrixPercussionInsertionCommand.cpp b/src/commands/matrix/MatrixPercussionInsertionCommand.cpp
index 19ea73e..be33210 100644
--- a/src/commands/matrix/MatrixPercussionInsertionCommand.cpp
+++ b/src/commands/matrix/MatrixPercussionInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/matrix/MatrixPercussionInsertionCommand.h b/src/commands/matrix/MatrixPercussionInsertionCommand.h
index 6535c7b..0ce96df 100644
--- a/src/commands/matrix/MatrixPercussionInsertionCommand.h
+++ b/src/commands/matrix/MatrixPercussionInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp
index fd8b4b9..9b77301 100644
--- a/src/commands/notation/AddFingeringMarkCommand.cpp
+++ b/src/commands/notation/AddFingeringMarkCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AddFingeringMarkCommand.h b/src/commands/notation/AddFingeringMarkCommand.h
index 64e4819..e71851b 100644
--- a/src/commands/notation/AddFingeringMarkCommand.h
+++ b/src/commands/notation/AddFingeringMarkCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AddIndicationCommand.cpp b/src/commands/notation/AddIndicationCommand.cpp
index 7736942..7a6449f 100644
--- a/src/commands/notation/AddIndicationCommand.cpp
+++ b/src/commands/notation/AddIndicationCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -24,6 +24,7 @@
#include "base/Segment.h"
#include "base/SegmentNotationHelper.h"
#include "base/Selection.h"
+#include "base/BaseProperties.h"
#include "document/BasicCommand.h"
#include "document/CommandRegistry.h"
#include "gui/editors/notation/NotationProperties.h"
@@ -196,9 +197,29 @@ void
AddIndicationCommand::modifySegment()
{
SegmentNotationHelper helper(getSegment());
+ Segment::iterator i, j;
+ int actualSubordering = Indication::EventSubOrdering;
+
+ helper.segment().getTimeSlice(getStartTime(), i, j);
+ for (Segment::iterator k = i; k != j; ++k) {
+ if ((*k)->has(BaseProperties::IS_GRACE_NOTE)) {
+ // If a grace note is inserted before an indication, the
+ // subordering is minor than Indication::EventSubOrdering,
+ // therefore we have to decrement the subordering to insert
+ // the new indication before the grace note.
+ if ((*k)->getSubOrdering() <= actualSubordering) {
+ actualSubordering = (*k)->getSubOrdering() - 1;
+ }
+ }
+ }
Indication indication(m_indicationType, m_indicationDuration);
- Event *e = indication.getAsEvent(m_indicationStart);
+ Event *e;
+
+ e = new Event(Indication::EventType, m_indicationStart, m_indicationDuration,
+ actualSubordering);
+ e->set<String>(Indication::IndicationTypePropertyName, m_indicationType);
+ e->set<Int>("indicationduration", m_indicationDuration);
helper.segment().insert(e);
m_lastInsertedEvent = e;
diff --git a/src/commands/notation/AddIndicationCommand.h b/src/commands/notation/AddIndicationCommand.h
index f217291..feaa5ee 100644
--- a/src/commands/notation/AddIndicationCommand.h
+++ b/src/commands/notation/AddIndicationCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AddMarkCommand.cpp b/src/commands/notation/AddMarkCommand.cpp
index 8024590..ab9c89f 100644
--- a/src/commands/notation/AddMarkCommand.cpp
+++ b/src/commands/notation/AddMarkCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AddMarkCommand.h b/src/commands/notation/AddMarkCommand.h
index a28d504..d226365 100644
--- a/src/commands/notation/AddMarkCommand.h
+++ b/src/commands/notation/AddMarkCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AddSlashesCommand.cpp b/src/commands/notation/AddSlashesCommand.cpp
index 86a14c7..bd90938 100644
--- a/src/commands/notation/AddSlashesCommand.cpp
+++ b/src/commands/notation/AddSlashesCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AddSlashesCommand.h b/src/commands/notation/AddSlashesCommand.h
index 191aa02..8179eee 100644
--- a/src/commands/notation/AddSlashesCommand.h
+++ b/src/commands/notation/AddSlashesCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AddTextMarkCommand.cpp b/src/commands/notation/AddTextMarkCommand.cpp
index b4d1712..83e34ed 100644
--- a/src/commands/notation/AddTextMarkCommand.cpp
+++ b/src/commands/notation/AddTextMarkCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AddTextMarkCommand.h b/src/commands/notation/AddTextMarkCommand.h
index 6427265..5bca1ba 100644
--- a/src/commands/notation/AddTextMarkCommand.h
+++ b/src/commands/notation/AddTextMarkCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AutoBeamCommand.cpp b/src/commands/notation/AutoBeamCommand.cpp
index e913c8b..93c4214 100644
--- a/src/commands/notation/AutoBeamCommand.cpp
+++ b/src/commands/notation/AutoBeamCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/AutoBeamCommand.h b/src/commands/notation/AutoBeamCommand.h
index 72ade54..f5317fd 100644
--- a/src/commands/notation/AutoBeamCommand.h
+++ b/src/commands/notation/AutoBeamCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/BeamCommand.cpp b/src/commands/notation/BeamCommand.cpp
index 8644d56..04de989 100644
--- a/src/commands/notation/BeamCommand.cpp
+++ b/src/commands/notation/BeamCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/BeamCommand.h b/src/commands/notation/BeamCommand.h
index b53a6c7..d14e3c0 100644
--- a/src/commands/notation/BeamCommand.h
+++ b/src/commands/notation/BeamCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/BreakCommand.cpp b/src/commands/notation/BreakCommand.cpp
index 59316a4..135d7c7 100644
--- a/src/commands/notation/BreakCommand.cpp
+++ b/src/commands/notation/BreakCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/BreakCommand.h b/src/commands/notation/BreakCommand.h
index 6dc1506..676c20c 100644
--- a/src/commands/notation/BreakCommand.h
+++ b/src/commands/notation/BreakCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ChangeSlurPositionCommand.cpp b/src/commands/notation/ChangeSlurPositionCommand.cpp
index 35f4bc9..883e780 100644
--- a/src/commands/notation/ChangeSlurPositionCommand.cpp
+++ b/src/commands/notation/ChangeSlurPositionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ChangeSlurPositionCommand.h b/src/commands/notation/ChangeSlurPositionCommand.h
index 2fc2261..441d5e2 100644
--- a/src/commands/notation/ChangeSlurPositionCommand.h
+++ b/src/commands/notation/ChangeSlurPositionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ChangeStemsCommand.cpp b/src/commands/notation/ChangeStemsCommand.cpp
index 6974555..38e88ea 100644
--- a/src/commands/notation/ChangeStemsCommand.cpp
+++ b/src/commands/notation/ChangeStemsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ChangeStemsCommand.h b/src/commands/notation/ChangeStemsCommand.h
index b0156f1..1244155 100644
--- a/src/commands/notation/ChangeStemsCommand.h
+++ b/src/commands/notation/ChangeStemsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ChangeStyleCommand.cpp b/src/commands/notation/ChangeStyleCommand.cpp
index bbe7145..2109629 100644
--- a/src/commands/notation/ChangeStyleCommand.cpp
+++ b/src/commands/notation/ChangeStyleCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ChangeStyleCommand.h b/src/commands/notation/ChangeStyleCommand.h
index 54fbed7..b45ec78 100644
--- a/src/commands/notation/ChangeStyleCommand.h
+++ b/src/commands/notation/ChangeStyleCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ChangeTiePositionCommand.cpp b/src/commands/notation/ChangeTiePositionCommand.cpp
index a3c4b0e..ae9c545 100644
--- a/src/commands/notation/ChangeTiePositionCommand.cpp
+++ b/src/commands/notation/ChangeTiePositionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ChangeTiePositionCommand.h b/src/commands/notation/ChangeTiePositionCommand.h
index f11f2e3..c0b6d50 100644
--- a/src/commands/notation/ChangeTiePositionCommand.h
+++ b/src/commands/notation/ChangeTiePositionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp
index f659eca..cf39839 100644
--- a/src/commands/notation/ClefInsertionCommand.cpp
+++ b/src/commands/notation/ClefInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ClefInsertionCommand.h b/src/commands/notation/ClefInsertionCommand.h
index dddd900..508f85d 100644
--- a/src/commands/notation/ClefInsertionCommand.h
+++ b/src/commands/notation/ClefInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/CollapseRestsCommand.cpp b/src/commands/notation/CollapseRestsCommand.cpp
index 17b4ca5..66c2693 100644
--- a/src/commands/notation/CollapseRestsCommand.cpp
+++ b/src/commands/notation/CollapseRestsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/CollapseRestsCommand.h b/src/commands/notation/CollapseRestsCommand.h
index 059e120..2653c34 100644
--- a/src/commands/notation/CollapseRestsCommand.h
+++ b/src/commands/notation/CollapseRestsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/CycleSlashesCommand.cpp b/src/commands/notation/CycleSlashesCommand.cpp
index a245412..bfb7127 100644
--- a/src/commands/notation/CycleSlashesCommand.cpp
+++ b/src/commands/notation/CycleSlashesCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/CycleSlashesCommand.h b/src/commands/notation/CycleSlashesCommand.h
index 48bafa8..bf342da 100644
--- a/src/commands/notation/CycleSlashesCommand.h
+++ b/src/commands/notation/CycleSlashesCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/DeCounterpointCommand.cpp b/src/commands/notation/DeCounterpointCommand.cpp
index d10bf58..c71315d 100644
--- a/src/commands/notation/DeCounterpointCommand.cpp
+++ b/src/commands/notation/DeCounterpointCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/DeCounterpointCommand.h b/src/commands/notation/DeCounterpointCommand.h
index f3e3010..5296d57 100644
--- a/src/commands/notation/DeCounterpointCommand.h
+++ b/src/commands/notation/DeCounterpointCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/EraseEventCommand.cpp b/src/commands/notation/EraseEventCommand.cpp
index a66a3e6..4c8ee77 100644
--- a/src/commands/notation/EraseEventCommand.cpp
+++ b/src/commands/notation/EraseEventCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,6 +23,7 @@
#include "base/NotationTypes.h"
#include "base/Segment.h"
#include "base/SegmentNotationHelper.h"
+#include "base/BaseProperties.h"
#include "document/BasicCommand.h"
#include "gui/editors/notation/NotationProperties.h"
@@ -76,8 +77,61 @@ EraseEventCommand::modifySegment()
m_relayoutEndTime = helper.segment().getEndTime();
} else if (m_event->isa(Indication::EventType)) {
-
try {
+
+ int graceToAdjust = 0;
+ int minGraceSubOrdering = 0;
+ int maxDeltaGraceSubOrdering = 0;
+ int indicationSubOrdering = m_event->getSubOrdering();
+ int minSubOrdering = 0;
+
+ // Adjust suborderings of any existing grace notes if necessary.
+
+ Segment::iterator i, j;
+ getSegment().getTimeSlice(m_event->getAbsoluteTime(), i, j);
+ for (Segment::iterator k = i; k != j; ++k) {
+ if ((*k)->has(BaseProperties::IS_GRACE_NOTE)) {
+ if ((*k)->getSubOrdering() < indicationSubOrdering) {
+ ++graceToAdjust;
+ if ((*k)->getSubOrdering() < minGraceSubOrdering) {
+ minGraceSubOrdering = (*k)->getSubOrdering();
+ maxDeltaGraceSubOrdering =
+ indicationSubOrdering - minGraceSubOrdering;
+ }
+ }
+ } else if (m_event != (*k) &&
+ (*k)->getSubOrdering() < minSubOrdering) {
+ minSubOrdering = (*k)->getSubOrdering();
+ }
+ }
+
+ if (graceToAdjust > 0 &&
+ minGraceSubOrdering < indicationSubOrdering &&
+ minSubOrdering > indicationSubOrdering &&
+ maxDeltaGraceSubOrdering >= graceToAdjust) {
+ int incr = minSubOrdering - indicationSubOrdering;
+ std::vector<Event *> toInsert, toErase;
+ for (Segment::iterator k = i; k != j; ++k) {
+ if ((*k)->has(BaseProperties::IS_GRACE_NOTE) &&
+ (*k)->getSubOrdering() < indicationSubOrdering) {
+ // Subordering of the grace note is incremented to
+ // avoid (a rare) relevant decrement of that value.
+ toErase.push_back(*k);
+ toInsert.push_back
+ (new Event(**k,
+ (*k)->getAbsoluteTime(),
+ (*k)->getDuration(),
+ (*k)->getSubOrdering() + incr,
+ (*k)->getNotationAbsoluteTime(),
+ (*k)->getNotationDuration()));
+ }
+ }
+ for (std::vector<Event *>::iterator k = toErase.begin();
+ k != toErase.end(); ++k) getSegment().eraseSingle(*k);
+ for (std::vector<Event *>::iterator k = toInsert.begin();
+ k != toInsert.end(); ++k) getSegment().insert(*k);
+ }
+
Indication indication(*m_event);
if (indication.isOttavaType()) {
diff --git a/src/commands/notation/EraseEventCommand.h b/src/commands/notation/EraseEventCommand.h
index c29e2be..6464c40 100644
--- a/src/commands/notation/EraseEventCommand.h
+++ b/src/commands/notation/EraseEventCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/FixNotationQuantizeCommand.cpp b/src/commands/notation/FixNotationQuantizeCommand.cpp
index bd891f1..aee3903 100644
--- a/src/commands/notation/FixNotationQuantizeCommand.cpp
+++ b/src/commands/notation/FixNotationQuantizeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -54,15 +54,18 @@ FixNotationQuantizeCommand::modifySegment()
for (i = m_selection->getSegmentEvents().begin();
i != m_selection->getSegmentEvents().end(); ++i) {
- timeT ut = (*i)->getAbsoluteTime();
timeT ud = (*i)->getDuration();
timeT qt = (*i)->getNotationAbsoluteTime();
timeT qd = (*i)->getNotationDuration();
+ timeT maxDur = segment.getBarEndForTime(qt) - qt;
+ timeT dur = (ud == qd ? Note::getNearestNote(qd).getDuration() : qd);
- if ((ut != qt) || (ud != qd)) {
- toErase.push_back(*i);
- toInsert.push_back(new Event(**i, qt, qd));
+ if (dur > maxDur) {
+ dur = maxDur;
}
+
+ toErase.push_back(*i);
+ toInsert.push_back(new Event(**i, qt, dur));
}
for (size_t j = 0; j < toErase.size(); ++j) {
@@ -75,6 +78,8 @@ FixNotationQuantizeCommand::modifySegment()
segment.insert(toInsert[j]);
}
+ segment.normalizeRests(segment.getStartTime(), segment.getEndTime());
+
/*!!!
Segment *segment(&m_selection->getSegment());
m_quantizer->fixQuantizedValues
diff --git a/src/commands/notation/FixNotationQuantizeCommand.h b/src/commands/notation/FixNotationQuantizeCommand.h
index b57a50f..c8d6077 100644
--- a/src/commands/notation/FixNotationQuantizeCommand.h
+++ b/src/commands/notation/FixNotationQuantizeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/GraceCommand.cpp b/src/commands/notation/GraceCommand.cpp
index a79efc5..3a6958d 100644
--- a/src/commands/notation/GraceCommand.cpp
+++ b/src/commands/notation/GraceCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/GraceCommand.h b/src/commands/notation/GraceCommand.h
index 0690cdb..1443a07 100644
--- a/src/commands/notation/GraceCommand.h
+++ b/src/commands/notation/GraceCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/GuitarChordInsertionCommand.cpp b/src/commands/notation/GuitarChordInsertionCommand.cpp
index 5e42f06..0bb456b 100644
--- a/src/commands/notation/GuitarChordInsertionCommand.cpp
+++ b/src/commands/notation/GuitarChordInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/GuitarChordInsertionCommand.h b/src/commands/notation/GuitarChordInsertionCommand.h
index 5864441..1e54dd8 100644
--- a/src/commands/notation/GuitarChordInsertionCommand.h
+++ b/src/commands/notation/GuitarChordInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/IncrementDisplacementsCommand.cpp b/src/commands/notation/IncrementDisplacementsCommand.cpp
index de7cf94..25d206e 100644
--- a/src/commands/notation/IncrementDisplacementsCommand.cpp
+++ b/src/commands/notation/IncrementDisplacementsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/IncrementDisplacementsCommand.h b/src/commands/notation/IncrementDisplacementsCommand.h
index 6964183..8d4234f 100644
--- a/src/commands/notation/IncrementDisplacementsCommand.h
+++ b/src/commands/notation/IncrementDisplacementsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/InterpretCommand.cpp b/src/commands/notation/InterpretCommand.cpp
index 2a0c59b..e33b07e 100644
--- a/src/commands/notation/InterpretCommand.cpp
+++ b/src/commands/notation/InterpretCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -561,10 +561,16 @@ InterpretCommand::articulate()
timeT duration = e->getNotationDuration();
// don't mess with the duration of a tied note
- bool tiedForward = false;
- if (e->get
- <Bool>(TIED_FORWARD, tiedForward) && tiedForward) {
+ bool tied = false;
+ e->get<Bool>(TIED_FORWARD, tied);
+ if (!tied)
+ e->get<Bool>(TIED_BACKWARD, tied);
+ if (tied) {
durationChange = 0;
+ NOTATION_DEBUG << "InterpretCommand::modifySegment: Tied "
+ << (e->has(TIED_FORWARD) ? "for" : "back")
+ << "ward note encountered, durationChange is "
+ << durationChange << endl;
}
timeT newDuration = duration + duration * durationChange / 100;
@@ -574,7 +580,11 @@ InterpretCommand::articulate()
// the performance duration of a note (that's perhaps been
// articulated wrongly) based on the notation duration:
- if (e->getDuration() != newDuration) {
+ timeT eventDuration = e->getDuration();
+
+ if (eventDuration != newDuration) {
+
+ NOTATION_DEBUG << "InterpretCommand::modifySegment: durationChange is " << durationChange << "; e->getDuration() is " << eventDuration << "; newDuration is " << newDuration << endl;
if (toErase.find(e) == toErase.end()) {
diff --git a/src/commands/notation/InterpretCommand.h b/src/commands/notation/InterpretCommand.h
index 08608e0..aa1161d 100644
--- a/src/commands/notation/InterpretCommand.h
+++ b/src/commands/notation/InterpretCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/KeyInsertionCommand.cpp b/src/commands/notation/KeyInsertionCommand.cpp
index 3a7d347..68d0641 100644
--- a/src/commands/notation/KeyInsertionCommand.cpp
+++ b/src/commands/notation/KeyInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/KeyInsertionCommand.h b/src/commands/notation/KeyInsertionCommand.h
index 5ef97cf..5b17885 100644
--- a/src/commands/notation/KeyInsertionCommand.h
+++ b/src/commands/notation/KeyInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
index aad8b2f..1a2716a 100644
--- a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
+++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.h b/src/commands/notation/MakeAccidentalsCautionaryCommand.h
index 4d64cfa..d31f72b 100644
--- a/src/commands/notation/MakeAccidentalsCautionaryCommand.h
+++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MakeChordCommand.cpp b/src/commands/notation/MakeChordCommand.cpp
index a1fa1ae..dbf93aa 100644
--- a/src/commands/notation/MakeChordCommand.cpp
+++ b/src/commands/notation/MakeChordCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MakeChordCommand.h b/src/commands/notation/MakeChordCommand.h
index 3b3e942..4895135 100644
--- a/src/commands/notation/MakeChordCommand.h
+++ b/src/commands/notation/MakeChordCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MakeNotesViableCommand.cpp b/src/commands/notation/MakeNotesViableCommand.cpp
index e46fd8e..b89d650 100644
--- a/src/commands/notation/MakeNotesViableCommand.cpp
+++ b/src/commands/notation/MakeNotesViableCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MakeNotesViableCommand.h b/src/commands/notation/MakeNotesViableCommand.h
index f3f4f70..b586530 100644
--- a/src/commands/notation/MakeNotesViableCommand.h
+++ b/src/commands/notation/MakeNotesViableCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MakeRegionViableCommand.cpp b/src/commands/notation/MakeRegionViableCommand.cpp
index e9ea29a..911deab 100644
--- a/src/commands/notation/MakeRegionViableCommand.cpp
+++ b/src/commands/notation/MakeRegionViableCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MakeRegionViableCommand.h b/src/commands/notation/MakeRegionViableCommand.h
index 5920c61..140edc5 100644
--- a/src/commands/notation/MakeRegionViableCommand.h
+++ b/src/commands/notation/MakeRegionViableCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MarkParallelCommand.cpp b/src/commands/notation/MarkParallelCommand.cpp
new file mode 100644
index 0000000..207df36
--- /dev/null
+++ b/src/commands/notation/MarkParallelCommand.cpp
@@ -0,0 +1,45 @@
+/*
+ * MarkParallelCommand.cpp
+ *
+ * Created on: Mar 25, 2015
+ * Author: lambache
+ */
+
+
+#include "MarkParallelCommand.h"
+
+#include "base/Selection.h"
+#include "document/BasicSelectionCommand.h"
+#include "document/CommandRegistry.h"
+#include "gui/editors/notation/NotationProperties.h"
+#include "base/BaseProperties.h"
+#include "document/BasicCommand.h"
+
+#include <QString>
+
+
+namespace Rosegarden
+{
+
+using namespace BaseProperties;
+
+MarkParallelCommand::MarkParallelCommand(Segment &segment, timeT begin, timeT end) : BasicCommand(tr("Mark Parallel"), segment, begin, end)
+{
+ // nothing
+}
+
+//void
+//MarkParallelCommand::registerCommand(CommandRegistry *r)
+//{
+// r->registerCommand
+// ("mark_parallel",
+// new SelectionCommandBuilder<MarkParallelCommand>());
+//}
+
+void
+MarkParallelCommand::modifySegment()
+{
+}
+
+}
+
diff --git a/src/commands/notation/MarkParallelCommand.h b/src/commands/notation/MarkParallelCommand.h
new file mode 100644
index 0000000..055cf30
--- /dev/null
+++ b/src/commands/notation/MarkParallelCommand.h
@@ -0,0 +1,46 @@
+/*
+ * MarkParallelCommand.h
+ *
+ * Created on: Mar 25, 2015
+ * Author: lambache
+ */
+
+#ifndef SRC_COMMANDS_NOTATION_MARKPARALLELCOMMAND_H_
+#define SRC_COMMANDS_NOTATION_MARKPARALLELCOMMAND_H_
+
+#include "document/BasicSelectionCommand.h"
+#include "base/BaseProperties.h"
+
+#include <QString>
+#include <QCoreApplication>
+
+
+namespace Rosegarden
+{
+
+using namespace BaseProperties;
+
+
+class EventSelection;
+class CommandRegistry;
+
+class MarkParallelCommand : public BasicCommand
+{
+ Q_DECLARE_TR_FUNCTIONS(Rosegarden::MarkParallelCommand)
+
+public:
+ MarkParallelCommand(Segment &segment, timeT begin, timeT end);
+
+ static QString getGlobalName() { return tr("Mark Parallel"); }
+
+ //static void registerCommand(CommandRegistry *r);
+
+protected:
+ virtual void modifySegment();
+ EventSelection *m_selection;// only used on 1st execute (cf bruteForceRedo)
+};
+
+
+}
+
+#endif /* SRC_COMMANDS_NOTATION_MARKPARALLELCOMMAND_H_ */
diff --git a/src/commands/notation/MultiKeyInsertionCommand.cpp b/src/commands/notation/MultiKeyInsertionCommand.cpp
index 08db420..9db86cf 100644
--- a/src/commands/notation/MultiKeyInsertionCommand.cpp
+++ b/src/commands/notation/MultiKeyInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/MultiKeyInsertionCommand.h b/src/commands/notation/MultiKeyInsertionCommand.h
index 43c9b93..12809fb 100644
--- a/src/commands/notation/MultiKeyInsertionCommand.h
+++ b/src/commands/notation/MultiKeyInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/NormalizeRestsCommand.cpp b/src/commands/notation/NormalizeRestsCommand.cpp
index 7c2a754..542246a 100644
--- a/src/commands/notation/NormalizeRestsCommand.cpp
+++ b/src/commands/notation/NormalizeRestsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/NormalizeRestsCommand.h b/src/commands/notation/NormalizeRestsCommand.h
index 0aded29..a0a8d11 100644
--- a/src/commands/notation/NormalizeRestsCommand.h
+++ b/src/commands/notation/NormalizeRestsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/NoteInsertionCommand.cpp b/src/commands/notation/NoteInsertionCommand.cpp
index e6697f7..aafdb39 100644
--- a/src/commands/notation/NoteInsertionCommand.cpp
+++ b/src/commands/notation/NoteInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -137,6 +137,16 @@ NoteInsertionCommand::modifySegment()
} else {
+ segment.getTimeSlice(m_insertionTime, i, j);
+ for (Segment::iterator k = i; k != j; ++k) {
+ if ((*k)->isa(Indication::EventType) &&
+ (*k)->getSubOrdering() <= actualSubordering) {
+ // Decrement subordering to put the grace note
+ // before the indication (i.e. slur), otherwise
+ // it becomes part of the indication.
+ actualSubordering = (*k)->getSubOrdering() - 1;
+ }
+ }
e = new Event
(Note::EventType,
m_insertionTime,
diff --git a/src/commands/notation/NoteInsertionCommand.h b/src/commands/notation/NoteInsertionCommand.h
index b779353..b85e33e 100644
--- a/src/commands/notation/NoteInsertionCommand.h
+++ b/src/commands/notation/NoteInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RemoveFingeringMarksCommand.cpp b/src/commands/notation/RemoveFingeringMarksCommand.cpp
index d79e53b..e37ce87 100644
--- a/src/commands/notation/RemoveFingeringMarksCommand.cpp
+++ b/src/commands/notation/RemoveFingeringMarksCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RemoveFingeringMarksCommand.h b/src/commands/notation/RemoveFingeringMarksCommand.h
index 2f6f143..b708823 100644
--- a/src/commands/notation/RemoveFingeringMarksCommand.h
+++ b/src/commands/notation/RemoveFingeringMarksCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RemoveMarksCommand.cpp b/src/commands/notation/RemoveMarksCommand.cpp
index 261223f..aa4457b 100644
--- a/src/commands/notation/RemoveMarksCommand.cpp
+++ b/src/commands/notation/RemoveMarksCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RemoveMarksCommand.h b/src/commands/notation/RemoveMarksCommand.h
index 974ae22..62794bd 100644
--- a/src/commands/notation/RemoveMarksCommand.h
+++ b/src/commands/notation/RemoveMarksCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.cpp b/src/commands/notation/RemoveNotationQuantizeCommand.cpp
index 109a477..6d1d772 100644
--- a/src/commands/notation/RemoveNotationQuantizeCommand.cpp
+++ b/src/commands/notation/RemoveNotationQuantizeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -54,6 +54,14 @@ RemoveNotationQuantizeCommand::modifySegment()
(*i)->getAbsoluteTime(),
(*i)->getDuration()));
+ if ((*i)->isa(Note::EventType) &&
+ (*i)->getNotationDuration() > (*i)->getDuration()) {
+ toInsert.push_back(new Event(Note::EventRestType,
+ (*i)->getAbsoluteTime() + (*i)->getDuration(),
+ (*i)->getNotationDuration() - (*i)->getDuration(),
+ Note::EventRestSubOrdering));
+ }
+
toErase.push_back(*i);
}
diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.h b/src/commands/notation/RemoveNotationQuantizeCommand.h
index d4858e5..8b2a05c 100644
--- a/src/commands/notation/RemoveNotationQuantizeCommand.h
+++ b/src/commands/notation/RemoveNotationQuantizeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ResetDisplacementsCommand.cpp b/src/commands/notation/ResetDisplacementsCommand.cpp
index 9332cae..663f61d 100644
--- a/src/commands/notation/ResetDisplacementsCommand.cpp
+++ b/src/commands/notation/ResetDisplacementsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/ResetDisplacementsCommand.h b/src/commands/notation/ResetDisplacementsCommand.h
index bd9e0c9..2331583 100644
--- a/src/commands/notation/ResetDisplacementsCommand.h
+++ b/src/commands/notation/ResetDisplacementsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RespellCommand.cpp b/src/commands/notation/RespellCommand.cpp
index b9f8124..fbe1dab 100644
--- a/src/commands/notation/RespellCommand.cpp
+++ b/src/commands/notation/RespellCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RespellCommand.h b/src/commands/notation/RespellCommand.h
index 01fd168..23f8e40 100644
--- a/src/commands/notation/RespellCommand.h
+++ b/src/commands/notation/RespellCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RestInsertionCommand.cpp b/src/commands/notation/RestInsertionCommand.cpp
index 7ee0662..db50902 100644
--- a/src/commands/notation/RestInsertionCommand.cpp
+++ b/src/commands/notation/RestInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RestInsertionCommand.h b/src/commands/notation/RestInsertionCommand.h
index 09ddfc9..c46b13c 100644
--- a/src/commands/notation/RestInsertionCommand.h
+++ b/src/commands/notation/RestInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RestoreSlursCommand.cpp b/src/commands/notation/RestoreSlursCommand.cpp
index 8a93024..7f80cf5 100644
--- a/src/commands/notation/RestoreSlursCommand.cpp
+++ b/src/commands/notation/RestoreSlursCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RestoreSlursCommand.h b/src/commands/notation/RestoreSlursCommand.h
index 8d35e2b..dcd51e9 100644
--- a/src/commands/notation/RestoreSlursCommand.h
+++ b/src/commands/notation/RestoreSlursCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RestoreStemsCommand.cpp b/src/commands/notation/RestoreStemsCommand.cpp
index 4d65ba3..b027b90 100644
--- a/src/commands/notation/RestoreStemsCommand.cpp
+++ b/src/commands/notation/RestoreStemsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RestoreStemsCommand.h b/src/commands/notation/RestoreStemsCommand.h
index aa4aac3..2d53a11 100644
--- a/src/commands/notation/RestoreStemsCommand.h
+++ b/src/commands/notation/RestoreStemsCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RestoreTiesCommand.cpp b/src/commands/notation/RestoreTiesCommand.cpp
index 68dd210..7f0113a 100644
--- a/src/commands/notation/RestoreTiesCommand.cpp
+++ b/src/commands/notation/RestoreTiesCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/RestoreTiesCommand.h b/src/commands/notation/RestoreTiesCommand.h
index 6e0c494..8f91307 100644
--- a/src/commands/notation/RestoreTiesCommand.h
+++ b/src/commands/notation/RestoreTiesCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/SetVisibilityCommand.cpp b/src/commands/notation/SetVisibilityCommand.cpp
index 80f75c9..552ea04 100644
--- a/src/commands/notation/SetVisibilityCommand.cpp
+++ b/src/commands/notation/SetVisibilityCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/SetVisibilityCommand.h b/src/commands/notation/SetVisibilityCommand.h
index 615b258..8dfa318 100644
--- a/src/commands/notation/SetVisibilityCommand.h
+++ b/src/commands/notation/SetVisibilityCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/SustainInsertionCommand.cpp b/src/commands/notation/SustainInsertionCommand.cpp
index 5ccb6d4..ef7a185 100644
--- a/src/commands/notation/SustainInsertionCommand.cpp
+++ b/src/commands/notation/SustainInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/SustainInsertionCommand.h b/src/commands/notation/SustainInsertionCommand.h
index 11d3278..496436c 100644
--- a/src/commands/notation/SustainInsertionCommand.h
+++ b/src/commands/notation/SustainInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/SymbolInsertionCommand.cpp b/src/commands/notation/SymbolInsertionCommand.cpp
index 6b187d5..d5ff33e 100644
--- a/src/commands/notation/SymbolInsertionCommand.cpp
+++ b/src/commands/notation/SymbolInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/SymbolInsertionCommand.h b/src/commands/notation/SymbolInsertionCommand.h
index 93bbe3b..6e0905c 100644
--- a/src/commands/notation/SymbolInsertionCommand.h
+++ b/src/commands/notation/SymbolInsertionCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/TextChangeCommand.cpp b/src/commands/notation/TextChangeCommand.cpp
index 9476151..48f9966 100644
--- a/src/commands/notation/TextChangeCommand.cpp
+++ b/src/commands/notation/TextChangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/TextChangeCommand.h b/src/commands/notation/TextChangeCommand.h
index df97ba8..b4461da 100644
--- a/src/commands/notation/TextChangeCommand.h
+++ b/src/commands/notation/TextChangeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/TextInsertionCommand.cpp b/src/commands/notation/TextInsertionCommand.cpp
index fec502b..76e0db2 100644
--- a/src/commands/notation/TextInsertionCommand.cpp
+++ b/src/commands/notation/TextInsertionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/TextInsertionCommand.h b/src/commands/notation/TextInsertionCommand.h
index 4450c8b..e395787 100644
--- a/src/commands/notation/TextInsertionCommand.h
+++ b/src/commands/notation/TextInsertionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/TieNotesCommand.cpp b/src/commands/notation/TieNotesCommand.cpp
index c49cf65..8edd78d 100644
--- a/src/commands/notation/TieNotesCommand.cpp
+++ b/src/commands/notation/TieNotesCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/TieNotesCommand.h b/src/commands/notation/TieNotesCommand.h
index fc474c4..06a5376 100644
--- a/src/commands/notation/TieNotesCommand.h
+++ b/src/commands/notation/TieNotesCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/TupletCommand.cpp b/src/commands/notation/TupletCommand.cpp
index 1a5828e..449ab25 100644
--- a/src/commands/notation/TupletCommand.cpp
+++ b/src/commands/notation/TupletCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/TupletCommand.h b/src/commands/notation/TupletCommand.h
index 7fde965..74f1840 100644
--- a/src/commands/notation/TupletCommand.h
+++ b/src/commands/notation/TupletCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/UnGraceCommand.cpp b/src/commands/notation/UnGraceCommand.cpp
index 93c7e92..7d36631 100644
--- a/src/commands/notation/UnGraceCommand.cpp
+++ b/src/commands/notation/UnGraceCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/UnGraceCommand.h b/src/commands/notation/UnGraceCommand.h
index 18d7b3f..0f5f3b0 100644
--- a/src/commands/notation/UnGraceCommand.h
+++ b/src/commands/notation/UnGraceCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/UnTupletCommand.cpp b/src/commands/notation/UnTupletCommand.cpp
index cacf757..a3bf554 100644
--- a/src/commands/notation/UnTupletCommand.cpp
+++ b/src/commands/notation/UnTupletCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/UnTupletCommand.h b/src/commands/notation/UnTupletCommand.h
index 44f83e0..9e2849d 100644
--- a/src/commands/notation/UnTupletCommand.h
+++ b/src/commands/notation/UnTupletCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/UntieNotesCommand.cpp b/src/commands/notation/UntieNotesCommand.cpp
index 215571c..a0756bf 100644
--- a/src/commands/notation/UntieNotesCommand.cpp
+++ b/src/commands/notation/UntieNotesCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/notation/UntieNotesCommand.h b/src/commands/notation/UntieNotesCommand.h
index 2bf2514..37b5a46 100644
--- a/src/commands/notation/UntieNotesCommand.h
+++ b/src/commands/notation/UntieNotesCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddLayerCommand.cpp b/src/commands/segment/AddLayerCommand.cpp
index 4b53591..6e8baa7 100644
--- a/src/commands/segment/AddLayerCommand.cpp
+++ b/src/commands/segment/AddLayerCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddLayerCommand.h b/src/commands/segment/AddLayerCommand.h
index 730c2b2..1f2c529 100644
--- a/src/commands/segment/AddLayerCommand.h
+++ b/src/commands/segment/AddLayerCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTempoChangeCommand.cpp b/src/commands/segment/AddTempoChangeCommand.cpp
index 7c3d74d..af760c9 100644
--- a/src/commands/segment/AddTempoChangeCommand.cpp
+++ b/src/commands/segment/AddTempoChangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTempoChangeCommand.h b/src/commands/segment/AddTempoChangeCommand.h
index 159c88c..329972e 100644
--- a/src/commands/segment/AddTempoChangeCommand.h
+++ b/src/commands/segment/AddTempoChangeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTimeSignatureAndNormalizeCommand.cpp b/src/commands/segment/AddTimeSignatureAndNormalizeCommand.cpp
index 6b567dc..c13d74c 100644
--- a/src/commands/segment/AddTimeSignatureAndNormalizeCommand.cpp
+++ b/src/commands/segment/AddTimeSignatureAndNormalizeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTimeSignatureAndNormalizeCommand.h b/src/commands/segment/AddTimeSignatureAndNormalizeCommand.h
index 0e945f0..6dbbcb2 100644
--- a/src/commands/segment/AddTimeSignatureAndNormalizeCommand.h
+++ b/src/commands/segment/AddTimeSignatureAndNormalizeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTimeSignatureCommand.cpp b/src/commands/segment/AddTimeSignatureCommand.cpp
index 6afb68b..7631c02 100644
--- a/src/commands/segment/AddTimeSignatureCommand.cpp
+++ b/src/commands/segment/AddTimeSignatureCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTimeSignatureCommand.h b/src/commands/segment/AddTimeSignatureCommand.h
index 4f01ff4..c0ef368 100644
--- a/src/commands/segment/AddTimeSignatureCommand.h
+++ b/src/commands/segment/AddTimeSignatureCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTracksCommand.cpp b/src/commands/segment/AddTracksCommand.cpp
index acaa895..d0a1856 100644
--- a/src/commands/segment/AddTracksCommand.cpp
+++ b/src/commands/segment/AddTracksCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTracksCommand.h b/src/commands/segment/AddTracksCommand.h
index cff639b..b5b2b40 100644
--- a/src/commands/segment/AddTracksCommand.h
+++ b/src/commands/segment/AddTracksCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTriggerSegmentCommand.cpp b/src/commands/segment/AddTriggerSegmentCommand.cpp
index 7654f67..d68da60 100644
--- a/src/commands/segment/AddTriggerSegmentCommand.cpp
+++ b/src/commands/segment/AddTriggerSegmentCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AddTriggerSegmentCommand.h b/src/commands/segment/AddTriggerSegmentCommand.h
index 0e3c220..be23e92 100644
--- a/src/commands/segment/AddTriggerSegmentCommand.h
+++ b/src/commands/segment/AddTriggerSegmentCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentAutoSplitCommand.cpp b/src/commands/segment/AudioSegmentAutoSplitCommand.cpp
index 735fc28..8632547 100644
--- a/src/commands/segment/AudioSegmentAutoSplitCommand.cpp
+++ b/src/commands/segment/AudioSegmentAutoSplitCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentAutoSplitCommand.h b/src/commands/segment/AudioSegmentAutoSplitCommand.h
index 1e603ff..7560127 100644
--- a/src/commands/segment/AudioSegmentAutoSplitCommand.h
+++ b/src/commands/segment/AudioSegmentAutoSplitCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentDistributeCommand.cpp b/src/commands/segment/AudioSegmentDistributeCommand.cpp
index 30e9b69..c821a88 100644
--- a/src/commands/segment/AudioSegmentDistributeCommand.cpp
+++ b/src/commands/segment/AudioSegmentDistributeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentDistributeCommand.h b/src/commands/segment/AudioSegmentDistributeCommand.h
index bc389d0..b12de3f 100644
--- a/src/commands/segment/AudioSegmentDistributeCommand.h
+++ b/src/commands/segment/AudioSegmentDistributeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentInsertCommand.cpp b/src/commands/segment/AudioSegmentInsertCommand.cpp
index 060bb96..2e1be25 100644
--- a/src/commands/segment/AudioSegmentInsertCommand.cpp
+++ b/src/commands/segment/AudioSegmentInsertCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentInsertCommand.h b/src/commands/segment/AudioSegmentInsertCommand.h
index 6aa8fa4..0466825 100644
--- a/src/commands/segment/AudioSegmentInsertCommand.h
+++ b/src/commands/segment/AudioSegmentInsertCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentRescaleCommand.cpp b/src/commands/segment/AudioSegmentRescaleCommand.cpp
index 809fdbf..6dddc03 100644
--- a/src/commands/segment/AudioSegmentRescaleCommand.cpp
+++ b/src/commands/segment/AudioSegmentRescaleCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentRescaleCommand.h b/src/commands/segment/AudioSegmentRescaleCommand.h
index c29922f..98e4eba 100644
--- a/src/commands/segment/AudioSegmentRescaleCommand.h
+++ b/src/commands/segment/AudioSegmentRescaleCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentResizeFromStartCommand.cpp b/src/commands/segment/AudioSegmentResizeFromStartCommand.cpp
index af036ef..69dc4e8 100644
--- a/src/commands/segment/AudioSegmentResizeFromStartCommand.cpp
+++ b/src/commands/segment/AudioSegmentResizeFromStartCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentResizeFromStartCommand.h b/src/commands/segment/AudioSegmentResizeFromStartCommand.h
index 7455272..9159cd5 100644
--- a/src/commands/segment/AudioSegmentResizeFromStartCommand.h
+++ b/src/commands/segment/AudioSegmentResizeFromStartCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentSplitCommand.cpp b/src/commands/segment/AudioSegmentSplitCommand.cpp
index e54f545..a04621f 100644
--- a/src/commands/segment/AudioSegmentSplitCommand.cpp
+++ b/src/commands/segment/AudioSegmentSplitCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/AudioSegmentSplitCommand.h b/src/commands/segment/AudioSegmentSplitCommand.h
index 7fb87bf..51dbf36 100644
--- a/src/commands/segment/AudioSegmentSplitCommand.h
+++ b/src/commands/segment/AudioSegmentSplitCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/ChangeCompositionLengthCommand.cpp b/src/commands/segment/ChangeCompositionLengthCommand.cpp
index 86d1027..104dfa9 100644
--- a/src/commands/segment/ChangeCompositionLengthCommand.cpp
+++ b/src/commands/segment/ChangeCompositionLengthCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/ChangeCompositionLengthCommand.h b/src/commands/segment/ChangeCompositionLengthCommand.h
index b740dcc..450fe96 100644
--- a/src/commands/segment/ChangeCompositionLengthCommand.h
+++ b/src/commands/segment/ChangeCompositionLengthCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/CreateTempoMapFromSegmentCommand.cpp b/src/commands/segment/CreateTempoMapFromSegmentCommand.cpp
index 6240653..6779033 100644
--- a/src/commands/segment/CreateTempoMapFromSegmentCommand.cpp
+++ b/src/commands/segment/CreateTempoMapFromSegmentCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/CreateTempoMapFromSegmentCommand.h b/src/commands/segment/CreateTempoMapFromSegmentCommand.h
index 9a4c696..56ba841 100644
--- a/src/commands/segment/CreateTempoMapFromSegmentCommand.h
+++ b/src/commands/segment/CreateTempoMapFromSegmentCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/CutRangeCommand.cpp b/src/commands/segment/CutRangeCommand.cpp
index 57cb35b..83080af 100644
--- a/src/commands/segment/CutRangeCommand.cpp
+++ b/src/commands/segment/CutRangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/CutRangeCommand.h b/src/commands/segment/CutRangeCommand.h
index 98c706d..572d901 100644
--- a/src/commands/segment/CutRangeCommand.h
+++ b/src/commands/segment/CutRangeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/DeleteRangeCommand.cpp b/src/commands/segment/DeleteRangeCommand.cpp
index 45337e7..f782441 100644
--- a/src/commands/segment/DeleteRangeCommand.cpp
+++ b/src/commands/segment/DeleteRangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/DeleteRangeCommand.h b/src/commands/segment/DeleteRangeCommand.h
index bed6c23..9138c9a 100644
--- a/src/commands/segment/DeleteRangeCommand.h
+++ b/src/commands/segment/DeleteRangeCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/DeleteTracksCommand.cpp b/src/commands/segment/DeleteTracksCommand.cpp
index b7cd61e..c57ee75 100644
--- a/src/commands/segment/DeleteTracksCommand.cpp
+++ b/src/commands/segment/DeleteTracksCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -57,7 +57,7 @@ void DeleteTracksCommand::execute()
m_oldTracks.clear();
// Alias for readability
- const segmentcontainer &segments = m_composition->getSegments();
+ const SegmentMultiSet &segments = m_composition->getSegments();
// Remove the tracks and their segments.
@@ -77,12 +77,12 @@ void DeleteTracksCommand::execute()
// SegmentEraseCommand.
// For each segment in the composition.
- for (segmentcontainer::const_iterator j = segments.begin();
+ for (SegmentMultiSet::const_iterator j = segments.begin();
j != segments.end();
/* incremented inside */) {
// Increment before use. Otherwise detachSegment() will
// invalidate our iterator.
- segmentcontainer::const_iterator k = j++;
+ SegmentMultiSet::const_iterator k = j++;
// If this segment is on the track we are deleting
if ((*k)->getTrack() == trackId) {
diff --git a/src/commands/segment/DeleteTracksCommand.h b/src/commands/segment/DeleteTracksCommand.h
index 86659fe..afcde8d 100644
--- a/src/commands/segment/DeleteTracksCommand.h
+++ b/src/commands/segment/DeleteTracksCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/DeleteTriggerSegmentCommand.cpp b/src/commands/segment/DeleteTriggerSegmentCommand.cpp
index 8ba55e6..7401eb5 100644
--- a/src/commands/segment/DeleteTriggerSegmentCommand.cpp
+++ b/src/commands/segment/DeleteTriggerSegmentCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/DeleteTriggerSegmentCommand.h b/src/commands/segment/DeleteTriggerSegmentCommand.h
index 6d6b63c..fae0439 100644
--- a/src/commands/segment/DeleteTriggerSegmentCommand.h
+++ b/src/commands/segment/DeleteTriggerSegmentCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/EraseSegmentsStartingInRangeCommand.cpp b/src/commands/segment/EraseSegmentsStartingInRangeCommand.cpp
index b96caa1..aa1922b 100644
--- a/src/commands/segment/EraseSegmentsStartingInRangeCommand.cpp
+++ b/src/commands/segment/EraseSegmentsStartingInRangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/EraseSegmentsStartingInRangeCommand.h b/src/commands/segment/EraseSegmentsStartingInRangeCommand.h
index c9e729d..295421c 100644
--- a/src/commands/segment/EraseSegmentsStartingInRangeCommand.h
+++ b/src/commands/segment/EraseSegmentsStartingInRangeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/EraseTempiInRangeCommand.cpp b/src/commands/segment/EraseTempiInRangeCommand.cpp
index 84e52fa..2c2c9ba 100644
--- a/src/commands/segment/EraseTempiInRangeCommand.cpp
+++ b/src/commands/segment/EraseTempiInRangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/EraseTempiInRangeCommand.h b/src/commands/segment/EraseTempiInRangeCommand.h
index bfe18f7..f521471 100644
--- a/src/commands/segment/EraseTempiInRangeCommand.h
+++ b/src/commands/segment/EraseTempiInRangeCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/ExpandFigurationCommand.cpp b/src/commands/segment/ExpandFigurationCommand.cpp
index 6396f35..d0acd3f 100644
--- a/src/commands/segment/ExpandFigurationCommand.cpp
+++ b/src/commands/segment/ExpandFigurationCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/ExpandFigurationCommand.h b/src/commands/segment/ExpandFigurationCommand.h
index ea53638..7ac9fd3 100644
--- a/src/commands/segment/ExpandFigurationCommand.h
+++ b/src/commands/segment/ExpandFigurationCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -19,6 +19,7 @@
#define RG_EXPANDFIGURATIONCOMMAND_H
#include "base/Segment.h"
+#include "base/Selection.h"
#include "document/Command.h"
#include <QCoreApplication>
#include <QString>
@@ -26,7 +27,6 @@
namespace Rosegarden
{
class Composition;
- class SegmentSelection;
typedef long timeT;
@@ -52,7 +52,7 @@ private:
Composition *m_composition;
// The new segments we make.
- segmentcontainer m_newSegments;
+ SegmentMultiSet m_newSegments;
bool m_executed;
};
diff --git a/src/commands/segment/FitToBeatsCommand.cpp b/src/commands/segment/FitToBeatsCommand.cpp
index 119b41c..5727b02 100644
--- a/src/commands/segment/FitToBeatsCommand.cpp
+++ b/src/commands/segment/FitToBeatsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -60,16 +60,16 @@ FitToBeatsCommand::changeAllTempi(TempoMap newTempi)
// @remarks Change from using oldSegments to newSegments
// @author Tom Breton (Tehom)
void
-FitToBeatsCommand::changeSegments(segmentcontainer oldSegments,
- segmentcontainer newSegments)
+FitToBeatsCommand::changeSegments(SegmentMultiSet oldSegments,
+ SegmentMultiSet newSegments)
{
- for (segmentcontainer::iterator i = oldSegments.begin();
+ for (SegmentMultiSet::iterator i = oldSegments.begin();
i != oldSegments.end();
++i) {
m_composition->detachSegment(*i);
}
- for (segmentcontainer::iterator i = newSegments.begin();
+ for (SegmentMultiSet::iterator i = newSegments.begin();
i != newSegments.end();
++i) {
m_composition->addSegment(*i);
@@ -172,7 +172,7 @@ FitToBeatsCommand::initialise(Segment *s)
// Copy all the events to scratchComposition. The copies will be
// at the same realtime but not the same timeT. Even events in
// the groove segment get copied.
- segmentcontainer &origSegments = m_composition->getSegments();
+ SegmentMultiSet &origSegments = m_composition->getSegments();
for (Composition::iterator i = origSegments.begin();
i != origSegments.end();
++i) {
@@ -235,7 +235,7 @@ FitToBeatsCommand::initialise(Segment *s)
// Detach the segments before scratchComposition goes out of
// scope. m_newSegments contains exactly the segments that need
// to be detached.
- for (segmentcontainer::iterator i = m_newSegments.begin();
+ for (SegmentMultiSet::iterator i = m_newSegments.begin();
i != m_newSegments.end();
++i) {
scratchComposition.weakDetachSegment(*i);
diff --git a/src/commands/segment/FitToBeatsCommand.h b/src/commands/segment/FitToBeatsCommand.h
index 872c68b..613b8b6 100644
--- a/src/commands/segment/FitToBeatsCommand.h
+++ b/src/commands/segment/FitToBeatsCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -50,14 +50,12 @@ public:
private:
typedef std::map<timeT, tempoT> TempoMap;
typedef std::pair<timeT, tempoT> TempoChange;
- typedef std::multiset<Segment*, Segment::SegmentCmp>
- segmentcontainer;
typedef std::vector<RealTime> vecRealTime;
void initialise(Segment *s);
void changeAllTempi(TempoMap newTempi);
- void changeSegments(segmentcontainer oldSegments,
- segmentcontainer newSegments);
+ void changeSegments(SegmentMultiSet oldSegments,
+ SegmentMultiSet newSegments);
static int
getBeatRealTimes(Segment *s, vecRealTime &beatRealTimes);
@@ -68,8 +66,8 @@ private:
Composition *m_composition;
- segmentcontainer m_oldSegments;
- segmentcontainer m_newSegments;
+ SegmentMultiSet m_oldSegments;
+ SegmentMultiSet m_newSegments;
// !!! These don't need to be maps but they do need to associate
// with a timeT. Could just use a TempoChange.
TempoMap m_oldTempi;
diff --git a/src/commands/segment/InsertRangeCommand.cpp b/src/commands/segment/InsertRangeCommand.cpp
index 4d8872e..af2a84c 100644
--- a/src/commands/segment/InsertRangeCommand.cpp
+++ b/src/commands/segment/InsertRangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/InsertRangeCommand.h b/src/commands/segment/InsertRangeCommand.h
index 4efba62..ef96aad 100644
--- a/src/commands/segment/InsertRangeCommand.h
+++ b/src/commands/segment/InsertRangeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/ModifyDefaultTempoCommand.cpp b/src/commands/segment/ModifyDefaultTempoCommand.cpp
index 2ae5941..7ef57bb 100644
--- a/src/commands/segment/ModifyDefaultTempoCommand.cpp
+++ b/src/commands/segment/ModifyDefaultTempoCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/ModifyDefaultTempoCommand.h b/src/commands/segment/ModifyDefaultTempoCommand.h
index b4ed771..c1f40c5 100644
--- a/src/commands/segment/ModifyDefaultTempoCommand.h
+++ b/src/commands/segment/ModifyDefaultTempoCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/MoveTracksCommand.cpp b/src/commands/segment/MoveTracksCommand.cpp
index 6197fba..904fba1 100644
--- a/src/commands/segment/MoveTracksCommand.cpp
+++ b/src/commands/segment/MoveTracksCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/MoveTracksCommand.h b/src/commands/segment/MoveTracksCommand.h
index da9480b..bc4126c 100644
--- a/src/commands/segment/MoveTracksCommand.h
+++ b/src/commands/segment/MoveTracksCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/OpenOrCloseRangeCommand.cpp b/src/commands/segment/OpenOrCloseRangeCommand.cpp
index 894ef4a..bd5ae2c 100644
--- a/src/commands/segment/OpenOrCloseRangeCommand.cpp
+++ b/src/commands/segment/OpenOrCloseRangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/OpenOrCloseRangeCommand.h b/src/commands/segment/OpenOrCloseRangeCommand.h
index 1f7b126..8d5de06 100644
--- a/src/commands/segment/OpenOrCloseRangeCommand.h
+++ b/src/commands/segment/OpenOrCloseRangeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/PasteConductorDataCommand.cpp b/src/commands/segment/PasteConductorDataCommand.cpp
index 2fbd0cf..c308910 100644
--- a/src/commands/segment/PasteConductorDataCommand.cpp
+++ b/src/commands/segment/PasteConductorDataCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/PasteConductorDataCommand.h b/src/commands/segment/PasteConductorDataCommand.h
index 337597a..d55bad8 100644
--- a/src/commands/segment/PasteConductorDataCommand.h
+++ b/src/commands/segment/PasteConductorDataCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/PasteRangeCommand.cpp b/src/commands/segment/PasteRangeCommand.cpp
index e2e1efd..a28a65c 100644
--- a/src/commands/segment/PasteRangeCommand.cpp
+++ b/src/commands/segment/PasteRangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/PasteRangeCommand.h b/src/commands/segment/PasteRangeCommand.h
index c44c28b..8b59aca 100644
--- a/src/commands/segment/PasteRangeCommand.h
+++ b/src/commands/segment/PasteRangeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/PasteToTriggerSegmentCommand.cpp b/src/commands/segment/PasteToTriggerSegmentCommand.cpp
index e171618..4cd1cec 100644
--- a/src/commands/segment/PasteToTriggerSegmentCommand.cpp
+++ b/src/commands/segment/PasteToTriggerSegmentCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/PasteToTriggerSegmentCommand.h b/src/commands/segment/PasteToTriggerSegmentCommand.h
index 37505f2..3bdef23 100644
--- a/src/commands/segment/PasteToTriggerSegmentCommand.h
+++ b/src/commands/segment/PasteToTriggerSegmentCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/RemoveTempoChangeCommand.cpp b/src/commands/segment/RemoveTempoChangeCommand.cpp
index 001ae68..26be5df 100644
--- a/src/commands/segment/RemoveTempoChangeCommand.cpp
+++ b/src/commands/segment/RemoveTempoChangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/RemoveTempoChangeCommand.h b/src/commands/segment/RemoveTempoChangeCommand.h
index 778a495..666a955 100644
--- a/src/commands/segment/RemoveTempoChangeCommand.h
+++ b/src/commands/segment/RemoveTempoChangeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/RemoveTimeSignatureCommand.cpp b/src/commands/segment/RemoveTimeSignatureCommand.cpp
index d27bae8..7d39a00 100644
--- a/src/commands/segment/RemoveTimeSignatureCommand.cpp
+++ b/src/commands/segment/RemoveTimeSignatureCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/RemoveTimeSignatureCommand.h b/src/commands/segment/RemoveTimeSignatureCommand.h
index ad39745..6228b8e 100644
--- a/src/commands/segment/RemoveTimeSignatureCommand.h
+++ b/src/commands/segment/RemoveTimeSignatureCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/RenameTrackCommand.cpp b/src/commands/segment/RenameTrackCommand.cpp
index 053283c..3272063 100644
--- a/src/commands/segment/RenameTrackCommand.cpp
+++ b/src/commands/segment/RenameTrackCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/RenameTrackCommand.h b/src/commands/segment/RenameTrackCommand.h
index b6bfe23..b2cc10e 100644
--- a/src/commands/segment/RenameTrackCommand.h
+++ b/src/commands/segment/RenameTrackCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentAutoSplitCommand.cpp b/src/commands/segment/SegmentAutoSplitCommand.cpp
index 83f815b..19e20de 100644
--- a/src/commands/segment/SegmentAutoSplitCommand.cpp
+++ b/src/commands/segment/SegmentAutoSplitCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentAutoSplitCommand.h b/src/commands/segment/SegmentAutoSplitCommand.h
index 8d5dd1b..adbc524 100644
--- a/src/commands/segment/SegmentAutoSplitCommand.h
+++ b/src/commands/segment/SegmentAutoSplitCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.cpp b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
index 357c076..48bce49 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.cpp
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.h b/src/commands/segment/SegmentChangeQuantizationCommand.h
index 86ed325..ed0e9e3 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.h
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentChangeTransposeCommand.cpp b/src/commands/segment/SegmentChangeTransposeCommand.cpp
index af309b4..9e67c70 100644
--- a/src/commands/segment/SegmentChangeTransposeCommand.cpp
+++ b/src/commands/segment/SegmentChangeTransposeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentChangeTransposeCommand.h b/src/commands/segment/SegmentChangeTransposeCommand.h
index 233fc7b..f500028 100644
--- a/src/commands/segment/SegmentChangeTransposeCommand.h
+++ b/src/commands/segment/SegmentChangeTransposeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentColourCommand.cpp b/src/commands/segment/SegmentColourCommand.cpp
index d1b4d6e..2365738 100644
--- a/src/commands/segment/SegmentColourCommand.cpp
+++ b/src/commands/segment/SegmentColourCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentColourCommand.h b/src/commands/segment/SegmentColourCommand.h
index 4c56794..b291bf2 100644
--- a/src/commands/segment/SegmentColourCommand.h
+++ b/src/commands/segment/SegmentColourCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -20,19 +20,16 @@
#define RG_SEGMENTCOLOURCOMMAND_H
#include "base/Segment.h"
+#include "base/Selection.h"
#include "document/Command.h"
#include <QString>
#include <vector>
#include <QCoreApplication>
-
-
namespace Rosegarden
{
-class SegmentSelection;
-
class SegmentColourCommand : public NamedCommand
{
diff --git a/src/commands/segment/SegmentColourMapCommand.cpp b/src/commands/segment/SegmentColourMapCommand.cpp
index 8c59c5f..fe66427 100644
--- a/src/commands/segment/SegmentColourMapCommand.cpp
+++ b/src/commands/segment/SegmentColourMapCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentColourMapCommand.h b/src/commands/segment/SegmentColourMapCommand.h
index f6df95d..19b2cd7 100644
--- a/src/commands/segment/SegmentColourMapCommand.h
+++ b/src/commands/segment/SegmentColourMapCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentCommand.cpp b/src/commands/segment/SegmentCommand.cpp
index acbecce..568765f 100644
--- a/src/commands/segment/SegmentCommand.cpp
+++ b/src/commands/segment/SegmentCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentCommand.h b/src/commands/segment/SegmentCommand.h
index f8b0c94..237e9e1 100644
--- a/src/commands/segment/SegmentCommand.h
+++ b/src/commands/segment/SegmentCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentCommandRepeat.cpp b/src/commands/segment/SegmentCommandRepeat.cpp
index fb70142..f432d4a 100644
--- a/src/commands/segment/SegmentCommandRepeat.cpp
+++ b/src/commands/segment/SegmentCommandRepeat.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentCommandRepeat.h b/src/commands/segment/SegmentCommandRepeat.h
index b29b49f..7e8ea11 100644
--- a/src/commands/segment/SegmentCommandRepeat.h
+++ b/src/commands/segment/SegmentCommandRepeat.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentEraseCommand.cpp b/src/commands/segment/SegmentEraseCommand.cpp
index 8f2fa76..e3a0336 100644
--- a/src/commands/segment/SegmentEraseCommand.cpp
+++ b/src/commands/segment/SegmentEraseCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentEraseCommand.h b/src/commands/segment/SegmentEraseCommand.h
index 7704020..cfdd8f4 100644
--- a/src/commands/segment/SegmentEraseCommand.h
+++ b/src/commands/segment/SegmentEraseCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentInsertCommand.cpp b/src/commands/segment/SegmentInsertCommand.cpp
index db86f79..d767863 100644
--- a/src/commands/segment/SegmentInsertCommand.cpp
+++ b/src/commands/segment/SegmentInsertCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentInsertCommand.h b/src/commands/segment/SegmentInsertCommand.h
index 2f93f1c..79de229 100644
--- a/src/commands/segment/SegmentInsertCommand.h
+++ b/src/commands/segment/SegmentInsertCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentJoinCommand.cpp b/src/commands/segment/SegmentJoinCommand.cpp
index 364d0df..505322c 100644
--- a/src/commands/segment/SegmentJoinCommand.cpp
+++ b/src/commands/segment/SegmentJoinCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentJoinCommand.h b/src/commands/segment/SegmentJoinCommand.h
index cf345de..2e5dd07 100644
--- a/src/commands/segment/SegmentJoinCommand.h
+++ b/src/commands/segment/SegmentJoinCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -20,17 +20,15 @@
#define RG_SEGMENTJOINCOMMAND_H
#include "document/Command.h"
+#include "base/Selection.h"
#include <QString>
#include <vector>
#include <QCoreApplication>
-
-
namespace Rosegarden
{
-class SegmentSelection;
class Segment;
diff --git a/src/commands/segment/SegmentLabelCommand.cpp b/src/commands/segment/SegmentLabelCommand.cpp
index 02ce308..581b0fd 100644
--- a/src/commands/segment/SegmentLabelCommand.cpp
+++ b/src/commands/segment/SegmentLabelCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentLabelCommand.h b/src/commands/segment/SegmentLabelCommand.h
index 52dc883..35e7a51 100644
--- a/src/commands/segment/SegmentLabelCommand.h
+++ b/src/commands/segment/SegmentLabelCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -20,17 +20,15 @@
#define RG_SEGMENTLABELCOMMAND_H
#include "document/Command.h"
+#include "base/Selection.h"
#include <QString>
#include <vector>
#include <QCoreApplication>
-
-
namespace Rosegarden
{
-class SegmentSelection;
class Segment;
diff --git a/src/commands/segment/SegmentQuickCopyCommand.cpp b/src/commands/segment/SegmentQuickCopyCommand.cpp
index eca917c..9817050 100644
--- a/src/commands/segment/SegmentQuickCopyCommand.cpp
+++ b/src/commands/segment/SegmentQuickCopyCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentQuickCopyCommand.h b/src/commands/segment/SegmentQuickCopyCommand.h
index 0fa322d..4cc5b3b 100644
--- a/src/commands/segment/SegmentQuickCopyCommand.h
+++ b/src/commands/segment/SegmentQuickCopyCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentReconfigureCommand.cpp b/src/commands/segment/SegmentReconfigureCommand.cpp
index 4a84145..21839af 100644
--- a/src/commands/segment/SegmentReconfigureCommand.cpp
+++ b/src/commands/segment/SegmentReconfigureCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentReconfigureCommand.h b/src/commands/segment/SegmentReconfigureCommand.h
index 69be8f9..dfded51 100644
--- a/src/commands/segment/SegmentReconfigureCommand.h
+++ b/src/commands/segment/SegmentReconfigureCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentRecordCommand.cpp b/src/commands/segment/SegmentRecordCommand.cpp
index 6d9d957..8bdba57 100644
--- a/src/commands/segment/SegmentRecordCommand.cpp
+++ b/src/commands/segment/SegmentRecordCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentRecordCommand.h b/src/commands/segment/SegmentRecordCommand.h
index 273630d..ac77775 100644
--- a/src/commands/segment/SegmentRecordCommand.h
+++ b/src/commands/segment/SegmentRecordCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentRepeatToCopyCommand.cpp b/src/commands/segment/SegmentRepeatToCopyCommand.cpp
index 05fbdfc..2c45cf3 100644
--- a/src/commands/segment/SegmentRepeatToCopyCommand.cpp
+++ b/src/commands/segment/SegmentRepeatToCopyCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentRepeatToCopyCommand.h b/src/commands/segment/SegmentRepeatToCopyCommand.h
index 8d16bc9..3a072fd 100644
--- a/src/commands/segment/SegmentRepeatToCopyCommand.h
+++ b/src/commands/segment/SegmentRepeatToCopyCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentRescaleCommand.cpp b/src/commands/segment/SegmentRescaleCommand.cpp
index 3f58ad9..44d416e 100644
--- a/src/commands/segment/SegmentRescaleCommand.cpp
+++ b/src/commands/segment/SegmentRescaleCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentRescaleCommand.h b/src/commands/segment/SegmentRescaleCommand.h
index d1bbe1b..6511ec2 100644
--- a/src/commands/segment/SegmentRescaleCommand.h
+++ b/src/commands/segment/SegmentRescaleCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentResizeFromStartCommand.cpp b/src/commands/segment/SegmentResizeFromStartCommand.cpp
index 4acfb8b..09da575 100644
--- a/src/commands/segment/SegmentResizeFromStartCommand.cpp
+++ b/src/commands/segment/SegmentResizeFromStartCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentResizeFromStartCommand.h b/src/commands/segment/SegmentResizeFromStartCommand.h
index 7692fcc..94f152f 100644
--- a/src/commands/segment/SegmentResizeFromStartCommand.h
+++ b/src/commands/segment/SegmentResizeFromStartCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSingleRepeatToCopyCommand.cpp b/src/commands/segment/SegmentSingleRepeatToCopyCommand.cpp
index 6a6d0c2..67387d4 100644
--- a/src/commands/segment/SegmentSingleRepeatToCopyCommand.cpp
+++ b/src/commands/segment/SegmentSingleRepeatToCopyCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSingleRepeatToCopyCommand.h b/src/commands/segment/SegmentSingleRepeatToCopyCommand.h
index 4156f16..8a8b590 100644
--- a/src/commands/segment/SegmentSingleRepeatToCopyCommand.h
+++ b/src/commands/segment/SegmentSingleRepeatToCopyCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSplitByPitchCommand.cpp b/src/commands/segment/SegmentSplitByPitchCommand.cpp
index 690291c..d5d852f 100644
--- a/src/commands/segment/SegmentSplitByPitchCommand.cpp
+++ b/src/commands/segment/SegmentSplitByPitchCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSplitByPitchCommand.h b/src/commands/segment/SegmentSplitByPitchCommand.h
index 2f7c26a..8d39d01 100644
--- a/src/commands/segment/SegmentSplitByPitchCommand.h
+++ b/src/commands/segment/SegmentSplitByPitchCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp b/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp
index a9c22af..30f858f 100644
--- a/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp
+++ b/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSplitByRecordingSrcCommand.h b/src/commands/segment/SegmentSplitByRecordingSrcCommand.h
index ee7781e..d199941 100644
--- a/src/commands/segment/SegmentSplitByRecordingSrcCommand.h
+++ b/src/commands/segment/SegmentSplitByRecordingSrcCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSplitCommand.cpp b/src/commands/segment/SegmentSplitCommand.cpp
index d8df905..dab6beb 100644
--- a/src/commands/segment/SegmentSplitCommand.cpp
+++ b/src/commands/segment/SegmentSplitCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSplitCommand.h b/src/commands/segment/SegmentSplitCommand.h
index 56d4eac..f94cce7 100644
--- a/src/commands/segment/SegmentSplitCommand.h
+++ b/src/commands/segment/SegmentSplitCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSyncClefCommand.cpp b/src/commands/segment/SegmentSyncClefCommand.cpp
index b73e15c..abfb9b6 100644
--- a/src/commands/segment/SegmentSyncClefCommand.cpp
+++ b/src/commands/segment/SegmentSyncClefCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentSyncClefCommand.h b/src/commands/segment/SegmentSyncClefCommand.h
index edfc73a..15005ba 100644
--- a/src/commands/segment/SegmentSyncClefCommand.h
+++ b/src/commands/segment/SegmentSyncClefCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -22,6 +22,7 @@
#include "document/Command.h"
#include "base/Event.h"
#include "base/NotationTypes.h"
+#include "base/Selection.h"
#include "document/CommandHistory.h"
#include <QCoreApplication>
@@ -31,7 +32,6 @@ namespace Rosegarden
{
class Segment;
-class SegmentSelection;
class SegmentSyncClefCommand : public MacroCommand
diff --git a/src/commands/segment/SegmentSyncCommand.cpp b/src/commands/segment/SegmentSyncCommand.cpp
index 97af6aa..087d9d2 100644
--- a/src/commands/segment/SegmentSyncCommand.cpp
+++ b/src/commands/segment/SegmentSyncCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -52,10 +52,10 @@ SegmentSyncCommand::SegmentSyncCommand(std::vector<Segment *> segments, int newT
}
}
-SegmentSyncCommand::SegmentSyncCommand(segmentcontainer& segments, TrackId selectedTrack, int newTranspose, int lowRange, int highRange, const Clef& clef) :
+SegmentSyncCommand::SegmentSyncCommand(SegmentMultiSet& segments, TrackId selectedTrack, int newTranspose, int lowRange, int highRange, const Clef& clef) :
MacroCommand(tr("Sync segment parameters"))
{
- for (segmentcontainer::const_iterator si = segments.begin();
+ for (SegmentMultiSet::const_iterator si = segments.begin();
si != segments.end(); ++si) {
if ((*si)->getTrack() == selectedTrack) {
processSegment(**si, newTranspose, lowRange, highRange, clef);
diff --git a/src/commands/segment/SegmentSyncCommand.h b/src/commands/segment/SegmentSyncCommand.h
index 3f0db16..36828f3 100644
--- a/src/commands/segment/SegmentSyncCommand.h
+++ b/src/commands/segment/SegmentSyncCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,6 +23,7 @@
#include "base/Composition.h"
#include "base/Event.h"
#include "base/NotationTypes.h"
+#include "base/Selection.h"
#include "document/CommandHistory.h"
#include <QCoreApplication>
@@ -31,7 +32,6 @@ namespace Rosegarden
{
class Segment;
-class SegmentSelection;
class SegmentSyncCommand : public MacroCommand
@@ -48,7 +48,7 @@ public:
SegmentSyncCommand(std::vector<Segment *> segments,
int newTranspose, int lowRange, int highRange, const Clef& clef);
- SegmentSyncCommand(segmentcontainer& segments, TrackId track,
+ SegmentSyncCommand(SegmentMultiSet& segments, TrackId track,
int newTranspose, int lowRange, int highRange, const Clef& clef);
virtual ~SegmentSyncCommand();
diff --git a/src/commands/segment/SegmentTransposeCommand.cpp b/src/commands/segment/SegmentTransposeCommand.cpp
index 79593b9..2c3c170 100644
--- a/src/commands/segment/SegmentTransposeCommand.cpp
+++ b/src/commands/segment/SegmentTransposeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SegmentTransposeCommand.h b/src/commands/segment/SegmentTransposeCommand.h
index 7f6e5cb..0de7df0 100644
--- a/src/commands/segment/SegmentTransposeCommand.h
+++ b/src/commands/segment/SegmentTransposeCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -21,6 +21,7 @@
#include "document/Command.h"
#include "base/Event.h"
+#include "base/Selection.h"
#include "document/CommandHistory.h"
#include <QCoreApplication>
@@ -28,7 +29,6 @@ namespace Rosegarden
{
class Segment;
-class SegmentSelection;
class SegmentTransposeCommand : public MacroCommand
diff --git a/src/commands/segment/SetTriggerSegmentBasePitchCommand.cpp b/src/commands/segment/SetTriggerSegmentBasePitchCommand.cpp
index d01f65f..53ccd7c 100644
--- a/src/commands/segment/SetTriggerSegmentBasePitchCommand.cpp
+++ b/src/commands/segment/SetTriggerSegmentBasePitchCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SetTriggerSegmentBasePitchCommand.h b/src/commands/segment/SetTriggerSegmentBasePitchCommand.h
index 4fc9617..9a7674a 100644
--- a/src/commands/segment/SetTriggerSegmentBasePitchCommand.h
+++ b/src/commands/segment/SetTriggerSegmentBasePitchCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.cpp b/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.cpp
index 78b7684..36d80fc 100644
--- a/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.cpp
+++ b/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.h b/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.h
index 832a5c7..6fcd680 100644
--- a/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.h
+++ b/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.cpp b/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.cpp
index f461e05..838228e 100644
--- a/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.cpp
+++ b/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.h b/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.h
index b8b5de2..3b4a2c7 100644
--- a/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.h
+++ b/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.cpp b/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.cpp
index a505617..d7f4089 100644
--- a/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.cpp
+++ b/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.h b/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.h
index 2436b81..530660c 100644
--- a/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.h
+++ b/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/AddControlParameterCommand.cpp b/src/commands/studio/AddControlParameterCommand.cpp
index 85815c6..8a0587e 100644
--- a/src/commands/studio/AddControlParameterCommand.cpp
+++ b/src/commands/studio/AddControlParameterCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/AddControlParameterCommand.h b/src/commands/studio/AddControlParameterCommand.h
index eb4effb..d7910aa 100644
--- a/src/commands/studio/AddControlParameterCommand.h
+++ b/src/commands/studio/AddControlParameterCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/CreateOrDeleteDeviceCommand.cpp b/src/commands/studio/CreateOrDeleteDeviceCommand.cpp
index 915a873..2b6e4fe 100644
--- a/src/commands/studio/CreateOrDeleteDeviceCommand.cpp
+++ b/src/commands/studio/CreateOrDeleteDeviceCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -113,7 +113,7 @@ CreateOrDeleteDeviceCommand::execute()
RosegardenSequencer::getInstance()->removeDevice(m_deviceId);
- SEQMAN_DEBUG << "CreateDeviceCommand::unexecute - "
+ SEQMAN_DEBUG << "CreateDeviceCommand::execute - "
<< " removed device " << m_deviceId << endl;
m_studio->removeDevice(m_deviceId);
@@ -121,6 +121,11 @@ CreateOrDeleteDeviceCommand::execute()
m_deviceId = Device::NO_DEVICE;
m_deviceCreated = false;
}
+
+ // ??? Instead of this kludge, we should be calling a Studio::hasChanged()
+ // which would then notify all observers (e.g. MIPP) who, in turn,
+ // would update themselves.
+ RosegardenMainWindow::self()->uiUpdateKludge();
}
}
diff --git a/src/commands/studio/CreateOrDeleteDeviceCommand.h b/src/commands/studio/CreateOrDeleteDeviceCommand.h
index b63fdf5..52d367b 100644
--- a/src/commands/studio/CreateOrDeleteDeviceCommand.h
+++ b/src/commands/studio/CreateOrDeleteDeviceCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/ModifyControlParameterCommand.cpp b/src/commands/studio/ModifyControlParameterCommand.cpp
index 7e1d24d..8e9ce04 100644
--- a/src/commands/studio/ModifyControlParameterCommand.cpp
+++ b/src/commands/studio/ModifyControlParameterCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/ModifyControlParameterCommand.h b/src/commands/studio/ModifyControlParameterCommand.h
index ad7897d..46b5272 100644
--- a/src/commands/studio/ModifyControlParameterCommand.h
+++ b/src/commands/studio/ModifyControlParameterCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/ModifyDeviceCommand.cpp b/src/commands/studio/ModifyDeviceCommand.cpp
index f0b220d..760fb9f 100644
--- a/src/commands/studio/ModifyDeviceCommand.cpp
+++ b/src/commands/studio/ModifyDeviceCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -21,6 +21,8 @@
#include "base/Device.h"
#include "base/MidiDevice.h"
#include "base/Studio.h"
+#include "gui/application/RosegardenMainWindow.h"
+
#include <QString>
#include <iostream>
@@ -33,7 +35,7 @@ ModifyDeviceCommand::ModifyDeviceCommand(
DeviceId device,
const std::string &name,
const std::string &librarianName,
- const std::string &librarianEmail):
+ const std::string &librarianEmail) :
NamedCommand(getGlobalName()),
m_studio(studio),
m_device(device),
@@ -84,22 +86,20 @@ void
ModifyDeviceCommand::execute()
{
Device *device = m_studio->getDevice(m_device);
- MidiDevice *midiDevice =
- dynamic_cast<MidiDevice *>(device);
-
- if (device) {
- if (!midiDevice) {
- std::cerr << "ERROR: ModifyDeviceCommand::execute: device "
- << m_device << " is not a MIDI device" << std::endl;
- return ;
- }
- } else {
- std::cerr
- << "ERROR: ModifyDeviceCommand::execute: no such device as "
- << m_device << std::endl;
- return ;
+ if (!device) {
+ std::cerr << "ERROR: ModifyDeviceCommand::execute(): no such device as " << m_device << std::endl;
+ return;
+ }
+
+ MidiDevice *midiDevice = dynamic_cast<MidiDevice *>(device);
+ if (!midiDevice) {
+ std::cerr << "ERROR: ModifyDeviceCommand::execute(): device " << m_device << " is not a MIDI device" << std::endl;
+ return;
}
+ // Save Original Values for Undo
+
+ // ??? Really wish we could just m_oldDevice = *(midiDevice). See below.
m_oldName = midiDevice->getName();
m_oldBankList = midiDevice->getBanks();
m_oldProgramList = midiDevice->getPrograms();
@@ -108,6 +108,20 @@ ModifyDeviceCommand::execute()
m_oldLibrarianName = midiDevice->getLibrarianName();
m_oldLibrarianEmail = midiDevice->getLibrarianEmail();
m_oldVariationType = midiDevice->getVariationType();
+ InstrumentList instruments = midiDevice->getAllInstruments();
+ for (size_t i = 0; i < instruments.size(); ++i) {
+ // ??? Preserving just the programs isn't enough. We need
+ // to preserve the rest of the Instrument as well. However,
+ // the auto/fixed channel feature has made it impossible
+ // to safely make copies of Instrument objects. Also, Instrument
+ // has an ID. How should that be handled for undo? ISTM
+ // that we either need to introduce some sort of copyForUndo()
+ // hack to each object, or develop a set of standards for coding
+ // objects that are undo-safe. Sounds like a pretty big project.
+ m_oldInstrumentPrograms.push_back(instruments[i]->getProgram());
+ }
+
+ // Make the Changes
if (m_changeVariation)
midiDevice->setVariationType(m_variationType);
@@ -122,6 +136,13 @@ ModifyDeviceCommand::execute()
midiDevice->replaceBankList(m_bankList);
if (m_changePrograms)
midiDevice->replaceProgramList(m_programList);
+ if (m_changeBanks || m_changePrograms) {
+ // Make sure the instruments make sense.
+ for (size_t i = 0; i < instruments.size(); ++i) {
+ instruments[i]->pickFirstProgram(
+ midiDevice->isPercussionNumber(i));
+ }
+ }
}
if (m_changeKeyMappings) {
@@ -157,26 +178,26 @@ ModifyDeviceCommand::execute()
if (m_changeControls) {
midiDevice->replaceControlParameters(m_controlList);
}
+
+ // ??? Instead of this kludge, we should be calling a Studio::hasChanged()
+ // which would then notify all observers (e.g. MIPP) who, in turn,
+ // would update themselves.
+ RosegardenMainWindow::self()->uiUpdateKludge();
}
void
ModifyDeviceCommand::unexecute()
{
Device *device = m_studio->getDevice(m_device);
- MidiDevice *midiDevice =
- dynamic_cast<MidiDevice *>(device);
-
- if (device) {
- if (!midiDevice) {
- std::cerr << "ERROR: ModifyDeviceCommand::unexecute: device "
- << m_device << " is not a MIDI device" << std::endl;
- return ;
- }
- } else {
- std::cerr
- << "ERROR: ModifyDeviceCommand::unexecute: no such device as "
- << m_device << std::endl;
- return ;
+ if (!device) {
+ std::cerr << "ERROR: ModifyDeviceCommand::unexecute(): no such device as " << m_device << std::endl;
+ return;
+ }
+
+ MidiDevice *midiDevice = dynamic_cast<MidiDevice *>(device);
+ if (!midiDevice) {
+ std::cerr << "ERROR: ModifyDeviceCommand::unexecute(): device " << m_device << " is not a MIDI device" << std::endl;
+ return;
}
if (m_rename)
@@ -187,7 +208,17 @@ ModifyDeviceCommand::unexecute()
midiDevice->replaceKeyMappingList(m_oldKeyMappingList);
midiDevice->setLibrarian(m_oldLibrarianName, m_oldLibrarianEmail);
if (m_changeVariation)
- midiDevice->setVariationType(m_oldVariationType);
+ midiDevice->setVariationType(m_oldVariationType);
+
+ InstrumentList instruments = midiDevice->getAllInstruments();
+ for (size_t i = 0; i < instruments.size(); ++i) {
+ instruments[i]->setProgram(m_oldInstrumentPrograms[i]);
+ }
+
+ // ??? Instead of this kludge, we should be calling a Studio::hasChanged()
+ // which would then notify all observers (e.g. MIPP) who, in turn,
+ // would update themselves.
+ RosegardenMainWindow::self()->uiUpdateKludge();
}
}
diff --git a/src/commands/studio/ModifyDeviceCommand.h b/src/commands/studio/ModifyDeviceCommand.h
index c99eeb7..3f32b99 100644
--- a/src/commands/studio/ModifyDeviceCommand.h
+++ b/src/commands/studio/ModifyDeviceCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -68,33 +68,35 @@ public:
protected:
Studio *m_studio;
- int m_device;
- std::string m_name;
- std::string m_librarianName;
- std::string m_librarianEmail;
+ int m_device;
+
+ std::string m_name;
+ std::string m_librarianName;
+ std::string m_librarianEmail;
MidiDevice::VariationType m_variationType;
BankList m_bankList;
ProgramList m_programList;
ControlList m_controlList;
KeyMappingList m_keyMappingList;
- std::string m_oldName;
- std::string m_oldLibrarianName;
- std::string m_oldLibrarianEmail;
+ std::string m_oldName;
+ std::string m_oldLibrarianName;
+ std::string m_oldLibrarianEmail;
MidiDevice::VariationType m_oldVariationType;
BankList m_oldBankList;
ProgramList m_oldProgramList;
ControlList m_oldControlList;
KeyMappingList m_oldKeyMappingList;
-
- bool m_overwrite;
- bool m_rename;
- bool m_changeVariation;
- bool m_changeBanks;
- bool m_changePrograms;
- bool m_changeControls;
- bool m_changeKeyMappings;
- bool m_clearBankAndProgramList;
+ ProgramList m_oldInstrumentPrograms;
+
+ bool m_overwrite;
+ bool m_rename;
+ bool m_changeVariation;
+ bool m_changeBanks;
+ bool m_changePrograms;
+ bool m_changeControls;
+ bool m_changeKeyMappings;
+ bool m_clearBankAndProgramList;
};
diff --git a/src/commands/studio/ModifyDeviceMappingCommand.cpp b/src/commands/studio/ModifyDeviceMappingCommand.cpp
index 2cb3d34..5380abf 100644
--- a/src/commands/studio/ModifyDeviceMappingCommand.cpp
+++ b/src/commands/studio/ModifyDeviceMappingCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/ModifyDeviceMappingCommand.h b/src/commands/studio/ModifyDeviceMappingCommand.h
index fcfcdcf..2fbfae8 100644
--- a/src/commands/studio/ModifyDeviceMappingCommand.h
+++ b/src/commands/studio/ModifyDeviceMappingCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/ModifyInstrumentMappingCommand.cpp b/src/commands/studio/ModifyInstrumentMappingCommand.cpp
index 4cdcfbd..73f7040 100644
--- a/src/commands/studio/ModifyInstrumentMappingCommand.cpp
+++ b/src/commands/studio/ModifyInstrumentMappingCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/ModifyInstrumentMappingCommand.h b/src/commands/studio/ModifyInstrumentMappingCommand.h
index 0b06342..b02df6e 100644
--- a/src/commands/studio/ModifyInstrumentMappingCommand.h
+++ b/src/commands/studio/ModifyInstrumentMappingCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/ReconnectDeviceCommand.cpp b/src/commands/studio/ReconnectDeviceCommand.cpp
index c434d3e..e6fe43e 100644
--- a/src/commands/studio/ReconnectDeviceCommand.cpp
+++ b/src/commands/studio/ReconnectDeviceCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -26,6 +26,7 @@
#include <QDataStream>
#include <QString>
#include "sequencer/RosegardenSequencer.h"
+#include "gui/application/RosegardenMainWindow.h"
namespace Rosegarden
@@ -47,6 +48,11 @@ ReconnectDeviceCommand::execute()
<< " reconnected device " << m_deviceId
<< " to " << m_newConnection << std::endl;
}
+
+ // ??? Instead of this kludge, we should be calling a Studio::hasChanged()
+ // which would then notify all observers (e.g. MIPP) who, in turn,
+ // would update themselves.
+ RosegardenMainWindow::self()->uiUpdateKludge();
}
void
@@ -63,6 +69,11 @@ ReconnectDeviceCommand::unexecute()
<< " reconnected device " << m_deviceId
<< " to " << m_oldConnection << std::endl;
}
+
+ // ??? Instead of this kludge, we should be calling a Studio::hasChanged()
+ // which would then notify all observers (e.g. MIPP) who, in turn,
+ // would update themselves.
+ RosegardenMainWindow::self()->uiUpdateKludge();
}
}
diff --git a/src/commands/studio/ReconnectDeviceCommand.h b/src/commands/studio/ReconnectDeviceCommand.h
index e4c85da..ba99e69 100644
--- a/src/commands/studio/ReconnectDeviceCommand.h
+++ b/src/commands/studio/ReconnectDeviceCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/RemoveControlParameterCommand.cpp b/src/commands/studio/RemoveControlParameterCommand.cpp
index 88496c6..de8dc19 100644
--- a/src/commands/studio/RemoveControlParameterCommand.cpp
+++ b/src/commands/studio/RemoveControlParameterCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/RemoveControlParameterCommand.h b/src/commands/studio/RemoveControlParameterCommand.h
index 36099b2..406c381 100644
--- a/src/commands/studio/RemoveControlParameterCommand.h
+++ b/src/commands/studio/RemoveControlParameterCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/commands/studio/RenameDeviceCommand.cpp b/src/commands/studio/RenameDeviceCommand.cpp
index 92fab66..31ec912 100644
--- a/src/commands/studio/RenameDeviceCommand.cpp
+++ b/src/commands/studio/RenameDeviceCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,6 +23,7 @@
#include "base/Studio.h"
#include <QString>
#include "sequencer/RosegardenSequencer.h"
+#include "gui/application/RosegardenMainWindow.h"
namespace Rosegarden
@@ -37,6 +38,10 @@ RenameDeviceCommand::execute()
RosegardenSequencer::getInstance()->renameDevice
(m_deviceId, strtoqstr(m_name));
device->setName(m_name);
+ // ??? Instead of this kludge, we should be calling a Studio::hasChanged()
+ // which would then notify all observers (e.g. MIPP) who, in turn,
+ // would update themselves.
+ RosegardenMainWindow::self()->uiUpdateKludge();
}
void
@@ -47,6 +52,10 @@ RenameDeviceCommand::unexecute()
device->setName(m_oldName);
RosegardenSequencer::getInstance()->renameDevice
(m_deviceId, strtoqstr(m_oldName));
+ // ??? Instead of this kludge, we should be calling a Studio::hasChanged()
+ // which would then notify all observers (e.g. MIPP) who, in turn,
+ // would update themselves.
+ RosegardenMainWindow::self()->uiUpdateKludge();
}
}
diff --git a/src/commands/studio/RenameDeviceCommand.h b/src/commands/studio/RenameDeviceCommand.h
index 26cf62f..da164b1 100644
--- a/src/commands/studio/RenameDeviceCommand.h
+++ b/src/commands/studio/RenameDeviceCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/BasicCommand.cpp b/src/document/BasicCommand.cpp
index 7746c81..c60bed2 100644
--- a/src/document/BasicCommand.cpp
+++ b/src/document/BasicCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/BasicCommand.h b/src/document/BasicCommand.h
index 70e8a21..7246963 100644
--- a/src/document/BasicCommand.h
+++ b/src/document/BasicCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/BasicSelectionCommand.cpp b/src/document/BasicSelectionCommand.cpp
index 015cc6d..d03df56 100644
--- a/src/document/BasicSelectionCommand.cpp
+++ b/src/document/BasicSelectionCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/BasicSelectionCommand.h b/src/document/BasicSelectionCommand.h
index 2827e98..f599406 100644
--- a/src/document/BasicSelectionCommand.h
+++ b/src/document/BasicSelectionCommand.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/Command.cpp b/src/document/Command.cpp
index 6f3aaf5..1296b77 100644
--- a/src/document/Command.cpp
+++ b/src/document/Command.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/Command.h b/src/document/Command.h
index acde161..a865efb 100644
--- a/src/document/Command.h
+++ b/src/document/Command.h
@@ -4,7 +4,7 @@
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- This program is Copyright 2000-2014
+ This program is Copyright 2000-2015
Guillaume Laurent <glaurent at telegraph-road.org>,
Chris Cannam <cannam at all-day-breakfast.com>,
Richard Bown <richard.bown at ferventsoftware.com>
diff --git a/src/document/CommandHistory.cpp b/src/document/CommandHistory.cpp
index a24d4a4..a4c8f19 100644
--- a/src/document/CommandHistory.cpp
+++ b/src/document/CommandHistory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/CommandHistory.h b/src/document/CommandHistory.h
index 380ee66..886c3cc 100644
--- a/src/document/CommandHistory.h
+++ b/src/document/CommandHistory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/CommandRegistry.cpp b/src/document/CommandRegistry.cpp
index d56a939..2863246 100644
--- a/src/document/CommandRegistry.cpp
+++ b/src/document/CommandRegistry.cpp
@@ -36,6 +36,10 @@
namespace Rosegarden {
+AbstractCommandBuilder::~AbstractCommandBuilder()
+{
+}
+
CommandRegistry::CommandRegistry()
{
}
diff --git a/src/document/CommandRegistry.h b/src/document/CommandRegistry.h
index e61cd83..b394a1a 100644
--- a/src/document/CommandRegistry.h
+++ b/src/document/CommandRegistry.h
@@ -59,6 +59,8 @@ public:
class AbstractCommandBuilder
{
public:
+ virtual ~AbstractCommandBuilder();
+
// may throw CommandCancelled
virtual Command *build(QString actionName,
EventSelection &s,
diff --git a/src/document/GzipFile.cpp b/src/document/GzipFile.cpp
index 2330d71..486c82e 100644
--- a/src/document/GzipFile.cpp
+++ b/src/document/GzipFile.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/GzipFile.h b/src/document/GzipFile.h
index abdecea..1606e06 100644
--- a/src/document/GzipFile.h
+++ b/src/document/GzipFile.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/LinkedSegmentsCommand.cpp b/src/document/LinkedSegmentsCommand.cpp
index d0140d5..537ff6c 100644
--- a/src/document/LinkedSegmentsCommand.cpp
+++ b/src/document/LinkedSegmentsCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/LinkedSegmentsCommand.h b/src/document/LinkedSegmentsCommand.h
index 06351b2..28600fd 100644
--- a/src/document/LinkedSegmentsCommand.h
+++ b/src/document/LinkedSegmentsCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp
index f181755..d4a7e44 100644
--- a/src/document/RoseXmlHandler.cpp
+++ b/src/document/RoseXmlHandler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/RoseXmlHandler.h b/src/document/RoseXmlHandler.h
index d2b9239..edfb158 100644
--- a/src/document/RoseXmlHandler.h
+++ b/src/document/RoseXmlHandler.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/RosegardenDocument.cpp b/src/document/RosegardenDocument.cpp
index bf36a23..0e65960 100644
--- a/src/document/RosegardenDocument.cpp
+++ b/src/document/RosegardenDocument.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -57,7 +57,7 @@
#include "gui/application/RosegardenMainWindow.h"
#include "gui/application/RosegardenMainViewWidget.h"
#include "gui/dialogs/UnusedAudioSelectionDialog.h"
-#include "gui/editors/segment/compositionview/AudioPreviewThread.h"
+#include "gui/editors/segment/compositionview/AudioPeaksThread.h"
#include "gui/editors/segment/TrackLabel.h"
#include "gui/general/EditViewBase.h"
#include "gui/general/GUIPalette.h"
@@ -118,7 +118,7 @@ RosegardenDocument::RosegardenDocument(QWidget *parent,
: QObject(parent),
m_modified(false),
m_autoSaved(false),
- m_audioPreviewThread(&m_audioFileManager),
+ m_audioPeaksThread(&m_audioFileManager),
m_pluginManager(pluginManager),
m_audioRecordLatency(0, 0),
m_quickMarkerTime(-1),
@@ -150,8 +150,8 @@ RosegardenDocument::~RosegardenDocument()
RG_DEBUG << "~RosegardenDocument()\n";
m_beingDestroyed = true;
- m_audioPreviewThread.finish();
- m_audioPreviewThread.wait();
+ m_audioPeaksThread.finish();
+ m_audioPeaksThread.wait();
deleteEditViews();
@@ -594,7 +594,7 @@ bool RosegardenDocument::openDocument(const QString& filename,
return false;
}
- //cc 20140508: avoid dereferencing self-deleted progress dialog
+ //cc 20150508: avoid dereferencing self-deleted progress dialog
//after user has closed it, by using a QPointer
QPointer<ProgressDialog> progressDlg = 0;
@@ -885,9 +885,11 @@ void RosegardenDocument::initialiseStudio()
recordIns[i]->setMappedId(mappedId);
}
+ // For each instrument
for (; it != list.end(); ++it) {
if ((*it)->getType() == Instrument::Audio ||
(*it)->getType() == Instrument::SoftSynth) {
+
MappedObjectId mappedId =
StudioControl::createStudioObject(
MappedObject::AudioFader);
@@ -977,16 +979,31 @@ void RosegardenDocument::initialiseStudio()
pluginContainers.push_back(*it);
audioCount++;
+
+ } else if ((*it)->getType() == Instrument::Midi) {
+ // Call Instrument::sendChannelSetup() to make sure the program
+ // change for this track has been sent out.
+ // The test case (MIPP #35) for this is a bit esoteric:
+ // 1. Load a composition and play it.
+ // 2. Load a different composition, DO NOT play it.
+ // 3. Select tracks in the new composition and play the MIDI
+ // input keyboard.
+ // 4. Verify that you hear the programs for the new composition.
+ // Without the following, you'll hear the programs for the old
+ // composition.
+ (*it)->sendChannelSetup();
}
}
RG_DEBUG << "RosegardenDocument::initialiseStudio: Have " << pluginContainers.size() << " plugin container(s)" << endl;
+ // For each plugin container
for (std::vector<PluginContainer *>::iterator pci =
pluginContainers.begin(); pci != pluginContainers.end(); ++pci) {
// Initialise all the plugins for this Instrument or Buss
+ // For each plugin
for (PluginInstanceIterator pli = (*pci)->beginPlugins();
pli != (*pci)->endPlugins(); ++pli) {
@@ -1186,10 +1203,17 @@ bool RosegardenDocument::saveDocument(const QString& filename,
QString& errMsg,
bool autosave)
{
- if (!QFileInfo(filename).exists()) { // safe to write directly
+ QFileInfo fileInfo(filename);
+
+ if (!fileInfo.exists()) { // safe to write directly
return saveDocumentActual(filename, errMsg, autosave);
}
+ if (fileInfo.exists() && !fileInfo.isWritable()) {
+ errMsg = tr("'%1' is read-only. Please save to a different file.").arg(filename);
+ return false;
+ }
+
QTemporaryFile temp(filename + ".");
//!!! was: KTempFile temp(filename + ".", "", 0644); // will be umask'd
@@ -1335,7 +1359,10 @@ bool RosegardenDocument::saveDocumentActual(const QString& filename,
Segment *segment = *segitr;
- if (segment->isLinked()) {
+ // Fix #1446 : Replace isLinked() with isTrulyLinked().
+ // Maybe this fix will need to be removed some day if the
+ // LinkTransposeParams come to be used.
+ if (segment->isTrulyLinked()) {
QString attsString = QString("linkerid=\"%1\" ");
attsString += QString("linkertransposechangekey=\"%2\" ");
attsString += QString("linkertransposesteps=\"%3\" ");
@@ -3008,8 +3035,9 @@ Instrument *
RosegardenDocument::
getInstrument(Segment *segment)
{
- if (!segment)
- { return 0; }
+ if (!segment || !(segment->getComposition())) {
+ return 0;
+ }
Studio &studio = getStudio();
Instrument *instrument =
diff --git a/src/document/RosegardenDocument.h b/src/document/RosegardenDocument.h
index e9fada0..e03c2b6 100644
--- a/src/document/RosegardenDocument.h
+++ b/src/document/RosegardenDocument.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -25,7 +25,7 @@
#include "base/RealTime.h"
#include "base/Segment.h"
#include "base/Studio.h"
-#include "gui/editors/segment/compositionview/AudioPreviewThread.h"
+#include "gui/editors/segment/compositionview/AudioPeaksThread.h"
#include "gui/widgets/ProgressDialog.h"
#include "sound/AudioFileManager.h"
#include "base/Event.h"
@@ -256,13 +256,13 @@ public:
const Studio& getStudio() const { return m_studio;}
/*
- * return the AudioPreviewThread
+ * return the AudioPeaksThread
*/
- AudioPreviewThread& getAudioPreviewThread()
- { return m_audioPreviewThread; }
+ AudioPeaksThread& getAudioPeaksThread()
+ { return m_audioPeaksThread; }
- const AudioPreviewThread& getAudioPreviewThread() const
- { return m_audioPreviewThread; }
+ const AudioPeaksThread& getAudioPeaksThread() const
+ { return m_audioPeaksThread; }
/*
* return the AudioFileManager
@@ -673,7 +673,7 @@ protected:
/**
* calculates AudioFile previews
*/
- AudioPreviewThread m_audioPreviewThread;
+ AudioPeaksThread m_audioPeaksThread;
typedef std::map<InstrumentId, Segment *> RecordingSegmentMap;
diff --git a/src/document/XmlStorableEvent.cpp b/src/document/XmlStorableEvent.cpp
index 29ef21e..6621fc2 100644
--- a/src/document/XmlStorableEvent.cpp
+++ b/src/document/XmlStorableEvent.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/XmlStorableEvent.h b/src/document/XmlStorableEvent.h
index c5ef5e2..112a398 100644
--- a/src/document/XmlStorableEvent.h
+++ b/src/document/XmlStorableEvent.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/XmlSubHandler.cpp b/src/document/XmlSubHandler.cpp
index 5c8d71d..4e8073d 100644
--- a/src/document/XmlSubHandler.cpp
+++ b/src/document/XmlSubHandler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/XmlSubHandler.h b/src/document/XmlSubHandler.h
index b666e1b..e4dd9fd 100644
--- a/src/document/XmlSubHandler.h
+++ b/src/document/XmlSubHandler.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/CsoundExporter.cpp b/src/document/io/CsoundExporter.cpp
index 7d8d151..eeb7ebe 100644
--- a/src/document/io/CsoundExporter.cpp
+++ b/src/document/io/CsoundExporter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -82,7 +82,7 @@ CsoundExporter::write()
str << ";; on Track: \""
<< m_composition->getTrackById((*i)->getTrack())->getLabel()
<< "\"\n";
- str << ";;\n;; Inst\tTime\tDur\tPitch\tVely\n"
+ str << ";;\n;; Inst\tStart\tDur\tAmp\tPch\n"
<< ";; ----\t----\t---\t-----\t----\n";
for (Segment::iterator j = (*i)->begin(); j != (*i)->end(); ++j) {
@@ -98,12 +98,12 @@ CsoundExporter::write()
<Int>(BaseProperties::VELOCITY, velocity);
str << " i"
- << (*i)->getTrack() << "\t"
+ << ((*i)->getTrack() + 1)<< "\t"
<< convertTime((*j)->getAbsoluteTime()) << "\t"
<< convertTime((*j)->getDuration()) << "\t"
+ << velocity << "\t"
<< 3 + (pitch / 12) << ((pitch % 12) < 10 ? ".0" : ".")
- << pitch % 12 << "\t"
- << velocity << "\t\n";
+ << pitch % 12 << "\t\n";
} else {
str << ";; Event type: " << (*j)->getType() << std::endl;
diff --git a/src/document/io/CsoundExporter.h b/src/document/io/CsoundExporter.h
index da984ce..16d4b37 100644
--- a/src/document/io/CsoundExporter.h
+++ b/src/document/io/CsoundExporter.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/HydrogenLoader.cpp b/src/document/io/HydrogenLoader.cpp
index 27e6a94..8ad4108 100644
--- a/src/document/io/HydrogenLoader.cpp
+++ b/src/document/io/HydrogenLoader.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/HydrogenLoader.h b/src/document/io/HydrogenLoader.h
index f1009ef..81dfa86 100644
--- a/src/document/io/HydrogenLoader.h
+++ b/src/document/io/HydrogenLoader.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/HydrogenXMLHandler.cpp b/src/document/io/HydrogenXMLHandler.cpp
index 5b19dbe..dd0ca9d 100644
--- a/src/document/io/HydrogenXMLHandler.cpp
+++ b/src/document/io/HydrogenXMLHandler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/HydrogenXMLHandler.h b/src/document/io/HydrogenXMLHandler.h
index 8764bf0..8490eae 100644
--- a/src/document/io/HydrogenXMLHandler.h
+++ b/src/document/io/HydrogenXMLHandler.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index e12dd00..66aea6f 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2002
Hans Kieserman <hkieserman at mail.com>
@@ -625,12 +625,12 @@ LilyPondExporter::write()
if (illegalFilename) {
CurrentProgressDialog::freeze();
int reply = QMessageBox::question(
- dynamic_cast<QWidget*>(qApp),
- baseName,
- tr("LilyPond does not allow spaces or backslashes in filenames.\n\n"
- "Would you like to use\n\n %1\n\n instead?"),
- QMessageBox::Yes |QMessageBox::Cancel,
- QMessageBox::Cancel);
+ dynamic_cast<QWidget*>(qApp),
+ baseName,
+ QObject::tr("LilyPond does not allow spaces or backslashes in filenames.\n\n"
+ "Would you like to use\n\n %1\n\n instead?").arg(tmpName),
+ QMessageBox::Yes |QMessageBox::Cancel,
+ QMessageBox::Cancel);
if (reply != QMessageBox::Yes)
return false;
}
@@ -638,7 +638,7 @@ LilyPondExporter::write()
std::ofstream str(qstrtostr(tmpName).c_str(), std::ios::out);
if (!str) {
std::cerr << "LilyPondExporter::write() - can't write file " << tmpName << std::endl;
- m_warningMessage = tr("Export failed. The file could not be opened for writing.");
+ m_warningMessage = QObject::tr("Export failed. The file could not be opened for writing.");
return false;
}
@@ -807,7 +807,7 @@ LilyPondExporter::write()
<< "<<" << " s4 " << ">>" << std::endl;
str << indent(col) << "\\layout { }" << std::endl;
str << indent(--col) << "}" << std::endl;
- m_warningMessage = tr("Export succeeded, but the composition was empty.");
+ m_warningMessage = QObject::tr("Export succeeded, but the composition was empty.");
return false;
}
timeT compositionStartTime = (*i)->getStartTime();
@@ -849,18 +849,18 @@ LilyPondExporter::write()
break;
case EXPORT_NONMUTED_TRACKS :
- m_warningMessage = tr("Export of unmuted tracks failed. There"
+ m_warningMessage = QObject::tr("Export of unmuted tracks failed. There"
" are no unmuted tracks or no segments on"
" them.");
break;
case EXPORT_SELECTED_TRACK :
- m_warningMessage = tr("Export of selected track failed. There"
+ m_warningMessage = QObject::tr("Export of selected track failed. There"
" are no segments on the selected track.");
break;
case EXPORT_SELECTED_SEGMENTS :
- m_warningMessage = tr("Export of selected segments failed. No"
+ m_warningMessage = QObject::tr("Export of selected segments failed. No"
" segments are selected.");
break;
@@ -1444,6 +1444,8 @@ LilyPondExporter::write()
str << std::endl << indent(col++) << "\\context Voice = \"" << voiceNumber.str()
<< "\" {"; // indent+
+ str << std::endl << indent(col) << "% Segment: " << seg->getLabel();
+
str << std::endl << indent(col) << "\\override Voice.TextScript #'padding = #2.0";
str << std::endl << indent(col) << "\\override MultiMeasureRest #'expand-limit = 1" << std::endl;
@@ -1593,12 +1595,36 @@ LilyPondExporter::write()
!haveRepeatingWithVolta &&
!haveVolta) {
if (!lsc.isVolta()) {
- str << std::endl << indent(col++)
- << "\\repeat volta " << lsc.getNumberOfRepeats() << " {";
+ str << std::endl << indent(col++);
+ if (lsc.isAutomaticVoltaUsable()) {
+ str << "\\repeat volta "
+ << lsc.getNumberOfRepeats() << " ";
+ }
+ // Opening of main repeating segment
+ str << "{ % Repeating stegment start here";
+ str << std::endl << indent(col)
+ << "% Segment: " << seg->getLabel();
haveRepeatingWithVolta = true;
+ if (!lsc.isAutomaticVoltaUsable()) {
+ str << std::endl << indent(col)
+ << "\\set Score.repeatCommands = #'(start-repeat)";
+ }
} else {
+ str << std::endl << indent(col)
+ << "{ % Alternative start here";
str << std::endl << indent(col++)
- << "{ % Alternative start here";
+ << " % Segment: " << seg->getLabel();
+ if (!lsc.isAutomaticVoltaUsable()) {
+ str << std::endl << indent(col)
+ << "\\set Score.repeatCommands = ";
+ if (lsc.isFirstVolta()) {
+ str << "#'((volta \""
+ << lsc.getVoltaText() << "\"))";
+ } else {
+ str << "#'((volta #f) (volta \""
+ << lsc.getVoltaText() << "\") end-repeat)";
+ }
+ }
if (m_voltaBar) {
str << std::endl << indent(col)
<< "\\bar \"|\" ";
@@ -1667,8 +1693,11 @@ LilyPondExporter::write()
// Open alternate parts if repeat with volta from linked segments
if (haveRepeatingWithVolta) {
if (!lsc.isVolta()) {
- str << std::endl << indent(--col) << "} \% close main repeat ";
- str << std::endl << indent (col++) << "\\alternative {" << std::endl;
+ str << std::endl << indent(--col) << "} \% close main repeat";
+ if (lsc.isAutomaticVoltaUsable()) {
+ str << std::endl << indent (col++) << "\\alternative {";
+ }
+ str << std::endl;
} else {
// Close alternative segment
str << std::endl << indent(--col) << "}";
@@ -1687,11 +1716,27 @@ LilyPondExporter::write()
if (lsc.isVolta()) {
// close volta
+ if (!lsc.isAutomaticVoltaUsable() && lsc.isLastVolta()) {
+ str << std::endl << indent (col)
+ << "\\set Score.repeatCommands = ";
+ if (lsc.getVoltaRepeatCount() > 1) {
+ str << "#'((volta #f) end-repeat)";
+ } else {
+ str << "#'((volta #f))";
+ }
+ if (lsc.getVoltaRepeatCount() < 1) {
+ std::cerr << "BUG in LilyPondExporter : "
+ << "lsc.getVoltaRepeatCount() = "
+ << lsc.getVoltaRepeatCount() << std::endl;
+ }
+ }
str << std::endl << indent(--col) << "}" << std::endl; // indent-
if (lsc.isLastVolta()) {
- // close alternative section
- str << std::endl << indent(--col) << "}" << std::endl; // indent-
+ if (lsc.isAutomaticVoltaUsable()) {
+ // close alternative section
+ str << std::endl << indent(--col) << "}" << std::endl; // indent-
+ }
// close Voice context
str << std::endl << indent(--col) << "} % Voice" << std::endl; // indent-
@@ -2259,6 +2304,7 @@ LilyPondExporter::writeBar(Segment *s,
// only one override per chord, and that outside the <>
stylei = i;
}
+
writePitch(*i, key, str);
bool noteHasCautionaryAccidental = false;
@@ -2683,7 +2729,7 @@ LilyPondExporter::writeBar(Segment *s,
if (overlong) {
str << std::endl << indent(col) <<
qstrtostr(QString("% %1").
- arg(tr("warning: overlong bar truncated here")));
+ arg(QObject::tr("warning: overlong bar truncated here")));
}
//
@@ -2694,7 +2740,7 @@ LilyPondExporter::writeBar(Segment *s,
fractionSmaller(durationRatioSum, barDurationRatio)) {
str << std::endl << indent(col) <<
qstrtostr(QString("% %1").
- arg(tr("warning: bar too short, padding with rests")));
+ arg(QObject::tr("warning: bar too short, padding with rests")));
str << std::endl << indent(col) <<
qstrtostr(QString("% %1 + %2 < %3 && %4/%5 < %6/%7").
arg(barStart).
@@ -2957,6 +3003,19 @@ LilyPondExporter::writePitch(const Event *note,
lilyNote = convertPitchToLilyNote(pitch, accidental, key);
+ // handle parallel color
+
+ if (note->has(BaseProperties::MEMBER_OF_PARALLEL)) {
+
+ bool memberOfParallel;
+
+ note->get<Bool>(BaseProperties::MEMBER_OF_PARALLEL, memberOfParallel);
+
+ if (memberOfParallel) {
+ str << "\\tweak color #magenta ";
+ }
+ }
+
str << lilyNote;
}
diff --git a/src/document/io/LilyPondExporter.h b/src/document/io/LilyPondExporter.h
index 7bccc30..bdf3b2c 100644
--- a/src/document/io/LilyPondExporter.h
+++ b/src/document/io/LilyPondExporter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2002
Hans Kieserman <hkieserman at mail.com>
diff --git a/src/document/io/LilyPondLanguage.cpp b/src/document/io/LilyPondLanguage.cpp
index 918094c..c7bce1e 100644
--- a/src/document/io/LilyPondLanguage.cpp
+++ b/src/document/io/LilyPondLanguage.cpp
@@ -1,7 +1,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2011 Daren Beattie <dtbeattie at gmail.com>
diff --git a/src/document/io/LilyPondLanguage.h b/src/document/io/LilyPondLanguage.h
index a48d72a..ea4c9f9 100644
--- a/src/document/io/LilyPondLanguage.h
+++ b/src/document/io/LilyPondLanguage.h
@@ -1,7 +1,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2011 Daren Beattie <dtbeattie at gmail.com>
diff --git a/src/document/io/LilyPondSegmentsContext.cpp b/src/document/io/LilyPondSegmentsContext.cpp
index 9fea9c0..6450558 100644
--- a/src/document/io/LilyPondSegmentsContext.cpp
+++ b/src/document/io/LilyPondSegmentsContext.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -36,9 +36,11 @@ LilyPondSegmentsContext::LilyPondSegmentsContext(LilyPondExporter *exporter,
m_composition(composition),
m_firstSegmentStartTime(0),
m_lastSegmentEndTime(0),
+ m_automaticVoltaUsable(true),
m_nextRepeatId(1),
m_repeatWithVolta(false),
m_currentVoltaChain(0),
+ m_firstVolta(false),
m_lastVolta(false)
{
m_segments.clear();
@@ -55,7 +57,8 @@ LilyPondSegmentsContext::~LilyPondSegmentsContext()
for (sit = tit->second.begin(); sit != tit->second.end(); ++sit) {
if (sit->rawVoltaChain) {
VoltaChain::iterator i;
- for (i = sit->rawVoltaChain->begin(); i != sit->rawVoltaChain->end(); ++i) {
+ for (i = sit->rawVoltaChain->begin();
+ i != sit->rawVoltaChain->end(); ++i) {
delete *i;
}
delete sit->rawVoltaChain;
@@ -83,7 +86,11 @@ LilyPondSegmentsContext::precompute()
{
TrackMap::iterator tit;
SegmentSet::iterator sit;
-
+
+ // Set at initialization. Will be clear if needed by sortAndGatherVolta()
+ // method.
+ m_automaticVoltaUsable = true;
+
// Find the start time of the first segment and the end time of the
// last segment.
m_firstSegmentStartTime = m_composition->getEndMarker();
@@ -266,6 +273,11 @@ LilyPondSegmentsContext::precompute()
repeatList.push_back(sd);
}
+ // The element of repeatList are the data related to one group of
+ // synchronous repeated segments.
+ // There should be one and only one element of repeatList in each
+ // of the tracks.
+
// Sort the volta
sortAndGatherVolta(repeatList);
}
@@ -419,6 +431,7 @@ LilyPondSegmentsContext::useNextSegment()
// Process possible volta segment
if (m_segIterator->numberOfRepeatLinks) {
if (!m_currentVoltaChain) {
+ m_firstVolta = true;
m_currentVoltaChain = m_segIterator->sortedVoltaChain;
m_voltaIterator = m_currentVoltaChain->begin();
if (m_voltaIterator != m_currentVoltaChain->end()) {
@@ -426,6 +439,7 @@ LilyPondSegmentsContext::useNextSegment()
return (*m_voltaIterator)->segment;
}
} else {
+ m_firstVolta = false;
++m_voltaIterator;
if (m_voltaIterator != m_currentVoltaChain->end()) {
VoltaChain::iterator nextIt = m_voltaIterator;
@@ -493,6 +507,12 @@ LilyPondSegmentsContext::isVolta()
}
bool
+LilyPondSegmentsContext::isFirstVolta()
+{
+ return m_firstVolta;
+}
+
+bool
LilyPondSegmentsContext::isLastVolta()
{
return m_lastVolta;
@@ -501,28 +521,53 @@ LilyPondSegmentsContext::isLastVolta()
std::string
LilyPondSegmentsContext::getVoltaText()
{
-/// TODO : Modification needed to deal with the new "volta as ordinary segment" mode
-
+ std::stringstream out;
+ std::set<int>::iterator it;
+ int last, current;
+
if (!(*m_segIterator).sortedVoltaChain) return std::string("");
- ++m_voltaIterator;
if (m_voltaIterator == (*m_segIterator).sortedVoltaChain->end()) return std::string("");
- std::stringstream out;
- std::set<int>::iterator it;
- bool firstTime = true;
- for (it = (*m_voltaIterator)->voltaNumber.begin();
- it != (*m_voltaIterator)->voltaNumber.end(); ++it) {
- if (firstTime) {
- firstTime = false;
+ it = (*m_voltaIterator)->voltaNumber.begin();
+ last = *it;
+ out << last;
+ current = last;
+
+ for (++it; it != (*m_voltaIterator)->voltaNumber.end(); ++it) {
+ if (*it > current + 1) {
+ if (current == last) {
+ out << ", " << *it;
+ last = current = *it;
+ } else if (current == (last + 1)) {
+ out << ", " << current << ", " << *it;
+ last = current = *it;
+ } else {
+ out << "-" << current << ", " << *it;
+ last = current = *it;
+ }
} else {
- out << ", ";
+ current = *it;
}
- out << *it;
+ }
+
+ if (current == (last + 1)) {
+ out << ", " << current;
+ } else if (current > (last + 1)) {
+ out << "-" << current;
}
return std::string(out.str());
}
+int
+LilyPondSegmentsContext::getVoltaRepeatCount()
+{
+ if (!(*m_segIterator).sortedVoltaChain) return 0;
+ if (m_voltaIterator == (*m_segIterator).sortedVoltaChain->end()) return 0;
+
+ return (*m_voltaIterator)->voltaNumber.size();
+}
+
bool
LilyPondSegmentsContext::SegmentDataCmp::operator()(const SegmentData &s1, const SegmentData &s2) const
{
@@ -693,11 +738,11 @@ LilyPondSegmentsContext::sortAndGatherVolta(SegmentDataList & repeatList)
// Is the volta indexed by idx similar to a previous one ?
bool found = false;
int idx2;
- for (idx2 = 0; idx2 < idx; idx2++) {
+ for (idx2 = 0; idx2 < (int)(*it1)->sortedVoltaChain->size(); idx2++) {
bool linked = true;
for (it = repeatList.begin(); it != repeatList.end(); ++it) {
Segment * seg1 = (*(*it)->rawVoltaChain)[idx]->segment;
- Segment * seg2 = (*(*it)->rawVoltaChain)[idx2]->segment;
+ Segment * seg2 = (*(*it)->sortedVoltaChain)[idx2]->segment;
if (!seg1->isPlainlyLinkedTo(seg2)) {
linked = false;
break;
@@ -711,8 +756,11 @@ LilyPondSegmentsContext::sortAndGatherVolta(SegmentDataList & repeatList)
if (found) {
// Add new volta number in existing volta
for (it = repeatList.begin(); it != repeatList.end(); ++it) {
- (*(*it)->sortedVoltaChain)[idx2]->voltaNumber.insert(idx + 1); /// Number not needed in rawVoltaChain ???
+ (*(*it)->sortedVoltaChain)[idx2]->voltaNumber.insert(idx + 1);
}
+ // Automatic volta in LilyPond is not possible when volta others
+ // than the first one is played several time.
+ if (idx2 != 0) m_automaticVoltaUsable = false;
} else {
// Add one more volta
for (it = repeatList.begin(); it != repeatList.end(); ++it) {
@@ -787,5 +835,42 @@ LilyPondSegmentsContext::dump()
std::cout << std::endl;
}
+void
+LilyPondSegmentsContext::dumpSDL(SegmentDataList & l)
+{
+ SegmentDataList::iterator it;
+ std::cout << "------->\n";
+ for (it = l.begin(); it != l.end(); ++it) {
+ std::cout << " \"" << (*it)->segment->getLabel() << "\"" << std::endl;
+
+ if ((*it)->rawVoltaChain) {
+ std::cout << "raw:" << std::endl;
+ VoltaChain::iterator ivc;
+ for (ivc=(*it)->rawVoltaChain->begin();
+ ivc!=(*it)->rawVoltaChain->end(); ++ivc) {
+ std::cout << " \"" << (*ivc)->segment->getLabel() << "\" :";
+ for (std::set<int>::iterator u=(*ivc)->voltaNumber.begin();
+ u!=(*ivc)->voltaNumber.end(); ++u) {
+ std::cout << " " << (*u);
+ }
+ }
+ }
+
+ if ((*it)->sortedVoltaChain) {
+ std::cout << std::endl << "sorted:" << std::endl;
+ VoltaChain::iterator ivc;
+ for (ivc=(*it)->sortedVoltaChain->begin();
+ ivc!=(*it)->sortedVoltaChain->end(); ++ivc) {
+ std::cout << " \"" << (*ivc)->segment->getLabel() << "\" :";
+ for (std::set<int>::iterator u=(*ivc)->voltaNumber.begin();
+ u!=(*ivc)->voltaNumber.end(); ++u) {
+ std::cout << " " << (*u);
+ }
+ }
+ }
+ }
+ std::cout << std::endl << "<--------" << std::endl;
+}
+
}
diff --git a/src/document/io/LilyPondSegmentsContext.h b/src/document/io/LilyPondSegmentsContext.h
index f7c8075..080b84d 100644
--- a/src/document/io/LilyPondSegmentsContext.h
+++ b/src/document/io/LilyPondSegmentsContext.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -97,7 +97,7 @@ public:
timeT getFirstSegmentStartTime() { return m_firstSegmentStartTime; }
/**
- * Return the smaller start time of the segments being exported.
+ * Return the larger end time of the segments being exported.
* Only valid after precompute() has been executed.
*/
timeT getLastSegmentEndTime() { return m_lastSegmentEndTime; }
@@ -162,6 +162,11 @@ public:
bool isVolta();
/**
+ * Return true if the segment is the first volta of a chain
+ */
+ bool isFirstVolta();
+
+ /**
* Return true if the segment is the last volta of a chain
*/
bool isLastVolta();
@@ -171,7 +176,21 @@ public:
*/
std::string getVoltaText();
- /// Only for debug
+ /**
+ * Return the number of time the current volta is played.
+ */
+ int getVoltaRepeatCount();
+
+ /**
+ * Return true if LilyPond automatic volta mode is usable.
+ * Valid as soon as precompute() has been executed.
+ *
+ * Currently, this is a global flag: automatic and manual repeat/volta
+ * are not mixed in the same score.
+ */
+ bool isAutomaticVoltaUsable() { return m_automaticVoltaUsable; }
+
+ /// Only for instrumentation while debugging
void dump();
protected :
@@ -277,6 +296,10 @@ private :
*/
void sortAndGatherVolta(SegmentDataList &);
+ // Only for instrumentation while debugging
+ void dumpSDL(SegmentDataList & l);
+
+
TrackMap m_segments;
LilyPondExporter * m_exporter;
@@ -285,6 +308,7 @@ private :
timeT m_epsilon;
timeT m_firstSegmentStartTime;
timeT m_lastSegmentEndTime;
+ bool m_automaticVoltaUsable;
TrackMap::iterator m_trackIterator;
SegmentSet::iterator m_segIterator;
@@ -300,6 +324,7 @@ private :
bool m_repeatWithVolta;
VoltaChain * m_currentVoltaChain;
+ bool m_firstVolta;
bool m_lastVolta;
};
diff --git a/src/document/io/MupExporter.cpp b/src/document/io/MupExporter.cpp
index aaf2452..d8ca892 100644
--- a/src/document/io/MupExporter.cpp
+++ b/src/document/io/MupExporter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/MupExporter.h b/src/document/io/MupExporter.h
index af0283e..8cb91c2 100644
--- a/src/document/io/MupExporter.h
+++ b/src/document/io/MupExporter.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/MusicXmlExportHelper.cpp b/src/document/io/MusicXmlExportHelper.cpp
index 452c36f..792a3be 100644
--- a/src/document/io/MusicXmlExportHelper.cpp
+++ b/src/document/io/MusicXmlExportHelper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2002
Hans Kieserman <hkieserman at mail.com>
diff --git a/src/document/io/MusicXmlExportHelper.h b/src/document/io/MusicXmlExportHelper.h
index 643cf67..f583d46 100644
--- a/src/document/io/MusicXmlExportHelper.h
+++ b/src/document/io/MusicXmlExportHelper.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2002
Hans Kieserman <hkieserman at mail.com>
diff --git a/src/document/io/MusicXmlExporter.cpp b/src/document/io/MusicXmlExporter.cpp
index bf14d54..3f1568d 100644
--- a/src/document/io/MusicXmlExporter.cpp
+++ b/src/document/io/MusicXmlExporter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2002
Hans Kieserman <hkieserman at mail.com>
diff --git a/src/document/io/MusicXmlExporter.h b/src/document/io/MusicXmlExporter.h
index 4baa5fa..891685b 100644
--- a/src/document/io/MusicXmlExporter.h
+++ b/src/document/io/MusicXmlExporter.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2002
Hans Kieserman <hkieserman at mail.com>
diff --git a/src/document/io/PercussionMap.cpp b/src/document/io/PercussionMap.cpp
index ae5e063..909c45a 100644
--- a/src/document/io/PercussionMap.cpp
+++ b/src/document/io/PercussionMap.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/PercussionMap.h b/src/document/io/PercussionMap.h
index 4bb392a..c7c7f45 100644
--- a/src/document/io/PercussionMap.h
+++ b/src/document/io/PercussionMap.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/RG21Loader.cpp b/src/document/io/RG21Loader.cpp
index d64a844..20553d5 100644
--- a/src/document/io/RG21Loader.cpp
+++ b/src/document/io/RG21Loader.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/document/io/RG21Loader.h b/src/document/io/RG21Loader.h
index 9a3d0e4..4e451a1 100644
--- a/src/document/io/RG21Loader.h
+++ b/src/document/io/RG21Loader.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/application/LircClient.cpp b/src/gui/application/LircClient.cpp
index b6b48d5..6dbd02a 100644
--- a/src/gui/application/LircClient.cpp
+++ b/src/gui/application/LircClient.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005
Toni Arnold <toni__arnold at bluewin.ch>
diff --git a/src/gui/application/LircClient.h b/src/gui/application/LircClient.h
index 3b27357..6d9bd5b 100644
--- a/src/gui/application/LircClient.h
+++ b/src/gui/application/LircClient.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005
Toni Arnold <toni__arnold at bluewin.ch>
diff --git a/src/gui/application/LircCommander.cpp b/src/gui/application/LircCommander.cpp
index 9b8911d..97d3c68 100644
--- a/src/gui/application/LircCommander.cpp
+++ b/src/gui/application/LircCommander.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005
Toni Arnold <toni__arnold at bluewin.ch>
diff --git a/src/gui/application/LircCommander.h b/src/gui/application/LircCommander.h
index e01cfe1..5a81cbc 100644
--- a/src/gui/application/LircCommander.h
+++ b/src/gui/application/LircCommander.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005
Toni Arnold <toni__arnold at bluewin.ch>
diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index e695be7..df79e14 100644
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/application/RosegardenApplication.h b/src/gui/application/RosegardenApplication.h
index 6003aee..722939b 100644
--- a/src/gui/application/RosegardenApplication.h
+++ b/src/gui/application/RosegardenApplication.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/application/RosegardenMainViewWidget.cpp b/src/gui/application/RosegardenMainViewWidget.cpp
index 68ea408..dcbb3b3 100644
--- a/src/gui/application/RosegardenMainViewWidget.cpp
+++ b/src/gui/application/RosegardenMainViewWidget.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -138,8 +138,7 @@ RosegardenMainViewWidget::RosegardenMainViewWidget(bool showTrackLabels,
// Construct the trackEditor first so we can then
// query it for placement information
//
- m_trackEditor = new TrackEditor(doc, this,
- m_rulerScale, showTrackLabels, unitsPerPixel, this /*hbox*/);
+ m_trackEditor = new TrackEditor(doc, this, m_rulerScale, showTrackLabels);
layout->addWidget(m_trackEditor);
setLayout(layout);
@@ -195,16 +194,6 @@ RosegardenMainViewWidget::RosegardenMainViewWidget(bool showTrackLabels,
this,
SLOT(slotDroppedNewAudio(QString)));
- connect(m_instrumentParameterBox,
- SIGNAL(changeInstrumentLabel(InstrumentId, QString)),
- this,
- SLOT(slotChangeInstrumentLabel(InstrumentId, QString)));
-
- connect(m_instrumentParameterBox,
- SIGNAL(changeInstrumentLabel(InstrumentId, QString)),
- m_trackParameterBox,
- SLOT(slotInstrumentLabelChanged(InstrumentId, QString)));
-
connect(m_trackEditor->getTrackButtons(),
SIGNAL(instrumentSelected(int)),
m_trackParameterBox,
@@ -261,9 +250,9 @@ RosegardenMainViewWidget::getSelection()
return m_trackEditor->getCompositionView()->getSelectedSegments();
}
-void RosegardenMainViewWidget::updateSelectionContents()
+void RosegardenMainViewWidget::updateSelectedSegments()
{
- m_trackEditor->getCompositionView()->updateSelectionContents();
+ m_trackEditor->getCompositionView()->updateSelectedSegments();
}
/* hjj: WHAT DO DO WITH THIS ?
@@ -1064,9 +1053,9 @@ void RosegardenMainViewWidget::setZoomSize(double size)
timeT pointerTime = getDocument()->getComposition().getPosition();
double pointerXPosition = compositionView->
grid().getRulerScale()->getXForTime(pointerTime);
- compositionView->setPointerPos(pointerXPosition);
+ compositionView->drawPointer(pointerXPosition);
- compositionView->clearSegmentRectsCache(true);
+ compositionView->deleteCachedPreviews();
compositionView->slotUpdateSize();
compositionView->slotUpdateAll();
@@ -1220,7 +1209,7 @@ void RosegardenMainViewWidget::slotPropagateSegmentSelection(const SegmentSelect
if (!segments.empty()) {
emit stateChange("have_selection", true);
- if (!segments.hasNonAudioSegment()) {
+ if (!hasNonAudioSegment(segments)) {
emit stateChange("audio_segment_selected", true);
}
} else {
@@ -1283,7 +1272,7 @@ void RosegardenMainViewWidget::slotSelectAllSegments()
if (!segments.empty()) {
emit stateChange("have_selection", true);
- if (!segments.hasNonAudioSegment()) {
+ if (!hasNonAudioSegment(segments)) {
emit stateChange("audio_segment_selected", true);
}
} else {
@@ -1534,7 +1523,7 @@ RosegardenMainViewWidget::slotSelectedSegments(const SegmentSelection &segments)
if (!segments.empty()) {
emit stateChange("have_selection", true);
- if (!segments.hasNonAudioSegment())
+ if (!hasNonAudioSegment(segments))
emit stateChange("audio_segment_selected", true);
} else {
emit stateChange("have_selection", false);
@@ -1589,7 +1578,7 @@ void RosegardenMainViewWidget::slotAddTracks(unsigned int nbTracks,
InstrumentId id, int pos)
{
RG_DEBUG << "RosegardenMainViewWidget::slotAddTracks(" << nbTracks << ", " << pos << ")" << endl;
- m_trackEditor->slotAddTracks(nbTracks, id, pos);
+ m_trackEditor->addTracks(nbTracks, id, pos);
}
void RosegardenMainViewWidget::slotDeleteTracks(
@@ -1599,7 +1588,7 @@ void RosegardenMainViewWidget::slotDeleteTracks(
<< "deleting " << tracks.size() << " tracks"
<< endl;
- m_trackEditor->slotDeleteTracks(tracks);
+ m_trackEditor->deleteTracks(tracks);
}
void
@@ -1608,13 +1597,6 @@ RosegardenMainViewWidget::slotAddCommandToHistory(Command *command)
CommandHistory::getInstance()->addCommand(command);
}
-void
-RosegardenMainViewWidget::slotChangeInstrumentLabel(InstrumentId id,
- QString label)
-{
- m_trackEditor->getTrackButtons()->changeInstrumentName(id, label);
-}
-
#if 0
void
RosegardenMainViewWidget::slotChangeTrackLabel(TrackId id,
@@ -1725,7 +1707,7 @@ RosegardenMainViewWidget::slotAddAudioSegmentDefaultPosition(AudioFileId audioFi
bestSoFar = ti->first;
bool haveSegment = false;
- for (segmentcontainer::const_iterator si =
+ for (SegmentMultiSet::const_iterator si =
comp.getSegments().begin();
si != comp.getSegments().end(); ++si) {
if ((*si)->getTrack() == ti->first) {
@@ -1795,7 +1777,7 @@ RosegardenMainViewWidget::slotDroppedNewAudio(QString audioDesc)
// from qt4-doc : " don't use a (modal) QProgressDialog inside a paintEvent() !"
- //cc 20140508: because ProgressDialog has WA_DeleteOnClose set, it
+ //cc 20150508: because ProgressDialog has WA_DeleteOnClose set, it
// is destroyed if the user closes it during event processing --
// use a QPointer to avoid dereferencing it afterwards
QPointer<ProgressDialog> progressDlg =
@@ -2001,7 +1983,8 @@ RosegardenMainViewWidget::slotSynchroniseWithComposition()
Track *track = comp.getTrackById(comp.getSelectedTrack());
slotUpdateInstrumentParameterBox(track->getInstrument());
- m_instrumentParameterBox->slotUpdateAllBoxes();
+ // Update the MatrixWidget's PitchRuler.
+ m_instrumentParameterBox->emitInstrumentPercussionSetChanged();
}
void
@@ -2082,6 +2065,16 @@ RosegardenMainViewWidget::slotControllerDeviceEventReceived(MappedEvent *e)
}
}
+ // Delegate to the currently active track-related window.
+ // The idea here is that the user can remotely switch between the
+ // three track-related windows (rg main, MIDI Mixer, and Audio Mixer)
+ // via controller 81 (above). Then they can control the tracks
+ // on that window via other controllers.
+
+ // The behavior is slightly different between the three windows.
+ // The main window uses controller 82 to select a track while
+ // the other two use the incoming MIDI channel to select which
+ // track will be modified.
emit controllerDeviceEventReceived(e, m_lastActiveMainWindow);
}
@@ -2120,7 +2113,7 @@ RosegardenMainViewWidget::slotControllerDeviceEventReceived(MappedEvent *e, cons
if (!instrument)
return ;
instrument->setProgramChange(program);
- emit instrumentParametersChanged(ii);
+ instrument->changed();
}
return ;
}
@@ -2159,11 +2152,12 @@ RosegardenMainViewWidget::slotControllerDeviceEventReceived(MappedEvent *e, cons
return ;
}
- ControlList cl = md->getIPBControlParameters();
+ ControlList cl = md->getControlParameters();
for (ControlList::const_iterator i = cl.begin(); i != cl.end(); ++i) {
if ((*i).getControllerValue() == controller) {
RG_DEBUG << "Setting controller " << controller << " for instrument " << instrument->getId() << " to " << value << endl;
instrument->setControllerValue(controller, value);
+ instrument->changed();
break;
}
}
@@ -2179,23 +2173,24 @@ RosegardenMainViewWidget::slotControllerDeviceEventReceived(MappedEvent *e, cons
RG_DEBUG << "Setting volume for instrument " << instrument->getId() << " to " << value << endl;
instrument->setLevel(AudioLevel::fader_to_dB
(value, 127, AudioLevel::ShortFader));
+ instrument->changed();
break;
case MIDI_CONTROLLER_PAN:
RG_DEBUG << "Setting pan for instrument " << instrument->getId() << " to " << value << endl;
instrument->setControllerValue(MIDI_CONTROLLER_PAN, MidiByte((value / 64.0) * 100.0 + 0.01));
+ instrument->changed();
break;
default:
break;
}
+ break;
default:
break;
}
- emit instrumentParametersChanged(instrument->getId());
-
//!!! send out updates via MIDI
}
@@ -2249,5 +2244,17 @@ RosegardenMainViewWidget::createEventView(std::vector<Segment *> segmentsToEdit)
return eventView;
}
+bool RosegardenMainViewWidget::hasNonAudioSegment(const SegmentSelection &segments)
+{
+ for (SegmentSelection::const_iterator i = segments.begin();
+ i != segments.end();
+ ++i) {
+ if ((*i)->getType() == Segment::Internal)
+ return true;
+ }
+ return false;
+}
+
+
}
#include "RosegardenMainViewWidget.moc"
diff --git a/src/gui/application/RosegardenMainViewWidget.h b/src/gui/application/RosegardenMainViewWidget.h
index f6fc0e2..c9faf43 100644
--- a/src/gui/application/RosegardenMainViewWidget.h
+++ b/src/gui/application/RosegardenMainViewWidget.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -54,15 +54,21 @@ class EventView;
class Composition;
class LevelInfo;
+/// Parent for the TrackEditor
/**
* The RosegardenMainViewWidget class provides the view widget for the
* RosegardenMainWindow instance. The View instance inherits QWidget as a
* base class and represents the view object of a QMainWindow. As
- * RosegardenMainViewWidget is part of the docuement-view model, it needs a
+ * RosegardenMainViewWidget is part of the document-view model, it needs a
* reference to the document object connected with it by the
* RosegardenMainWindow class to manipulate and display the document
* structure provided by the RosegardenDocument class.
- *
+ *
+ * An instance of this class is owned by RosegardenMainWindow and can be
+ * accessed via RosegardenMainWindow::getView(). This class is
+ * primarily responsible for containing the TrackEditor instance which
+ * can be accessed via getTrackEditor().
+ *
* @author Guillaume Laurent with KDevelop 0.4
*/
class RosegardenMainViewWidget : public QWidget
@@ -70,7 +76,7 @@ class RosegardenMainViewWidget : public QWidget
Q_OBJECT
public:
- /**p
+ /**
* Constructor for the main view
*/
RosegardenMainViewWidget(bool showTrackLabels,
@@ -122,7 +128,7 @@ public:
bool haveSelection();
SegmentSelection getSelection();
- void updateSelectionContents();
+ void updateSelectedSegments();
static bool isMainWindowLastActive(const QWidget *w) {
return w == m_lastActiveMainWindow;
@@ -211,11 +217,6 @@ public slots:
void slotAddCommandToHistory(Command *command);
/**
- * Change the Instrument Label
- */
- void slotChangeInstrumentLabel(InstrumentId id, QString label);
-
- /**
* Change the Track Label
*/
// void slotChangeTrackLabel(TrackId id, QString label);
@@ -251,12 +252,33 @@ public slots:
void slotActiveMainWindowChanged(const QWidget *);
void slotActiveMainWindowChanged(); // uses sender()
+ /// Handle events from the external controller port.
/**
- * An event has been received from a device connected to the
- * external controller port.
+ * This routine handles remote control events received from a
+ * device connected to the "external controller" port.
+ *
+ * This routine handles controller 81 which opens or
+ * brings to the top various windows based on the value.
*/
void slotControllerDeviceEventReceived(MappedEvent *);
- void slotControllerDeviceEventReceived(MappedEvent *, const void *);
+
+ /// Handle events from the external controller port.
+ /**
+ * This routine handles remote control events received from a
+ * device connected to the "external controller" port.
+ *
+ * This routine handles various controllers and Program Changes.
+ * Controller 82 selects the current track. Other controllers,
+ * like volume and pan, cause changes to the corresponding controller
+ * setting for the current track. Program Changes change the program
+ * for the current track. For audio tracks, MIDI volume and pan
+ * controllers control the track's volume and pan.
+ *
+ * @see MidiMixerWindow::slotControllerDeviceEventReceived()
+ * @see AudioMixerWindow::slotControllerDeviceEventReceived()
+ */
+ void slotControllerDeviceEventReceived(
+ MappedEvent *, const void *preferredCustomer);
signals:
void activateTool(QString toolName);
@@ -300,8 +322,6 @@ signals:
void controllerDeviceEventReceived(MappedEvent *,
const void *);
- void instrumentParametersChanged(InstrumentId);
-
protected:
NotationView *createNotationView(std::vector<Segment *>);
MatrixView *createMatrixView (std::vector<Segment *>, bool drumMode);
@@ -310,6 +330,8 @@ protected:
virtual void windowActivationChange(bool);
+ static bool hasNonAudioSegment(const SegmentSelection &segments);
+
//--------------- Data members ---------------------------------
SimpleRulerScale *m_rulerScale;
diff --git a/src/gui/application/RosegardenMainWindow.cpp b/src/gui/application/RosegardenMainWindow.cpp
index 92c63f5..d350e15 100644
--- a/src/gui/application/RosegardenMainWindow.cpp
+++ b/src/gui/application/RosegardenMainWindow.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -266,7 +266,7 @@ RosegardenMainWindow::RosegardenMainWindow(bool useSequencer,
m_cpuBar(0),
m_zoomSlider(0),
m_zoomLabel(0),
- m_statusBarLabel1(0),
+// m_statusBarLabel1(0),
m_seqManager(0),
m_transport(0),
m_audioManagerDialog(0),
@@ -297,7 +297,7 @@ RosegardenMainWindow::RosegardenMainWindow(bool useSequencer,
m_lircCommander(0),
#endif
m_tranzport(0),
- m_deviceManager(0),
+// m_deviceManager(), QPointer inits itself to 0.
m_warningWidget(0),
m_cpuMeterTimer(new QTimer(static_cast<QObject *>(this)))
{
@@ -669,22 +669,11 @@ RosegardenMainWindow::connectOutsideCtorHack()
// relay this through our own signal so that others can use it too
connect(m_instrumentParameterBox,
- SIGNAL(instrumentParametersChanged(InstrumentId)),
- this,
- SIGNAL(instrumentParametersChanged(InstrumentId)));
-
- // relay this through our own signal so that others can use it too
- connect(m_instrumentParameterBox,
SIGNAL(instrumentPercussionSetChanged(Instrument *)),
this,
SIGNAL(instrumentPercussionSetChanged(Instrument *)));
connect(this,
- SIGNAL(instrumentParametersChanged(InstrumentId)),
- m_instrumentParameterBox,
- SLOT(slotInstrumentParametersChanged(InstrumentId)));
-
- connect(this,
SIGNAL(pluginSelected(InstrumentId, int, int)),
m_instrumentParameterBox,
SLOT(slotPluginSelected(InstrumentId, int, int)));
@@ -946,7 +935,6 @@ RosegardenMainWindow::setupRecentFilesMenu()
}
}
-
void
RosegardenMainWindow::setRewFFwdToAutoRepeat()
{
@@ -1130,10 +1118,6 @@ RosegardenMainWindow::initView()
disconnect(m_instrumentParameterBox, 0, oldView, 0);
disconnect(m_trackParameterBox, 0, oldView, 0);
- // and ensure we don't pass on this signal:
- //
- disconnect(this, SIGNAL(instrumentParametersChanged(InstrumentId)), 0, 0);
-
RosegardenMainViewWidget *swapView = new RosegardenMainViewWidget
(findAction("show_tracklabels")->isChecked(),
m_segmentParameterBox,
@@ -1198,9 +1182,6 @@ RosegardenMainWindow::initView()
connect(m_view, SIGNAL(stateChange(QString, bool)),
this, SLOT (slotStateChanged(QString, bool)));
- connect(m_view, SIGNAL(instrumentParametersChanged(InstrumentId)),
- this, SIGNAL(instrumentParametersChanged(InstrumentId)));
-
// We only check for the SequenceManager to make sure
// we're not on the first pass though - we don't want
// to send these toggles twice on initialisation.
@@ -1264,7 +1245,7 @@ RosegardenMainWindow::initView()
// (actionCollection()->action("toggle_tracking"));
QAction *trackingAction = findAction("toggle_tracking");
if (trackingAction && !trackingAction->isChecked()) {
- m_view->getTrackEditor()->slotToggleTracking();
+ m_view->getTrackEditor()->toggleTracking();
}
m_view->show();
@@ -1404,6 +1385,22 @@ RosegardenMainWindow::setDocument(RosegardenDocument* newDocument)
// start the autosave timer
m_autoSaveTimer->start(m_doc->getAutoSavePeriod() * 1000);
+#if 1
+ // Moving these three lines prior to the initView() call ensures that
+ // the Instruments are properly connected to their devices prior to
+ // the MIPP attempting to display the connection field. With this
+ // after initView(), you will see "No connection" on the MIPP until
+ // you change tracks.
+
+ connect(m_doc, SIGNAL(devicesResyncd()),
+ this, SLOT(slotDocumentDevicesResyncd()));
+
+ // Connect the devices prior to calling initView() to make sure there
+ // is connection information for the MIPP to display.
+ RosegardenSequencer::getInstance()->connectSomething();
+ newDocument->getStudio().resyncDeviceConnections();
+#endif
+
// finally recreate the main view
//
initView();
@@ -1413,11 +1410,18 @@ RosegardenMainWindow::setDocument(RosegardenDocument* newDocument)
getView()->getTrackEditor(), SLOT(slotScrollToTrack(int)));
}
+#if 0
+ // These three lines have been moved prior to the call to initView().
+ // See the comments above for discussion.
+ // ??? This was done April 2015. If there have been no problems after
+ // a year, it's probably safe to clean this up.
+
connect(m_doc, SIGNAL(devicesResyncd()),
this, SLOT(slotDocumentDevicesResyncd()));
RosegardenSequencer::getInstance()->connectSomething();
newDocument->getStudio().resyncDeviceConnections();
+#endif
m_doc->checkSequencerTimer();
m_doc->clearModifiedStatus();
@@ -1457,7 +1461,7 @@ RosegardenMainWindow::setDocument(RosegardenDocument* newDocument)
// Readjust canvas size
//
- m_view->getTrackEditor()->slotReadjustCanvasSize();
+ m_view->getTrackEditor()->updateCanvasSize();
}
void
@@ -2501,7 +2505,7 @@ RosegardenMainWindow::slotSelectAll()
void
RosegardenMainWindow::slotDeleteSelectedSegments()
{
- m_view->getTrackEditor()->slotDeleteSelectedSegments();
+ m_view->getTrackEditor()->deleteSelectedSegments();
}
void
@@ -2611,7 +2615,7 @@ RosegardenMainWindow::slotJoinSegments()
}
m_view->slotAddCommandToHistory(new SegmentJoinCommand(selection));
- m_view->updateSelectionContents();
+ m_view->updateSelectedSegments();
}
void
@@ -2637,7 +2641,7 @@ RosegardenMainWindow::slotExpandFiguration()
}
m_view->slotAddCommandToHistory(new ExpandFigurationCommand(selection));
- m_view->updateSelectionContents();
+ m_view->updateSelectedSegments();
}
void
@@ -2704,7 +2708,7 @@ RosegardenMainWindow::slotRescaleSelection()
}
- //cc 20140508: avoid dereferencing self-deleted progress dialog
+ //cc 20150508: avoid dereferencing self-deleted progress dialog
//after user has closed it, by using a QPointer
QPointer<ProgressDialog> progressDlg = 0;
@@ -4111,10 +4115,7 @@ RosegardenMainWindow::createDocumentFromMIDIFile(QString file)
//
RosegardenDocument *newDoc = new RosegardenDocument(this, m_pluginManager);
-// QString fname(QFile::encodeName(file));
-
-// MidiFile midiFile(fname, &newDoc->getStudio());
- MidiFile midiFile(file, &newDoc->getStudio());
+ MidiFile midiFile;
StartupLogo::hideIfStillThere();
ProgressDialog *progressDlg = new ProgressDialog(tr("Importing MIDI file..."),
@@ -4122,10 +4123,10 @@ RosegardenMainWindow::createDocumentFromMIDIFile(QString file)
CurrentProgressDialog::set(progressDlg);
- connect(&midiFile, SIGNAL(setValue(int)),
+ connect(&midiFile, SIGNAL(progress(int)),
progressDlg, SLOT(setValue(int)));
- if (!midiFile.open()) {
+ if (!midiFile.convertToRosegarden(file, newDoc)) {
CurrentProgressDialog::freeze();
// NOTE: Someone flagged midiFile.getError() with a warning about tr().
// This stuff either gets translated at the source, if we own it, or it
@@ -4137,9 +4138,6 @@ RosegardenMainWindow::createDocumentFromMIDIFile(QString file)
return 0;
}
- midiFile.convertToRosegarden(newDoc->getComposition(),
- MidiFile::CONVERT_REPLACE);
-
disconnect(&midiFile, 0, progressDlg, 0);
fixTextEncodings(&newDoc->getComposition());
@@ -4895,7 +4893,7 @@ RosegardenMainWindow::slotSetPointerPosition(timeT t)
timeT barDuration = timeRange.second - timeRange.first;
timeT newEndMarker = t + 10 * barDuration;
comp.setEndMarker(newEndMarker);
- getView()->getTrackEditor()->slotReadjustCanvasSize();
+ getView()->getTrackEditor()->updateCanvasSize();
getView()->getTrackEditor()->updateRulers();
}
}
@@ -5017,7 +5015,7 @@ RosegardenMainWindow::isTrackEditorPlayTracking() const
void
RosegardenMainWindow::slotToggleTracking()
{
- m_view->getTrackEditor()->slotToggleTracking();
+ m_view->getTrackEditor()->toggleTracking();
}
void
@@ -5238,17 +5236,12 @@ RosegardenMainWindow::exportMIDIFile(QString file)
ProgressDialog * progressDlg = new ProgressDialog(tr("Exporting MIDI file..."),
(QWidget*)this);
-// QString fname(QFile::encodeName(file));
-
-// MidiFile midiFile(fname, &m_doc->getStudio());
- MidiFile midiFile(file, &m_doc->getStudio());
+ MidiFile midiFile;
- connect(&midiFile, SIGNAL(setValue(int)),
+ connect(&midiFile, SIGNAL(progress(int)),
progressDlg, SLOT(setValue(int)));
- midiFile.convertToMidi(m_doc->getComposition());
-
- if (!midiFile.write()) {
+ if (!midiFile.convertToMidi(m_doc->getComposition(), file)) {
CurrentProgressDialog::freeze();
QMessageBox::warning(this, tr("Rosegarden"), tr("Export failed. The file could not be opened for writing."));
}
@@ -6858,13 +6851,13 @@ RosegardenMainWindow::slotDeleteAllAudioFiles()
void
RosegardenMainWindow::slotRepeatingSegments()
{
- m_view->getTrackEditor()->slotTurnRepeatingSegmentToRealCopies();
+ m_view->getTrackEditor()->turnRepeatingSegmentToRealCopies();
}
void
RosegardenMainWindow::slotLinksToCopies()
{
- m_view->getTrackEditor()->slotTurnLinkedSegmentsToRealCopies();
+ m_view->getTrackEditor()->turnLinkedSegmentsToRealCopies();
}
void
@@ -6935,7 +6928,7 @@ RosegardenMainWindow::slotChangeCompositionLength()
dialog.getEndMarker(),
dialog.autoExpandEnabled());
- m_view->getTrackEditor()->getCompositionView()->clearSegmentRectsCache(true);
+ m_view->getTrackEditor()->getCompositionView()->deleteCachedPreviews();
CommandHistory::getInstance()->addCommand(command);
// If you change the composition length to 50 while the pointer is still
@@ -6968,9 +6961,6 @@ RosegardenMainWindow::slotManageMIDIDevices()
connect(m_deviceManager, SIGNAL(editControllers(DeviceId)),
this, SLOT(slotEditControlParameters(DeviceId)));
- connect(m_deviceManager, SIGNAL(closing()),
- this, SLOT(slotDeviceManagerClosed()));
-
connect(this, SIGNAL(documentAboutToChange()),
m_deviceManager, SLOT(close()));
@@ -7094,16 +7084,6 @@ RosegardenMainWindow::slotOpenAudioMixer()
connect(m_audioMixer, SIGNAL(panic()),
this, SLOT(slotPanic()));
- connect(m_audioMixer,
- SIGNAL(instrumentParametersChanged(InstrumentId)),
- this,
- SIGNAL(instrumentParametersChanged(InstrumentId)));
-
- connect(this,
- SIGNAL(instrumentParametersChanged(InstrumentId)),
- m_audioMixer,
- SLOT(slotUpdateInstrument(InstrumentId)));
-
if (m_synthManager) {
connect(m_synthManager,
SIGNAL(pluginSelected(InstrumentId, int, int)),
@@ -7157,16 +7137,6 @@ RosegardenMainWindow::slotOpenMidiMixer()
connect(m_midiMixer, SIGNAL(panic()),
this, SLOT(slotPanic()));
- connect(m_midiMixer,
- SIGNAL(instrumentParametersChanged(InstrumentId)),
- this,
- SIGNAL(instrumentParametersChanged(InstrumentId)));
-
- connect(this,
- SIGNAL(instrumentParametersChanged(InstrumentId)),
- m_midiMixer,
- SLOT(slotUpdateInstrument(InstrumentId)));
-
plugShortcuts(m_midiMixer, m_midiMixer->getShortcuts());
m_midiMixer->show();
@@ -8088,26 +8058,6 @@ RosegardenMainWindow::slotBankEditorClosed()
}
void
-RosegardenMainWindow::slotDeviceManagerClosed()
-{
- RG_DEBUG << "RosegardenMainWindow::slotDeviceManagerClosed()";
-
- if (m_doc->isModified()) {
- if (m_view) {
- // ??? Can't just remove this when the time comes.
- // ??? I suspect this call is being made because the Track and
- // Instrument Parameters boxes need to be updated. It
- // would be better to call
- // m_doc->getComposition().notifyTrackChanged() and have
- // the parameter boxes respond by updating.
- m_view->slotSelectTrackSegments(m_doc->getComposition().getSelectedTrack());
- }
- }
-
- m_deviceManager = 0;
-}
-
-void
RosegardenMainWindow::slotSynthPluginManagerClosed()
{
RG_DEBUG << "RosegardenMainWindow::slotSynthPluginManagerClosed()\n";
@@ -8700,6 +8650,19 @@ RosegardenMainWindow::checkAudioPath()
}
+void
+RosegardenMainWindow::uiUpdateKludge()
+{
+ // Force an update to the UI.
+ // ??? This is a kludge. Callers to this should be using
+ // notification mechanisms (e.g. hasChanged()) within the
+ // objects they are modifying. That, in turn, would cause
+ // relevant portions of the UI (observers) to update.
+ m_view->slotSelectTrackSegments(
+ m_doc->getComposition().getSelectedTrack());
+}
+
+
RosegardenMainWindow *RosegardenMainWindow::m_myself = 0;
}// end namespace Rosegarden
diff --git a/src/gui/application/RosegardenMainWindow.h b/src/gui/application/RosegardenMainWindow.h
index 1c09587..9fc78b4 100644
--- a/src/gui/application/RosegardenMainWindow.h
+++ b/src/gui/application/RosegardenMainWindow.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,6 +23,7 @@
#include "gui/widgets/ZoomSlider.h"
#include "gui/general/RecentFiles.h"
#include "base/Event.h"
+#include "base/Selection.h"
#include "sound/AudioFile.h"
#include "sound/Midi.h"
#include "gui/general/ActionFileClient.h"
@@ -36,6 +37,7 @@
#include <QMenuBar>
#include <QAction>
#include <QToolBar>
+#include <QPointer>
#include <map>
#include <set>
@@ -63,7 +65,6 @@ class TempoView;
class SynthPluginManagerDialog;
class StartupTester;
class SequenceManager;
-class SegmentSelection;
class SegmentParameterBox;
class RosegardenParameterArea;
class RosegardenMainViewWidget;
@@ -90,12 +91,26 @@ class AudioManagerDialog;
class SequencerThread;
class TranzportClient;
class WarningWidget;
-
+
+/// The main Rosegarden application window.
/**
- * The base class for the main Rosegarden application window. This
- * sets up the main window and reads the config file as well as
- * providing a menubar, toolbar and statusbar. The central widget
- * is a RosegardenMainViewWidget, connected to the window's document.
+ * This class sets up the main window and reads the config file as well as
+ * providing a menubar, toolbar and statusbar. The main widget
+ * is a RosegardenMainViewWidget, connected to the RosegardenDocument.
+ *
+ * An instance of this class is created by main() in main.cpp. That
+ * instance can be accessed from anywhere via RosegardenMainWindow::self().
+ *
+ * This class owns many of the key objects in the system, including:
+ *
+ * * getDocument() returns the RosegardenDocument instance.
+ * * m_sequencerThread is the SequencerThread.
+ * * m_segmentParameterBox is the "Segment Parameters" box.
+ * * m_trackParameterBox is the "Track Parameters" box.
+ * * m_instrumentParameterBox is the "Instrument Parameters" box.
+ * * getView() returns the RosegardenMainViewWidget instance which
+ * contains the TrackEditor.
+ * * getTransport() returns the TransportDialog instance.
*/
class RosegardenMainWindow : public QMainWindow, public ActionFileClient
{
@@ -106,7 +121,7 @@ class RosegardenMainWindow : public QMainWindow, public ActionFileClient
public:
/**
- * construtor of RosegardenMainWindow, calls all init functions to
+ * constructor of RosegardenMainWindow, calls all init functions to
* create the application.
* \arg useSequencer : if true, the sequencer is launched
* @see initMenuBar initToolBar
@@ -135,15 +150,11 @@ public:
*/
void closeEvent(QCloseEvent *event);
- /*
- * Get the current copy of the app object
- */
+ /// Global access to the single instance of this class.
static RosegardenMainWindow *self() { return m_myself; }
- /**
- * Return current Main Toolbar
- */
- QToolBar* toolBar( const char* name="\0" );
+ /// Return current Main Toolbar
+// QToolBar* toolBar( const char* name="\0" );
/**
* returns a pointer to the current document connected to the
@@ -231,7 +242,7 @@ public:
/**
* Get a device manager object
*/
- DeviceManagerDialog *getDeviceManager() { return m_deviceManager; }
+ QPointer<DeviceManagerDialog> getDeviceManager() { return m_deviceManager; }
@@ -349,9 +360,10 @@ public:
bool testAudioPath(QString op); // and open the dialog to set it if unset
bool haveAudioImporter() const { return m_haveAudioImporter; }
-
-
-
+
+ void uiUpdateKludge();
+
+
protected:
@@ -529,9 +541,6 @@ signals:
/// emitted when the composition state (selected track, solo, etc...) changes
void compositionStateUpdate();
- /// emitted when instrument parameters change (relayed from InstrumentParameterBox)
- void instrumentParametersChanged(InstrumentId);
-
/// emitted when instrument percussion set changes (relayed from InstrumentParameterBox)
void instrumentPercussionSetChanged(Instrument *);
@@ -1469,11 +1478,6 @@ public slots:
void slotBankEditorClosed();
/**
- * called when the Device Manager is being closed
- */
- void slotDeviceManagerClosed();
-
- /**
* called when the synth manager is being closed
*/
void slotSynthPluginManagerClosed();
@@ -1664,7 +1668,7 @@ private:
QLabel *m_zoomLabel;
- QLabel* m_statusBarLabel1;
+// QLabel* m_statusBarLabel1;
// SequenceManager
//
SequenceManager *m_seqManager;
@@ -1732,7 +1736,7 @@ private:
#endif
TranzportClient *m_tranzport;
- DeviceManagerDialog *m_deviceManager;
+ QPointer<DeviceManagerDialog> m_deviceManager;
WarningWidget *m_warningWidget;
diff --git a/src/gui/application/SetWaitCursor.cpp b/src/gui/application/SetWaitCursor.cpp
index 26f6f34..1c31613 100644
--- a/src/gui/application/SetWaitCursor.cpp
+++ b/src/gui/application/SetWaitCursor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/application/SetWaitCursor.h b/src/gui/application/SetWaitCursor.h
index 1ccf4b8..3d39236 100644
--- a/src/gui/application/SetWaitCursor.h
+++ b/src/gui/application/SetWaitCursor.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/application/StartupTester.cpp b/src/gui/application/StartupTester.cpp
index 51514c3..92249aa 100644
--- a/src/gui/application/StartupTester.cpp
+++ b/src/gui/application/StartupTester.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/application/StartupTester.h b/src/gui/application/StartupTester.h
index 08a4a7a..acb4bdc 100644
--- a/src/gui/application/StartupTester.h
+++ b/src/gui/application/StartupTester.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/application/TransportStatus.h b/src/gui/application/TransportStatus.h
index dd763f4..8716d24 100644
--- a/src/gui/application/TransportStatus.h
+++ b/src/gui/application/TransportStatus.h
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/application/TranzportClient.cpp b/src/gui/application/TranzportClient.cpp
index 48f6fb9..d06f5b1 100644
--- a/src/gui/application/TranzportClient.cpp
+++ b/src/gui/application/TranzportClient.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2009
Immanuel Litzroth <immanuel203 at gmail.com>
diff --git a/src/gui/application/TranzportClient.h b/src/gui/application/TranzportClient.h
index 5e55830..9e74182 100644
--- a/src/gui/application/TranzportClient.h
+++ b/src/gui/application/TranzportClient.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005
Immanuel Litzroth <immanuel203 at gmail.com>
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 6e36dca..c281521 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -663,11 +663,6 @@ int main(int argc, char *argv[])
struct timeval logoShowTime;
gettimeofday(&logoShowTime, 0);
- //
- // Start application
- //
- RosegardenMainWindow *rosegardengui = 0;
-
#ifndef NO_SOUND
theApp.setNoSequencerMode(nosequencer);
#else
@@ -676,17 +671,29 @@ int main(int argc, char *argv[])
RG_INFO << "Creating RosegardenMainWindow instance...";
- rosegardengui = new RosegardenMainWindow(!theApp.noSequencerMode(), startLogo);
+ //
+ // Start application
+ //
+ // ??? Would be nice to put this on the stack instead of the heap. It's
+ // only 616 bytes. I ran into two problems. First, the call to
+ // setAttribute(Qt::WA_DeleteOnClose) in RosegardenMainWindow's ctor
+ // has to be removed. And second, the call to QApplication::exec()
+ // at the end of this routine never returns. That would need to be
+ // tracked down and fixed before this could be done.
+ RosegardenMainWindow *mainWindow =
+ new RosegardenMainWindow(!theApp.noSequencerMode(), startLogo);
- rosegardengui->setIsFirstRun(newVersion);
+ mainWindow->setIsFirstRun(newVersion);
//@@@ QApplication.setMainWidget() is no longer supported.
//@@@ The documentation suggests connecting the lastWindowsClosed() signal
//@@@ to the quit() slot, but QApplication has a boolean quitOnLastWindowClosed
//@@@ property that defaults to true, so calling quit() should not be needed.
- //theApp.setMainWidget(rosegardengui);
+ //theApp.setMainWidget(mainWindow);
- rosegardengui->show();
+ // This parentless/shown window will become the main window when
+ // QApplication::exec() is called.
+ mainWindow->show();
// raise start logo
//
@@ -699,13 +706,13 @@ int main(int argc, char *argv[])
for (int i = 1; i < args.size(); ++i) {
if (args[i].startsWith("-")) continue;
- rosegardengui->openFile(args[i], RosegardenMainWindow::ImportCheckType);
+ mainWindow->openFile(args[i], RosegardenMainWindow::ImportCheckType);
break;
}
//@@@???
QObject::connect(&theApp, SIGNAL(aboutToSaveState()),
- rosegardengui, SLOT(slotDeleteTransport()));
+ mainWindow, SLOT(slotDeleteTransport()));
// Now that we've started up, raise start logo
//
@@ -817,7 +824,7 @@ int main(int argc, char *argv[])
QObject::connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept()));
QObject::connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject()));
- rosegardengui->awaitDialogClearance();
+ mainWindow->awaitDialogClearance();
dialog->exec();
CurrentProgressDialog::thaw();
@@ -827,13 +834,13 @@ int main(int argc, char *argv[])
RG_INFO << "Launching the sequencer...";
try {
- rosegardengui->launchSequencer();
+ mainWindow->launchSequencer();
} catch (std::string e) {
- RG_DEBUG << "RosegardenGUI - " << e << endl;
+ RG_DEBUG << "mainWindow->launchSequencer() - " << e << endl;
} catch (QString e) {
- RG_DEBUG << "RosegardenGUI - " << e << endl;
+ RG_DEBUG << "mainWindow->launchSequencer() - " << e << endl;
} catch (Exception e) {
- RG_DEBUG << "RosegardenGUI - " << e.getMessage() << endl;
+ RG_DEBUG << "mainWindow->launchSequencer() - " << e.getMessage() << endl;
}
//#define STYLE_TEST
diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 05cae4d..e2c631b 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/AudioConfigurationPage.h b/src/gui/configuration/AudioConfigurationPage.h
index 95f7fe1..4bb7106 100644
--- a/src/gui/configuration/AudioConfigurationPage.h
+++ b/src/gui/configuration/AudioConfigurationPage.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index 1422bd8..66be727 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/AudioPropertiesPage.h b/src/gui/configuration/AudioPropertiesPage.h
index 34d666c..9dd00d5 100644
--- a/src/gui/configuration/AudioPropertiesPage.h
+++ b/src/gui/configuration/AudioPropertiesPage.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp
index 48f3500..2222d1f 100644
--- a/src/gui/configuration/ColourConfigurationPage.cpp
+++ b/src/gui/configuration/ColourConfigurationPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/ColourConfigurationPage.h b/src/gui/configuration/ColourConfigurationPage.h
index 5d53aa1..77308b5 100644
--- a/src/gui/configuration/ColourConfigurationPage.h
+++ b/src/gui/configuration/ColourConfigurationPage.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/ConfigurationPage.cpp b/src/gui/configuration/ConfigurationPage.cpp
index 6db8024..52f5ea0 100644
--- a/src/gui/configuration/ConfigurationPage.cpp
+++ b/src/gui/configuration/ConfigurationPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/ConfigurationPage.h b/src/gui/configuration/ConfigurationPage.h
index 2a594e8..9130e4b 100644
--- a/src/gui/configuration/ConfigurationPage.h
+++ b/src/gui/configuration/ConfigurationPage.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Parts of the configuration classes are taken from KMail.
Copyright (C) 2000 The KMail Development Team.
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
index edd7914..b805fa1 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.h b/src/gui/configuration/DocumentMetaConfigurationPage.h
index d9198c9..7f4a526 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.h
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 49beff0..e5bd7fe 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/GeneralConfigurationPage.h b/src/gui/configuration/GeneralConfigurationPage.h
index 77fbea3..dfb86a2 100644
--- a/src/gui/configuration/GeneralConfigurationPage.h
+++ b/src/gui/configuration/GeneralConfigurationPage.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index a581dab..4e23a7d 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/HeadersConfigurationPage.h b/src/gui/configuration/HeadersConfigurationPage.h
index 81c931b..74f9fc2 100644
--- a/src/gui/configuration/HeadersConfigurationPage.h
+++ b/src/gui/configuration/HeadersConfigurationPage.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index 26810d9..b8c4c95 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/MIDIConfigurationPage.h b/src/gui/configuration/MIDIConfigurationPage.h
index 98294a9..00a3ab9 100644
--- a/src/gui/configuration/MIDIConfigurationPage.h
+++ b/src/gui/configuration/MIDIConfigurationPage.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/MatrixConfigurationPage.cpp b/src/gui/configuration/MatrixConfigurationPage.cpp
index 25719c5..af15a73 100644
--- a/src/gui/configuration/MatrixConfigurationPage.cpp
+++ b/src/gui/configuration/MatrixConfigurationPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/MatrixConfigurationPage.h b/src/gui/configuration/MatrixConfigurationPage.h
index 119406b..1e20271 100644
--- a/src/gui/configuration/MatrixConfigurationPage.h
+++ b/src/gui/configuration/MatrixConfigurationPage.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 9238ff7..e9e8728 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -34,7 +34,6 @@
#include "gui/editors/notation/NoteFontViewer.h"
#include "gui/editors/notation/NotePixmapFactory.h"
#include "gui/editors/notation/NoteStyleFactory.h"
-#include "gui/widgets/QuantizeParameters.h"
#include "gui/widgets/FontRequester.h"
#include "TabbedConfigurationPage.h"
#include <QComboBox>
diff --git a/src/gui/configuration/NotationConfigurationPage.h b/src/gui/configuration/NotationConfigurationPage.h
index 39d91a0..13240c1 100644
--- a/src/gui/configuration/NotationConfigurationPage.h
+++ b/src/gui/configuration/NotationConfigurationPage.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -34,7 +34,6 @@ class QCheckBox;
namespace Rosegarden
{
-class QuantizeParameters;
class FontRequester;
@@ -92,7 +91,6 @@ protected:
QComboBox *m_accBarPolicy;
QComboBox *m_keySigCancelMode;
QCheckBox *m_splitAndTie;
- QuantizeParameters *m_quantizeFrame;
QStringList m_untranslatedFont;
QStringList m_untranslatedNoteStyle;
QCheckBox *m_showRepeated;
diff --git a/src/gui/configuration/TabbedConfigurationPage.cpp b/src/gui/configuration/TabbedConfigurationPage.cpp
index e8e36ad..cc81fb1 100644
--- a/src/gui/configuration/TabbedConfigurationPage.cpp
+++ b/src/gui/configuration/TabbedConfigurationPage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/configuration/TabbedConfigurationPage.h b/src/gui/configuration/TabbedConfigurationPage.h
index 66cd478..66908a4 100644
--- a/src/gui/configuration/TabbedConfigurationPage.h
+++ b/src/gui/configuration/TabbedConfigurationPage.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/AboutDialog.cpp b/src/gui/dialogs/AboutDialog.cpp
index e53e7bc..01c2746 100644
--- a/src/gui/dialogs/AboutDialog.cpp
+++ b/src/gui/dialogs/AboutDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -51,7 +51,7 @@ AboutDialog::AboutDialog(QWidget *parent): QDialog(parent, 0)
mainLayout->addLayout(headerLayout);
QLabel *label2 = new QLabel;
- label2->setText(tr("<p>Copyright 2000-2014 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style=\"color:gold\" href=\"http://www.rosegardenmusic.com/resources/authors\">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style=\"color:gold\" href=\"http://www.rosegardenmusic.com\">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p>").arg(VERSION).arg(QT_VERSION_STR).arg(BUILDKEY));
+ label2->setText(tr("<p>Copyright 2000-2015 the Rosegarden development team</p><p>Version: %1 Qt version: %2<br>Build key: %3</p><p>Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit <a style=\"color:gold\" href=\"http://www.rosegardenmusic.com/resources/authors\">http://www.rosegardenmusic.com/resources/authors</a>.<br>For more information about Rosegarden, visit <a style=\"color:gold\" href=\"http://www.rosegardenmusic.com\">http://www.rosegardenmusic.com</a>.</p><p>License: GNU General Public License Version 2 or later</p>").arg(VERSION).arg(QT_VERSION_STR).arg(BUILDKEY));
label2->setWordWrap(true);
label2->setAlignment(Qt::AlignHCenter);
label2->setOpenExternalLinks(true);
diff --git a/src/gui/dialogs/AboutDialog.h b/src/gui/dialogs/AboutDialog.h
index a280f9e..2bbf08b 100644
--- a/src/gui/dialogs/AboutDialog.h
+++ b/src/gui/dialogs/AboutDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/AddTracksDialog.cpp b/src/gui/dialogs/AddTracksDialog.cpp
index 576fabb..55383d2 100644
--- a/src/gui/dialogs/AddTracksDialog.cpp
+++ b/src/gui/dialogs/AddTracksDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/AddTracksDialog.h b/src/gui/dialogs/AddTracksDialog.h
index d8186be..64043a6 100644
--- a/src/gui/dialogs/AddTracksDialog.h
+++ b/src/gui/dialogs/AddTracksDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index a8d4e62..c5ffa51 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -523,7 +523,7 @@ AudioManagerDialog::slotExportAudio()
if (saveFile.contains(".") == 0)
saveFile += ".wav";
- //cc 20140508: avoid dereferencing self-deleted progress dialog
+ //cc 20150508: avoid dereferencing self-deleted progress dialog
//after user has closed it, by using a QPointer
QPointer<ProgressDialog> progressDlg = new ProgressDialog(tr("Exporting audio file..."),
(QWidget*)this);
@@ -1180,7 +1180,7 @@ AudioManagerDialog::addFile(const QUrl& kurl)
// looks funny to the user, but it is functional for now. NO time for
// a more robust solution.
- //cc 20140508: avoid dereferencing self-deleted progress dialog
+ //cc 20150508: avoid dereferencing self-deleted progress dialog
//after user has closed it, by using a QPointer
QPointer<ProgressDialog> progressDlg = new ProgressDialog(tr("Adding audio file..."),
(QWidget*)this);
diff --git a/src/gui/dialogs/AudioManagerDialog.h b/src/gui/dialogs/AudioManagerDialog.h
index 9728767..227de80 100644
--- a/src/gui/dialogs/AudioManagerDialog.h
+++ b/src/gui/dialogs/AudioManagerDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,6 +23,7 @@
#include "misc/ConfigGroups.h"
#include "gui/general/ActionFileClient.h"
#include "gui/widgets/WarningGroupBox.h"
+#include "base/Selection.h"
#include <QMainWindow>
@@ -43,7 +44,7 @@ class QUrl;
namespace Rosegarden
{
-class SegmentSelection;
+
class Segment;
class RosegardenDocument;
class RealTime;
diff --git a/src/gui/dialogs/AudioPlayingDialog.cpp b/src/gui/dialogs/AudioPlayingDialog.cpp
index 77f409a..b3ec75e 100644
--- a/src/gui/dialogs/AudioPlayingDialog.cpp
+++ b/src/gui/dialogs/AudioPlayingDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/AudioPlayingDialog.h b/src/gui/dialogs/AudioPlayingDialog.h
index e8b0302..60ea604 100644
--- a/src/gui/dialogs/AudioPlayingDialog.h
+++ b/src/gui/dialogs/AudioPlayingDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp
index 8cd8f84..3f1d443 100644
--- a/src/gui/dialogs/AudioPluginDialog.cpp
+++ b/src/gui/dialogs/AudioPluginDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/AudioPluginDialog.h b/src/gui/dialogs/AudioPluginDialog.h
index fc70cc5..4ddb8a5 100644
--- a/src/gui/dialogs/AudioPluginDialog.h
+++ b/src/gui/dialogs/AudioPluginDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp
index 261bd47..417679e 100644
--- a/src/gui/dialogs/AudioSplitDialog.cpp
+++ b/src/gui/dialogs/AudioSplitDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/AudioSplitDialog.h b/src/gui/dialogs/AudioSplitDialog.h
index 6977ea9..44c041a 100644
--- a/src/gui/dialogs/AudioSplitDialog.h
+++ b/src/gui/dialogs/AudioSplitDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/BeatsBarsDialog.cpp b/src/gui/dialogs/BeatsBarsDialog.cpp
index 4b5a5db..7b5a758 100644
--- a/src/gui/dialogs/BeatsBarsDialog.cpp
+++ b/src/gui/dialogs/BeatsBarsDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/BeatsBarsDialog.h b/src/gui/dialogs/BeatsBarsDialog.h
index 02211f6..a1ad83f 100644
--- a/src/gui/dialogs/BeatsBarsDialog.h
+++ b/src/gui/dialogs/BeatsBarsDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/CheckForParallelsDialog.cpp b/src/gui/dialogs/CheckForParallelsDialog.cpp
new file mode 100644
index 0000000..9e9ca01
--- /dev/null
+++ b/src/gui/dialogs/CheckForParallelsDialog.cpp
@@ -0,0 +1,893 @@
+/*
+ * CheckForParallelsDialog.cpp
+ *
+ * Created on: Mar 22, 2015
+ * Author: lambache
+ */
+
+#include "CheckForParallelsDialog.h"
+#include "commands/notation/MarkParallelCommand.h"
+#include "document/CommandHistory.h"
+#include "base/Segment.h"
+#include "base/Event.h"
+#include "base/BaseProperties.h"
+#include "gui/widgets/FileDialog.h"
+#include "misc/ConfigGroups.h"
+
+
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QString>
+#include <QWidget>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QDebug>
+#include <QCheckBox>
+#include <QFileDialog>
+#include <QSettings>
+
+#include <iterator>
+#include <iostream>
+#include <cstdio>
+#include <typeinfo>
+#include <algorithm>
+
+#define DEBUG_CHECK_PARALLELS
+
+namespace Rosegarden
+{
+
+//bool CheckForParallelsDialog::checkForUnisons = false;
+QString CheckForParallelsDialog::lastExportDirectory = QString("");
+
+CheckForParallelsDialog::CheckForParallelsDialog(NotationView *p, RosegardenDocument *doc, NotationScene *ns, Composition *comp) :
+ QDialog(p)
+{
+ setWindowTitle(tr("Check for Parallels"));
+
+ document = doc;
+ composition = comp;
+ notationScene = ns;
+
+ notationView = p;
+
+ // the text browser to print display the parallels in text format
+
+ textBrowser = new QTextBrowser(this);
+
+ textBrowser->setStyleSheet("* { background-color: rgb(200, 200, 200); }");
+
+ connect(textBrowser, SIGNAL(cursorPositionChanged()), this, SLOT(onTextBrowserclicked()));
+
+ ignoreCursor = true;
+
+ QVBoxLayout *vboxLayout = new QVBoxLayout;
+ setLayout(vboxLayout);
+
+ vboxLayout->addWidget(textBrowser);
+
+ // we make the check for unisons optional
+ //
+ // if, e.g., a piece for SATB has accompanying voices in strings that go just with the sung voices
+ // we will have parallels throughout the piece that do not count
+
+ checkForUnisonsCheckBox = new QCheckBox(tr("Check for Unisons"));
+ vboxLayout->addWidget(checkForUnisonsCheckBox);
+ checkForUnisonsCheckBox->setChecked( checkForUnisons );
+
+ connect(checkForUnisonsCheckBox, SIGNAL(clicked()), this, SLOT(checkForUnisonsClicked()));
+
+ // we make the check for hidden parallels optional
+ //
+ // question is whether they should be on by default or off by default
+ // I choose 'off'
+
+ checkForHiddenParallelsCheckBox = new QCheckBox(tr("Check for Hidden Parallels"));
+ vboxLayout->addWidget(checkForHiddenParallelsCheckBox);
+ checkForHiddenParallelsCheckBox->setChecked( checkForHiddenParallels );
+
+ connect(checkForHiddenParallelsCheckBox, SIGNAL(clicked()), this, SLOT(checkForHiddenParallelsClicked()));
+
+ // buttons
+
+ startButton = new QPushButton(tr("Start")); // is not local as we want to change text after first start
+ QPushButton *clearButton = new QPushButton(tr("Clear"));
+ QPushButton *exportButton = new QPushButton(tr("Export"));
+ QPushButton *okButton = new QPushButton(tr("Ok"));
+
+ QHBoxLayout *hBoxLayout = new QHBoxLayout;
+
+ hBoxLayout->addWidget(startButton);
+ hBoxLayout->addWidget(clearButton);
+ hBoxLayout->addWidget(exportButton);
+ hBoxLayout->addWidget(okButton);
+
+ vboxLayout->addLayout(hBoxLayout);
+
+ QSettings settings;
+ settings.beginGroup( GeneralOptionsConfigGroup );
+
+ checkForUnisons = qStrToBool( settings.value("checkForUnisonsinParallels", "false" ));
+ checkForUnisonsCheckBox->setChecked(checkForUnisons);
+
+ settings.endGroup();
+
+
+ connect(startButton, SIGNAL(clicked()), this, SLOT(startCheck()));
+ connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
+ connect(exportButton, SIGNAL(clicked()), this, SLOT(exportText()));
+ connect(okButton, SIGNAL(clicked()), this, SLOT(cleanUpAndLeave()));
+
+ transitionList.clear();
+}
+
+// set the position in notationview to point to the clicked parallel
+
+void
+CheckForParallelsDialog::onTextBrowserclicked()
+{
+ if (ignoreCursor)
+ return;
+
+ updateSegments();
+
+ unsigned int currentLine = textBrowser->textCursor().blockNumber();
+
+ if (currentLine<locationForLine.size())
+ if (locationForLine[currentLine].time != -1) {
+
+ // at this stage the list of staves corresponds to the content of the note editor
+ // if the list of parallels is from an older run and the user meanwhile changed the segments/staves in the note editor
+ // the pointer may go to a wrong positions
+ // I consider this tolerable. It's a situation comparable to a development environment in programming where you
+ // can click on an error message of the compiler in the console output to go to the corresponding source line.
+ // If you insert or delete lines, a click on the next error message will go to the wrong line.
+ // at least this should not crash, as the list of segments was updated at the beginning of the function.
+
+ notationScene->setCurrentStaff(locationForLine[currentLine].staff);
+ document->slotSetPointerPosition(locationForLine[currentLine].time);
+ }
+}
+
+// export text window in readable format, so the user can keep the list
+
+void
+CheckForParallelsDialog::exportText()
+{
+ QString label = "Export Parallels";
+
+ QString name = FileDialog::getSaveFileName(
+ this, label, lastExportDirectory,
+ QString(""), "*.txt", 0,
+ FileDialog::DontConfirmOverwrite);
+
+ if (name == "")
+ return;
+
+ //qDebug() << "got export file name '" + name + "'";
+
+ if (name.right(4).toLower() != ".txt") {
+ name += ".txt";
+ }
+
+ QFile file(name);
+
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+ return;
+
+ QTextStream out(&file);
+
+ qDebug() << "exporting parallels";
+ out << textBrowser->toPlainText();
+
+ file.close();
+}
+
+// clear parallels and text window
+
+void
+CheckForParallelsDialog::clear()
+{
+ textBrowser->clear();
+
+ Segment::iterator ia;
+
+ updateSegments();
+
+ // now the segment list corresponds to the current content of the note editor
+ //
+ // if the parallels list is from an older run and the user changed the segments it may happen that not all notes are cleared.
+ // I consider this tolerable. I think that usually, when looking for parallels, the user will go through the current music content
+ // where he/she looked for the parallels. At least this should not crash the dialog.
+ //
+ // to get everything synced again you always can open all segments in the notation editor and clear that
+
+ int numberOfSegments = segment.size();
+
+ if (numberOfSegments == 0)
+ return;
+
+ // we clear all notes open in the notation editor
+
+ for (int i=0; i<numberOfSegments; ++i)
+ {
+ ia = segment[i]->begin();
+
+ while (ia != segment[i]->end()) {
+
+ // if it's a note, clear it
+
+ if ((*ia)->isa("note")) (*ia)->set<Bool>(BaseProperties::MEMBER_OF_PARALLEL, false);
+
+ ++ia;
+
+ if (ia == segment[i]->end()) {
+ continue; // go to next segment
+ }
+ }
+
+ // mark segment as modified
+ segment[i]->updateRefreshStatuses(segment[i]->getStartTime(), segment[i]->getEndTime());
+ }
+
+ // trigger repaint
+ MarkParallelCommand *command = new MarkParallelCommand(*segment[0], 0, 0);
+ CommandHistory::getInstance()->addCommand(command);
+}
+
+void
+CheckForParallelsDialog::updateSegments()
+{
+ SegmentStaffLink l;
+ segmentStaffLinkList.clear();
+
+ std::vector<NotationStaff *> *staff = notationScene->getStaffs();
+
+ unsigned int numberOfStaves = staff->size();
+
+ segment.clear();
+
+ //qDebug() << "number of staves" << numberOfStaves;
+
+ for (unsigned int i=0; i<numberOfStaves; ++i) {
+ l.staff = (*staff)[i];
+ l.segment = &((*staff)[i]->getSegment());
+ segmentStaffLinkList.push_back(l);
+
+ segment.push_back(l.segment);
+ }
+}
+
+void
+CheckForParallelsDialog::cleanUpAndLeave()
+{
+ // we do not clear so the user still sees the parallels in the editor
+
+ this->close();
+}
+
+void
+CheckForParallelsDialog::checkForUnisonsClicked()
+{
+ checkForUnisons = checkForUnisonsCheckBox->isChecked();
+
+ // as far as I understand qCheckBox functionality it will always change upon click
+ // so no need for an extra change whether content of checkForUnisions has changed
+
+ startCheck();
+}
+
+void
+CheckForParallelsDialog::checkForHiddenParallelsClicked()
+{
+ checkForHiddenParallels = checkForHiddenParallelsCheckBox->isChecked();
+
+ startCheck();
+}
+
+void
+CheckForParallelsDialog::writeTransition(std::vector<Transition>::iterator it)
+{
+ QString text;
+
+ int bar;
+ int beat;
+ int fraction;
+ int remainder;
+
+ text += ", track " + makeTrackString((*it).TrackPosition, (*it).trackLabel);
+
+ composition->getMusicalTimeForAbsoluteTime((*it).time, bar, beat, fraction, remainder);
+
+ text += ", " + tr("bar") + tr(" ") + QString("%1").arg(bar) + ", " + tr("beat") + " " + QString("%1").arg(beat) + ", " + tr("fraction") + " " + QString("%1").arg(fraction);
+ qDebug() << text;
+}
+
+void
+CheckForParallelsDialog::writeTransitionList(std::vector<Transition> list)
+{
+ std::vector<Transition>::iterator it = list.begin();
+
+ QString text;
+
+ int count = 0;
+
+ while (it!=list.end()) {
+ text = "transition #" + QString("%1").arg(count++);
+ writeTransition(it);
+ ++it;
+ }
+}
+
+void
+CheckForParallelsDialog::startCheck()
+{
+ QSettings settings;
+
+ settings.beginGroup( GeneralOptionsConfigGroup );
+
+ settings.setValue("checkForUnisonsinParallels", checkForUnisons);
+ settings.setValue("checkForHiddenParallels", checkForHiddenParallels);
+
+ settings.endGroup();
+
+ // after the first run, the StartButton should show the text 'Restart'
+
+ startButton->setText(tr("Restart"));
+
+ // clear found parallels
+ clear();
+
+ // if we append a parallel to the textBrowser it will emit a cursorPositionChanged signal
+ // as long as the search is running we ignore these signals, so the notationView will not change it's pointer position
+ //
+ // upon end of search ignoreCursor will be set to false, from then on the cursorPositionChanged signals will occur
+ // when the user clicks on a line in the list
+ // these signals then are handled by the onTextBrowserclicked() slot
+ // maybe someone else finds a better way of handling this by using the mouseEvents...
+ ignoreCursor = true;
+
+ // we build the list of segments on each start, as the user may edit the music while the dialog is still open
+ // segments may be deleted or created in between runs
+
+ // additionally we build a list of links between segment and staff so we can find the staff to which a segment belongs
+
+ updateSegments();
+
+ int numberOfSegments = segment.size();
+
+ // we build a list of all transitions in all segments
+ // this list is then sorted in ascending order according to time
+ // then we group the transitions that occur at the same time into transition sets
+ // these are then checked for parallels
+ //
+ // transitions are found from the end, i.e. we check whether an event is a note
+ // then we look whether a note occurred before the current note without a rest in between
+ //
+ // for a transition we need the following things:
+ // - the previous note (stored in 'currentPredecessor' must have ended
+ // - the current note must be single
+ // - there is no rest between the previous note and the current one
+ //
+ // if we encounter a situation where two notes sound at the same time we stop checking
+ // it can be really complicated to find the next period of time where only a single note sounds again so that we could
+ // go on with the search
+ // so the user gets a warning that for a certain track the search was not done due to the fact that multiple notes occurred
+
+ transitionList.clear();
+
+ Segment::iterator ia; // this goes through all events in all segments
+
+ Transition t;
+
+ Segment::iterator currentNote;
+ Segment::iterator currentPredecessor;
+
+ TrackId tId;
+ Track *currentTrack;
+ int currentTrackPosition;
+ QString currentTrackLabel;
+
+ NotationStaff *currentStaff;
+
+ parallelList.clear();
+
+ timeT currentTime;
+
+ QString text;
+
+ locationForLine.clear();
+
+ // we add the document name in the beginning to help the user keeping track which exported parallels text file
+ // belongs to which rosegarden file
+ //
+ // we have to place an invalid parallels location for each line of text that does not belong to a parallel
+
+ parallelLocation pl;
+
+ pl.time = -1;
+ pl.staff = 0;
+
+ locationForLine.push_back(pl);
+ locationForLine.push_back(pl);
+
+ text = QString("File: ") + document->getTitle() + QString("\n\n");
+
+ addText(text);
+
+
+ for (int i=0; i<numberOfSegments; ++i)
+ {
+ // look up to which staff the current segment belongs
+
+ for (unsigned int j=0; j<segmentStaffLinkList.size(); ++j) {
+ if (segmentStaffLinkList[j].segment == segment[i]) {
+ currentStaff = segmentStaffLinkList[j].staff;
+ }
+ }
+
+ ia = segment[i]->begin();
+
+ tId = segment[i]->getTrack();
+
+ currentTrack = composition->getTrackById(tId);
+ currentTrackPosition = currentTrack->getPosition();
+ currentTrackLabel = QString::fromUtf8(currentTrack->getLabel().c_str());;
+
+ currentPredecessor = segment[i]->end(); // this is used as flag for "we don't have a predecessor"
+
+ while (ia != segment[i]->end()) {
+
+ ++ia;
+
+ if (ia == segment[i]->end()) continue; // go to next segment
+
+ // if we have a predecessor and the current event is a note then we have a potential transition
+ // but we need to check whether we have multiple notes at the same time
+
+ if ((*ia)->isa("note")) {
+
+ if (currentTrackLabel == QString("v4") )
+ text = "";
+
+ qDebug() << "found note at track" << makeTrackString(currentTrackPosition, currentTrackLabel)
+ << "at time" << (*ia)->getAbsoluteTime()
+ << "duration" << (*ia)->getDuration();
+
+ if (currentPredecessor == segment[i]->end()) {
+
+ // if we do not have a predecessor the current note becomes the predecessor and we are finished for this turn
+
+ currentPredecessor = ia;
+
+ } else {
+
+ // we need to check whether we have multiple notes at the current time point
+ //
+ // this occurs if the predecessor ends after the current note starts
+ // if this happens we stop checking for the current track and give a warning to the user
+
+ timeT predecessorEnd = (*currentPredecessor)->getAbsoluteTime() + (*currentPredecessor)->getDuration();
+ currentTime = (*ia)->getAbsoluteTime();
+
+ // for the messages about multiple notes we have to add invalid locations into the list of parallel locations so that later on
+ // the line numbers for the real parallels in the text browser are correct
+
+ pl.time = -1;
+ pl.staff = 0;
+
+ if ( predecessorEnd > currentTime ) {
+ int bar;
+ int beat;
+ int fraction;
+ int remainder;
+
+ composition->getMusicalTimeForAbsoluteTime(currentTime, bar, beat, fraction, remainder);
+ ++bar; //seems to start counting at 0
+
+ text = tr("found multiple notes for") + " " + makeTrackString(currentTrackPosition, currentTrackLabel);
+
+ text += ", " + tr("bar") + tr(" ") + QString("%1").arg(bar) + ", " + tr("beat") + " " + QString("%1").arg(beat) + ", " + tr("fraction") + " " + QString("%1").arg(fraction) + "\n";
+
+ text += " stopped checking for parallels in the current segment.\n\n";
+
+ // each message consists of three lines
+ locationForLine.push_back(pl);
+ locationForLine.push_back(pl);
+ locationForLine.push_back(pl);
+
+ addText(text);
+
+ break; // go to next segment
+ } else {
+ // we have a transition
+ t.note = ia;
+ t.predecessor = currentPredecessor;
+ t.time = (*ia)->getAbsoluteTime();
+ t.segment = segment[i];
+ t.staff = currentStaff;
+ t.TrackPosition = currentTrackPosition + 1;
+ t.trackLabel = currentTrackLabel;
+
+ transitionList.push_back(t);
+ currentPredecessor = ia;
+ }
+ }
+ } else {
+ // if we have a rest in between notes, this breaks the transition
+
+ // are there other events that also should break the transition?
+
+ if ((*ia)->isa("rest"))
+ currentPredecessor = segment[i]->end();
+ }
+ }
+ }
+
+ if (transitionList.size() == 0) return;
+
+ // we sort the transition list by time
+ // so all transitions that occur at the same time are consecutive in the vector
+
+ std::sort(transitionList.begin(), transitionList.end(), sortByTime);
+
+ writeTransitionList(transitionList);
+
+ // now we check for parallels
+
+ // all transition the occur at a specific time
+ std::vector<Transition> tSet;
+
+ std::vector<Transition>::iterator it = transitionList.begin();
+
+ tSet.clear();
+
+ tSet.push_back(transitionList[0]);
+
+ currentTime = transitionList[0].time;
+
+ ++it;
+
+ while (it != transitionList.end()) {
+
+ // we collect all transitions that occur at currentTime
+
+ if (it->time == currentTime){
+ tSet.push_back(*it);
+ } else {
+ // we need to check the current set and start the next one
+
+ checkParallels(tSet);
+
+ tSet.clear();
+
+ tSet.push_back(*it);
+ currentTime = it->time;
+ }
+
+ ++it;
+
+ if (it == transitionList.end()) {
+ // if we reached the end of the list we need to check the last set as well
+
+ checkParallels(tSet);
+ }
+ }
+
+ // when we arrive here the list of parallel has been populated by checkParallels
+
+ if (parallelList.size() > 0) {
+
+ // we trigger a repaint with an empty command, that does nothing else than to make CommandHistory to emit the repaint signal
+
+ MarkParallelCommand *command = new MarkParallelCommand( *parallelList[0][0].segment1, 0, 0);
+ CommandHistory::getInstance()->addCommand(command);
+ }
+
+ ignoreCursor = false;
+
+}
+
+void
+CheckForParallelsDialog::checkParallels(std::vector<Transition> &tSet)
+{
+ ParallelSet p;
+
+ parallelLocation pl;
+
+ qDebug() << "checking set:";
+
+ writeTransitionList(tSet);
+
+ if (hasParallels(tSet, p)) {
+
+ parallelList.push_back(p);
+
+ int bar;
+ int beat;
+ int fraction;
+ int remainder;
+
+ composition->getMusicalTimeForAbsoluteTime(p[0].time, bar, beat, fraction, remainder);
+ ++bar; //seems to start counting at 0
+
+ QString text;
+
+ if (p.size() == 1) {
+ text = tr("parallel at bar");
+ } else {
+ text = tr("parallels at bar");
+ }
+
+ text += " " + QString("%1").arg(bar) + ", " + tr("beat") + " " + QString("%1").arg(beat) + ", " + tr("fraction") + " " + QString("%1").arg(fraction) + "\n";
+
+ addText(text);
+
+ // we generate an invalid location for this line, as there is no specific segment
+
+ pl.time = -1;
+ pl.staff = p[0].staff1;
+ locationForLine.push_back(pl);
+
+ for (unsigned int i=0; i<p.size(); ++i) {
+
+ switch (p[i].type) {
+
+ case UNISON:
+ text = " " + tr("unisons");
+ break;
+
+ case FIFTH:
+ text = " " + tr("fifths");
+ break;
+
+ case OCTAVE:
+ text = " " + tr("octaves");
+ break;
+
+ case HIDDEN_FIFTH:
+ text = " " + tr("hidden fifths");
+ break;
+
+ case HIDDEN_OCTAVE:
+ text = " " + tr("hidden octaves");
+ break;
+ }
+
+ text += " " + tr("for") + " " + makeTrackString(p[i].trackPosition1, p[i].trackLabel1)
+ + " <-> " + makeTrackString(p[i].trackPosition2, p[i].trackLabel2) + "\n";
+
+ addText(text);
+
+ // this line has a valid location
+
+ pl.time = p[i].time;
+ pl.staff = p[i].staff1;
+ locationForLine.push_back(pl);
+
+ // mark all RefreshStatuses so that the notaionView knows what to update
+ // repaint is done by caller when all parallels are marked
+
+ p[i].segment1->updateRefreshStatuses((*p[i].predecessor1)->getAbsoluteTime(), (*p[i].note1)->getAbsoluteTime());
+ p[i].segment2->updateRefreshStatuses((*p[i].predecessor2)->getAbsoluteTime(), (*p[i].note2)->getAbsoluteTime());
+ }
+
+ addText(QString("\n"));
+
+ // we generate an invalid location for this line, as there is no specific segment and no specific time
+
+ pl.time = -1;
+ pl.staff = p[0].staff1;
+ locationForLine.push_back(pl);
+ }
+}
+
+QString
+CheckForParallelsDialog::makeTrackString(int trackPosition, QString trackLabel)
+{
+ // if the track has a label, return the label otherwise return the position as String
+
+ if (trackLabel == "") {
+ // using a length of two makes it a bit better readable if we have more than 9 tracks
+ return QString("%1").arg(trackPosition, 2);
+ } else {
+ return trackLabel;
+ }
+}
+
+// populate parallel fields with exception of type, this is done in caller
+
+void
+CheckForParallelsDialog::populateParallel(Transition t1, Transition t2, Parallel &p)
+{
+ p.note1 = t1.note;
+ p.note2 = t2.note;
+
+ (*p.note1)->set<Bool>(BaseProperties::MEMBER_OF_PARALLEL, true);
+ (*p.note2)->set<Bool>(BaseProperties::MEMBER_OF_PARALLEL, true);
+
+ p.predecessor1 = t1.predecessor;
+ p.predecessor2 = t2.predecessor;
+
+ (*p.predecessor1)->set<Bool>(BaseProperties::MEMBER_OF_PARALLEL, true);
+ (*p.predecessor2)->set<Bool>(BaseProperties::MEMBER_OF_PARALLEL, true);
+
+ p.segment1 = t1.segment;
+ p.segment2 = t2.segment;
+
+ p.staff1 = t1.staff;
+ p.staff2 = t2.staff;
+
+ p.trackPosition1 = t1.TrackPosition;
+ p.trackPosition2 = t2.TrackPosition;
+
+ p.trackLabel1 = t1.trackLabel;
+ p.trackLabel2 = t2.trackLabel;
+
+ p.time = t1.time;
+}
+
+bool
+CheckForParallelsDialog::hasParallels(std::vector<Transition> &tSet, std::vector<Parallel> &parVec)
+{
+ int intervalBegin;
+ int intervalEnd;
+
+ if (tSet.size()<2) // we need at least two voices for a parallel
+ return false;
+
+ parVec.clear();
+
+ Parallel p;
+
+ for (unsigned int i=0; i<tSet.size(); ++i) {
+ for (unsigned int j=i+1; j<tSet.size(); ++j) {
+ std::string s;
+
+ // interval at end of transition
+
+ int pitch1End = QString::fromUtf8((*(tSet[i].note))->getAsString("pitch").c_str()).toInt();
+ int pitch2End = QString::fromUtf8((*(tSet[j].note))->getAsString("pitch").c_str()).toInt();
+
+ // pitch2End shall be the upper voice
+ // we need this later when testing for hidden parallels
+
+ if (pitch1End>pitch2End) {
+ int h = pitch2End;
+ pitch2End = pitch1End;
+ pitch1End = h;
+ }
+
+ int pitch1Begin = QString::fromUtf8((*(tSet[i].predecessor))->getAsString("pitch").c_str()).toInt();
+ int pitch2Begin = QString::fromUtf8((*(tSet[j].predecessor))->getAsString("pitch").c_str()).toInt();
+
+ if (pitch1Begin>pitch2Begin) {
+ int h = pitch2Begin;
+ pitch2Begin = pitch1Begin;
+ pitch1Begin = h;
+ }
+
+ qDebug() << "p1Begin=" << pitch1Begin << ", p2Begin=" << pitch2Begin << ", p1End=" << pitch1End << ", p2End=" << pitch2End;
+
+ // flag whether both voices move in the same direction
+
+ bool moveSameDirection;
+
+ if ((pitch1Begin>pitch1End && pitch2Begin>pitch2End) || (pitch1Begin<pitch1End && pitch2Begin<pitch2End)) {
+ moveSameDirection = true;
+ } else {
+ moveSameDirection = false;
+ }
+
+ intervalEnd = pitch2End-pitch1End;
+ intervalBegin = pitch2Begin-pitch1Begin;
+
+ // we bring the intervals into the same octave
+
+ int reducedIntervalEnd = intervalEnd;
+
+ while (reducedIntervalEnd>12)
+ reducedIntervalEnd -= 12;
+
+ int reducedIntervalBegin = intervalBegin;
+
+ while (reducedIntervalBegin>12)
+ reducedIntervalBegin -= 12;
+
+// qDebug() << "Begin: pitch1 is " << pitch1Begin << ", pitch2 is " << pitch2Begin << ", interval is " << intervalBegin;
+// qDebug() << "End: pitch1 is " << pitch1End << ", pitch2 is " << pitch2End << ", interval is " << intervalEnd;
+
+ // here we do the tests
+
+ if (reducedIntervalEnd == 0 && reducedIntervalBegin == 0 && pitch1Begin != pitch1End && checkForUnisons) {
+
+ // this is a simple unison parallel
+
+ p.type = UNISON;
+ populateParallel(tSet[i], tSet[j], p);
+ parVec.push_back(p);
+
+ } else if (reducedIntervalEnd == 12 && reducedIntervalBegin == 12 && pitch1Begin != pitch1End && moveSameDirection) {
+
+ // this is a simple octave parallel
+
+ p.type = OCTAVE;
+ populateParallel(tSet[i], tSet[j], p);
+ parVec.push_back(p);
+
+ } else if (reducedIntervalEnd == 7 && reducedIntervalBegin == 7 && pitch1Begin != pitch1End && moveSameDirection) {
+
+ // this is a simple fifth parallel, perfect -> perfect
+
+ p.type = FIFTH;
+ populateParallel(tSet[i], tSet[j], p);
+
+ parVec.push_back(p);
+ } else if (reducedIntervalEnd == 7 && reducedIntervalBegin == 6 && moveSameDirection) {
+
+ // this is a fifth parallel, diminished -> perfect
+ //
+ // perfect -> diminished is allowed
+
+ p.type = FIFTH;
+ populateParallel(tSet[i], tSet[j], p);
+ parVec.push_back(p);
+
+ } else if (intervalEnd == 7
+ && moveSameDirection
+ && (abs(pitch2End-pitch2Begin) > 2)
+ && checkForHiddenParallels) {
+
+ // this is a hidden fifth parallel
+ //
+ // conditions:
+ //
+ // second interval is a perfect fifth
+ // both voices move in the same direction
+ // upper voice does not move in semitone or whole tone
+
+ p.type = HIDDEN_FIFTH;
+ populateParallel(tSet[i], tSet[j], p);
+ parVec.push_back(p);
+
+ } else if (intervalEnd == 12
+ && moveSameDirection
+ && (abs(pitch2End-pitch2Begin) > 2)
+ && checkForHiddenParallels) {
+
+ // this is a hidden octave parallel
+ //
+ // conditions:
+ //
+ // second interval is an octave (or unison)
+ // both voices move in the same direction
+ // upper voice does not move in semitone or whole tone
+
+ p.type = HIDDEN_OCTAVE;
+ populateParallel(tSet[i], tSet[j], p);
+ parVec.push_back(p);
+ }
+ }
+ }
+
+ if (parVec.size() > 0) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+void
+CheckForParallelsDialog::addText(QString text)
+{
+ textBrowser->setCursor(QTextCursor::End);
+ textBrowser->setTextColor(QColor("black"));
+ textBrowser->insertPlainText(text);
+
+ qDebug() << "added text:" << text;
+}
+
+
+}
+
+#include "CheckForParallelsDialog.moc"
diff --git a/src/gui/dialogs/CheckForParallelsDialog.h b/src/gui/dialogs/CheckForParallelsDialog.h
new file mode 100644
index 0000000..9437fb5
--- /dev/null
+++ b/src/gui/dialogs/CheckForParallelsDialog.h
@@ -0,0 +1,217 @@
+/*
+ * CheckForParallelsDialog.h
+ *
+ * Created on: Mar 22, 2015
+ * Author: lambache
+ */
+
+#ifndef SRC_GUI_DIALOGS_CHECKFORPARALLELSDIALOG_H_
+#define SRC_GUI_DIALOGS_CHECKFORPARALLELSDIALOG_H_
+
+#include "base/Segment.h"
+#include "base/Composition.h"
+#include "base/Studio.h"
+#include "document/RosegardenDocument.h"
+#include "gui/editors/notation/NotationStaff.h"
+#include "gui/editors/notation/NotationScene.h"
+#include "gui/editors/notation/NotationView.h"
+
+#include <QTextBrowser>
+#include <QDialog>
+#include <QString>
+#include <QCheckBox>
+#include <QPushButton>
+
+
+// check for parallels in voices
+//
+// we go through all segments in the notation editor, take all events and look for progressions
+//
+// a progression consists of two notes with no rest in between
+// the time of the progression is defined as the begin of the second note
+//
+// we examine all progressions that occur at the same time and check whether the progressions form a parallel movement
+//
+// these are shown in the textBrowser of the dialog and marked in color in the notation editor
+//
+// parallelism is checked by pitch values, so a diminished fifth is the same as an augmented fourth
+// this means that a movement from an augmented fourth to a perfect fifth is the same as from an diminished fifth to a perfect fifth
+// and is therefore considered a parallel
+//
+// frankly, I have no idea how this could be figured out with sensible effort...
+//
+// as we go through the notation content by segment, we will not find transitions across segment boundaries
+// in principle this should be possible, but is too complicated for me at the moment...
+
+
+namespace Rosegarden
+{
+
+
+class CheckForParallelsDialog : public QDialog
+{
+ Q_OBJECT
+public:
+ typedef std::vector<Segment *> SegmentVector;
+
+ // types of parallels
+
+ enum ParallelType {UNISON, FIFTH, OCTAVE, HIDDEN_FIFTH, HIDDEN_OCTAVE};
+
+ // 'Transition' represents a transition from one note to another
+ //
+ // this is the basic entity to check for parallels
+
+ typedef struct {
+ Segment::iterator note; // the note on which the transition ends
+ Segment::iterator predecessor; // the note before
+ Segment *segment; // pointer to the segment to which the transition belongs
+ NotationStaff *staff; // pointer to the staff to which the transition belongs
+ int TrackPosition; // position of track in rosegarden gui
+ QString trackLabel;
+ timeT time; // occurrence time of the transition, i.e. start time of the note
+ } Transition;
+
+ // description of parallel
+
+ typedef struct {
+ ParallelType type;
+
+ Segment::iterator note1; // notes at end of parallel
+ Segment::iterator note2;
+
+ Segment::iterator predecessor1; // notes at begin of parallel
+ Segment::iterator predecessor2;
+
+ Segment *segment1; // pointers to the segments
+ Segment *segment2;
+
+ NotationStaff *staff1; // pointers to staves
+ NotationStaff *staff2;
+
+ int trackPosition1; // shown number of track in notation editor
+ int trackPosition2;
+
+ QString trackLabel1; // label of track
+ QString trackLabel2;
+
+ timeT time; // occurrence time of the parallel, i.e. start note
+ } Parallel;
+
+ // a set of parallels that occur at a specific time
+ typedef std::vector<Parallel> ParallelSet;
+
+ // this describes where a parallel occurs in the notation view
+ typedef struct {
+ timeT time;
+ NotationStaff *staff;
+ } parallelLocation;
+
+ // link between segment and staff so we can position the pointer properly to the parallel
+ typedef struct {
+ Segment *segment;
+ NotationStaff *staff; // staff that the segment belongs to
+ } SegmentStaffLink;
+
+ // compare function for sorting the transitionList
+ static bool sortByTime(const Transition &t1, const Transition &t2) { return t1.time < t2.time; }
+
+ CheckForParallelsDialog(NotationView *parent, RosegardenDocument *document, NotationScene *ns, Composition *comp);
+
+protected slots:
+ void startCheck();
+ void clear();
+ void cleanUpAndLeave();
+ void checkForUnisonsClicked();
+ void checkForHiddenParallelsClicked();
+ void exportText();
+ void onTextBrowserclicked();
+
+private:
+
+ // add text to textBrowser
+ void addText(QString text);
+
+ // check a set of transitions for parallels
+ void checkParallels(std::vector<Transition> &tSet);
+
+ // returns true if the transition set has parallels
+ bool hasParallels(std::vector<Transition> &tSet, std::vector<Parallel> &p);
+
+ // fill the fields of a parallel with exception of type
+ void populateParallel(Transition t1, Transition t2, Parallel &p);
+
+ // returns a string that identifies a track
+ // track label if present, otherwise position of track
+ QString makeTrackString(int trackPosition, QString trackLabel);
+
+ // updates the list of segments that are currently in the notationView
+ void updateSegments();
+
+ // write out the transition list (for debug purposes)
+ void writeTransitionList(std::vector<Transition> transitionList);
+
+ // write a single transition
+ void writeTransition(std::vector<Transition>::iterator it);
+
+ //-------------------------------------------------------------------------
+
+ // where we display the results of the check
+ QTextBrowser *textBrowser;
+
+ // the notation view
+ NotationView *notationView;
+
+ // the document
+ RosegardenDocument *document;
+
+ // the current NotationScene
+ NotationScene *notationScene;
+
+ // all segments in the notation view (pointers!)
+ SegmentVector segment;
+
+ // current composition
+ Composition *composition;
+
+ // all transitions in all segments
+ std::vector<Transition> transitionList;
+
+ // all found parallels
+ std::vector<ParallelSet> parallelList;
+
+ // shall we check for unisons?
+ /*static*/ bool checkForUnisons;
+ QCheckBox *checkForUnisonsCheckBox;
+
+ // shall we check for hidden parallels?
+ /*static*/ bool checkForHiddenParallels;
+ QCheckBox *checkForHiddenParallelsCheckBox;
+
+ // last directory we exported the parallels list to
+ static QString lastExportDirectory;
+
+ // hack to find line when user clicks into textBrowser
+ // could not find how to do this with mouse events in reasonable time
+ // so we follow the cursor changes but we have to ignore this as long as we are populating the window
+ bool ignoreCursor;
+
+ // list of locations vs. line numbers in textBrowser
+ std::vector<parallelLocation> locationForLine;
+
+ // list of all links between staves and segments so we know to which staff a segement belongs
+ std::vector<SegmentStaffLink> segmentStaffLinkList;
+
+ // the button to start the search
+ QPushButton *startButton;
+
+ // a list of potential stop points of checking for each track in case of multiple notes
+ std::vector<timeT> checkStopTime;
+};
+
+
+}
+
+
+
+#endif /* SRC_GUI_DIALOGS_CHECKFORPARALLELSDIALOG_H_ */
diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp
index b64e316..e19fc9b 100644
--- a/src/gui/dialogs/ClefDialog.cpp
+++ b/src/gui/dialogs/ClefDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ClefDialog.h b/src/gui/dialogs/ClefDialog.h
index bf8469f..7bff8b6 100644
--- a/src/gui/dialogs/ClefDialog.h
+++ b/src/gui/dialogs/ClefDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/CompositionLengthDialog.cpp b/src/gui/dialogs/CompositionLengthDialog.cpp
index 0d66e44..2c8eae2 100644
--- a/src/gui/dialogs/CompositionLengthDialog.cpp
+++ b/src/gui/dialogs/CompositionLengthDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/CompositionLengthDialog.h b/src/gui/dialogs/CompositionLengthDialog.h
index f0803ee..e46484b 100644
--- a/src/gui/dialogs/CompositionLengthDialog.h
+++ b/src/gui/dialogs/CompositionLengthDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index 5aed58f..332339a 100644
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ConfigureDialog.h b/src/gui/dialogs/ConfigureDialog.h
index 8abd56f..e26766a 100644
--- a/src/gui/dialogs/ConfigureDialog.h
+++ b/src/gui/dialogs/ConfigureDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ConfigureDialogBase.cpp b/src/gui/dialogs/ConfigureDialogBase.cpp
index c5f699c..6b9f289 100644
--- a/src/gui/dialogs/ConfigureDialogBase.cpp
+++ b/src/gui/dialogs/ConfigureDialogBase.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ConfigureDialogBase.h b/src/gui/dialogs/ConfigureDialogBase.h
index 6702caa..75c3e29 100644
--- a/src/gui/dialogs/ConfigureDialogBase.h
+++ b/src/gui/dialogs/ConfigureDialogBase.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/CountdownBar.cpp b/src/gui/dialogs/CountdownBar.cpp
index 493044e..6364311 100644
--- a/src/gui/dialogs/CountdownBar.cpp
+++ b/src/gui/dialogs/CountdownBar.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/CountdownBar.h b/src/gui/dialogs/CountdownBar.h
index 93219f7..583e6c5 100644
--- a/src/gui/dialogs/CountdownBar.h
+++ b/src/gui/dialogs/CountdownBar.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp
index f19c3ef..a39e082 100644
--- a/src/gui/dialogs/CountdownDialog.cpp
+++ b/src/gui/dialogs/CountdownDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/CountdownDialog.h b/src/gui/dialogs/CountdownDialog.h
index d82fae6..3e191f4 100644
--- a/src/gui/dialogs/CountdownDialog.h
+++ b/src/gui/dialogs/CountdownDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/DialogSuppressor.cpp b/src/gui/dialogs/DialogSuppressor.cpp
index e921ad7..0bb7dc4 100644
--- a/src/gui/dialogs/DialogSuppressor.cpp
+++ b/src/gui/dialogs/DialogSuppressor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/DialogSuppressor.h b/src/gui/dialogs/DialogSuppressor.h
index 9cd8265..0ed69a0 100644
--- a/src/gui/dialogs/DialogSuppressor.h
+++ b/src/gui/dialogs/DialogSuppressor.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/DocumentConfigureDialog.cpp b/src/gui/dialogs/DocumentConfigureDialog.cpp
index 4c444da..30ced2e 100644
--- a/src/gui/dialogs/DocumentConfigureDialog.cpp
+++ b/src/gui/dialogs/DocumentConfigureDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/DocumentConfigureDialog.h b/src/gui/dialogs/DocumentConfigureDialog.h
index 24aa840..894b2f0 100644
--- a/src/gui/dialogs/DocumentConfigureDialog.h
+++ b/src/gui/dialogs/DocumentConfigureDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/EventEditDialog.cpp b/src/gui/dialogs/EventEditDialog.cpp
index baae1f5..d0a7ea0 100644
--- a/src/gui/dialogs/EventEditDialog.cpp
+++ b/src/gui/dialogs/EventEditDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/EventEditDialog.h b/src/gui/dialogs/EventEditDialog.h
index 0ea7f51..a7fc646 100644
--- a/src/gui/dialogs/EventEditDialog.h
+++ b/src/gui/dialogs/EventEditDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp
index 072319e..60cc5ba 100644
--- a/src/gui/dialogs/EventFilterDialog.cpp
+++ b/src/gui/dialogs/EventFilterDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2003-2006
D. Michael McIntyre <dmmcintyr at users.sourceforge.net>
diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h
index 1a1e3b5..281bbd1 100644
--- a/src/gui/dialogs/EventFilterDialog.h
+++ b/src/gui/dialogs/EventFilterDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2003-2006
D. Michael McIntyre <dmmcintyr at users.sourceforge.net>
diff --git a/src/gui/dialogs/EventParameterDialog.cpp b/src/gui/dialogs/EventParameterDialog.cpp
index 6025e51..10cd21c 100644
--- a/src/gui/dialogs/EventParameterDialog.cpp
+++ b/src/gui/dialogs/EventParameterDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/EventParameterDialog.h b/src/gui/dialogs/EventParameterDialog.h
index 229f55e..d84fb21 100644
--- a/src/gui/dialogs/EventParameterDialog.h
+++ b/src/gui/dialogs/EventParameterDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ExportDeviceDialog.cpp b/src/gui/dialogs/ExportDeviceDialog.cpp
index b9d2475..ca3158b 100644
--- a/src/gui/dialogs/ExportDeviceDialog.cpp
+++ b/src/gui/dialogs/ExportDeviceDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ExportDeviceDialog.h b/src/gui/dialogs/ExportDeviceDialog.h
index 6f182ad..2d04a29 100644
--- a/src/gui/dialogs/ExportDeviceDialog.h
+++ b/src/gui/dialogs/ExportDeviceDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/FileLocateDialog.cpp b/src/gui/dialogs/FileLocateDialog.cpp
index bdc4eba..f68f4f1 100644
--- a/src/gui/dialogs/FileLocateDialog.cpp
+++ b/src/gui/dialogs/FileLocateDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/FileLocateDialog.h b/src/gui/dialogs/FileLocateDialog.h
index fff41ea..c83e037 100644
--- a/src/gui/dialogs/FileLocateDialog.h
+++ b/src/gui/dialogs/FileLocateDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/FileMergeDialog.cpp b/src/gui/dialogs/FileMergeDialog.cpp
index d242053..b85433e 100644
--- a/src/gui/dialogs/FileMergeDialog.cpp
+++ b/src/gui/dialogs/FileMergeDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/FileMergeDialog.h b/src/gui/dialogs/FileMergeDialog.h
index e145f56..2e46306 100644
--- a/src/gui/dialogs/FileMergeDialog.h
+++ b/src/gui/dialogs/FileMergeDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/FloatEdit.cpp b/src/gui/dialogs/FloatEdit.cpp
index 8543663..007a022 100644
--- a/src/gui/dialogs/FloatEdit.cpp
+++ b/src/gui/dialogs/FloatEdit.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/FloatEdit.h b/src/gui/dialogs/FloatEdit.h
index b7aa41e..8d38d19 100644
--- a/src/gui/dialogs/FloatEdit.h
+++ b/src/gui/dialogs/FloatEdit.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
index d1072d8..e20b8b9 100644
--- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.h b/src/gui/dialogs/IdentifyTextCodecDialog.h
index 49598fa..c4bf9bd 100644
--- a/src/gui/dialogs/IdentifyTextCodecDialog.h
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index 6106a9b..bb24c2c 100644
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ImportDeviceDialog.h b/src/gui/dialogs/ImportDeviceDialog.h
index 1a27d41..9d55c7e 100644
--- a/src/gui/dialogs/ImportDeviceDialog.h
+++ b/src/gui/dialogs/ImportDeviceDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/InsertTupletDialog.cpp b/src/gui/dialogs/InsertTupletDialog.cpp
index 8bb2a58..512481f 100644
--- a/src/gui/dialogs/InsertTupletDialog.cpp
+++ b/src/gui/dialogs/InsertTupletDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/InsertTupletDialog.h b/src/gui/dialogs/InsertTupletDialog.h
index d191e90..81f1140 100644
--- a/src/gui/dialogs/InsertTupletDialog.h
+++ b/src/gui/dialogs/InsertTupletDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp
index 3a04448..d2684a4 100644
--- a/src/gui/dialogs/InterpretDialog.cpp
+++ b/src/gui/dialogs/InterpretDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/InterpretDialog.h b/src/gui/dialogs/InterpretDialog.h
index 35fb441..4082502 100644
--- a/src/gui/dialogs/InterpretDialog.h
+++ b/src/gui/dialogs/InterpretDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp
index 436d724..f3fb980 100644
--- a/src/gui/dialogs/IntervalDialog.cpp
+++ b/src/gui/dialogs/IntervalDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/IntervalDialog.h b/src/gui/dialogs/IntervalDialog.h
index 17919d2..c218e1d 100644
--- a/src/gui/dialogs/IntervalDialog.h
+++ b/src/gui/dialogs/IntervalDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp
index 71a8f9f..f442732 100644
--- a/src/gui/dialogs/KeySignatureDialog.cpp
+++ b/src/gui/dialogs/KeySignatureDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/KeySignatureDialog.h b/src/gui/dialogs/KeySignatureDialog.h
index 8989624..dba595a 100644
--- a/src/gui/dialogs/KeySignatureDialog.h
+++ b/src/gui/dialogs/KeySignatureDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index 3b0a414..5ec58ec 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.h b/src/gui/dialogs/LilyPondOptionsDialog.h
index 15a26ec..e1dc8cb 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.h
+++ b/src/gui/dialogs/LilyPondOptionsDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp
index 038b629..379a204 100644
--- a/src/gui/dialogs/LyricEditDialog.cpp
+++ b/src/gui/dialogs/LyricEditDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/LyricEditDialog.h b/src/gui/dialogs/LyricEditDialog.h
index 0f4af29..ab6ac6c 100644
--- a/src/gui/dialogs/LyricEditDialog.h
+++ b/src/gui/dialogs/LyricEditDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/MakeOrnamentDialog.cpp b/src/gui/dialogs/MakeOrnamentDialog.cpp
index 11a3fd3..da61e25 100644
--- a/src/gui/dialogs/MakeOrnamentDialog.cpp
+++ b/src/gui/dialogs/MakeOrnamentDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/MakeOrnamentDialog.h b/src/gui/dialogs/MakeOrnamentDialog.h
index 9789bc7..45651ff 100644
--- a/src/gui/dialogs/MakeOrnamentDialog.h
+++ b/src/gui/dialogs/MakeOrnamentDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp
index 8da7ef7..f4aae5b 100644
--- a/src/gui/dialogs/ManageMetronomeDialog.cpp
+++ b/src/gui/dialogs/ManageMetronomeDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ManageMetronomeDialog.h b/src/gui/dialogs/ManageMetronomeDialog.h
index 2fc7583..3c731c1 100644
--- a/src/gui/dialogs/ManageMetronomeDialog.h
+++ b/src/gui/dialogs/ManageMetronomeDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/MarkerModifyDialog.cpp b/src/gui/dialogs/MarkerModifyDialog.cpp
index e43996c..46e57f7 100644
--- a/src/gui/dialogs/MarkerModifyDialog.cpp
+++ b/src/gui/dialogs/MarkerModifyDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/MarkerModifyDialog.h b/src/gui/dialogs/MarkerModifyDialog.h
index 0d52806..8dfc140 100644
--- a/src/gui/dialogs/MarkerModifyDialog.h
+++ b/src/gui/dialogs/MarkerModifyDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/MusicXMLOptionsDialog.cpp b/src/gui/dialogs/MusicXMLOptionsDialog.cpp
index 938f780..d5aff65 100644
--- a/src/gui/dialogs/MusicXMLOptionsDialog.cpp
+++ b/src/gui/dialogs/MusicXMLOptionsDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/MusicXMLOptionsDialog.h b/src/gui/dialogs/MusicXMLOptionsDialog.h
index fcca261..4ce6495 100644
--- a/src/gui/dialogs/MusicXMLOptionsDialog.h
+++ b/src/gui/dialogs/MusicXMLOptionsDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/PasteNotationDialog.cpp b/src/gui/dialogs/PasteNotationDialog.cpp
index eef764d..21b6f61 100644
--- a/src/gui/dialogs/PasteNotationDialog.cpp
+++ b/src/gui/dialogs/PasteNotationDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/PasteNotationDialog.h b/src/gui/dialogs/PasteNotationDialog.h
index b077c28..d357149 100644
--- a/src/gui/dialogs/PasteNotationDialog.h
+++ b/src/gui/dialogs/PasteNotationDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/PitchBendSequenceDialog.cpp b/src/gui/dialogs/PitchBendSequenceDialog.cpp
index 7c19c02..fbd7c65 100644
--- a/src/gui/dialogs/PitchBendSequenceDialog.cpp
+++ b/src/gui/dialogs/PitchBendSequenceDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/PitchBendSequenceDialog.h b/src/gui/dialogs/PitchBendSequenceDialog.h
index ea459fc..6a56a5a 100644
--- a/src/gui/dialogs/PitchBendSequenceDialog.h
+++ b/src/gui/dialogs/PitchBendSequenceDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/PitchDialog.cpp b/src/gui/dialogs/PitchDialog.cpp
index 7149042..af625ce 100644
--- a/src/gui/dialogs/PitchDialog.cpp
+++ b/src/gui/dialogs/PitchDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/PitchDialog.h b/src/gui/dialogs/PitchDialog.h
index fdfe11c..d50bb28 100644
--- a/src/gui/dialogs/PitchDialog.h
+++ b/src/gui/dialogs/PitchDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/PitchPickerDialog.cpp b/src/gui/dialogs/PitchPickerDialog.cpp
index d391cfb..9025778 100644
--- a/src/gui/dialogs/PitchPickerDialog.cpp
+++ b/src/gui/dialogs/PitchPickerDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/PitchPickerDialog.h b/src/gui/dialogs/PitchPickerDialog.h
index faf23c4..9e00f42 100644
--- a/src/gui/dialogs/PitchPickerDialog.h
+++ b/src/gui/dialogs/PitchPickerDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/QuantizeDialog.cpp b/src/gui/dialogs/QuantizeDialog.cpp
index 64c73d9..e7c9736 100644
--- a/src/gui/dialogs/QuantizeDialog.cpp
+++ b/src/gui/dialogs/QuantizeDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -41,7 +41,7 @@ QuantizeDialog::QuantizeDialog(QWidget *parent, bool inNotation) :
m_quantizeFrame = new QuantizeParameters(this , inNotation ?
QuantizeParameters::Notation : QuantizeParameters::Grid,
- false, 0);
+ false);
vboxLayout->addWidget(m_quantizeFrame);
m_quantizeFrame->getAdvancedWidget()->show();
diff --git a/src/gui/dialogs/QuantizeDialog.h b/src/gui/dialogs/QuantizeDialog.h
index 7be2ce2..ebc28f0 100644
--- a/src/gui/dialogs/QuantizeDialog.h
+++ b/src/gui/dialogs/QuantizeDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp
index d6c7f16..630b564 100644
--- a/src/gui/dialogs/RescaleDialog.cpp
+++ b/src/gui/dialogs/RescaleDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/RescaleDialog.h b/src/gui/dialogs/RescaleDialog.h
index 551958b..8cc045f 100644
--- a/src/gui/dialogs/RescaleDialog.h
+++ b/src/gui/dialogs/RescaleDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/SelectDialog.cpp b/src/gui/dialogs/SelectDialog.cpp
index ef2d748..a4efc4f 100644
--- a/src/gui/dialogs/SelectDialog.cpp
+++ b/src/gui/dialogs/SelectDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/SelectDialog.h b/src/gui/dialogs/SelectDialog.h
index cc09a15..a5e0944 100644
--- a/src/gui/dialogs/SelectDialog.h
+++ b/src/gui/dialogs/SelectDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.cpp b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
index 6716d4b..4839960 100644
--- a/src/gui/dialogs/ShowSequencerStatusDialog.cpp
+++ b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.h b/src/gui/dialogs/ShowSequencerStatusDialog.h
index 07a6489..111fc2f 100644
--- a/src/gui/dialogs/ShowSequencerStatusDialog.h
+++ b/src/gui/dialogs/ShowSequencerStatusDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp
index f432f35..0e2e248 100644
--- a/src/gui/dialogs/SimpleEventEditDialog.cpp
+++ b/src/gui/dialogs/SimpleEventEditDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/SimpleEventEditDialog.h b/src/gui/dialogs/SimpleEventEditDialog.h
index c1efc19..137a7d6 100644
--- a/src/gui/dialogs/SimpleEventEditDialog.h
+++ b/src/gui/dialogs/SimpleEventEditDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/SplitByPitchDialog.cpp b/src/gui/dialogs/SplitByPitchDialog.cpp
index a6a4a6d..ad3acae 100644
--- a/src/gui/dialogs/SplitByPitchDialog.cpp
+++ b/src/gui/dialogs/SplitByPitchDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/SplitByPitchDialog.h b/src/gui/dialogs/SplitByPitchDialog.h
index 6f12c50..4725341 100644
--- a/src/gui/dialogs/SplitByPitchDialog.h
+++ b/src/gui/dialogs/SplitByPitchDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
index ba28a40..7fbecbf 100644
--- a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
+++ b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.h b/src/gui/dialogs/SplitByRecordingSrcDialog.h
index 9b0b785..b5c952d 100644
--- a/src/gui/dialogs/SplitByRecordingSrcDialog.h
+++ b/src/gui/dialogs/SplitByRecordingSrcDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp
index aa99ba2..60dba11 100644
--- a/src/gui/dialogs/TempoDialog.cpp
+++ b/src/gui/dialogs/TempoDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TempoDialog.h b/src/gui/dialogs/TempoDialog.h
index 2c504af..c310bd1 100644
--- a/src/gui/dialogs/TempoDialog.h
+++ b/src/gui/dialogs/TempoDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp
index 102ddbd..bbe897f 100644
--- a/src/gui/dialogs/TextEventDialog.cpp
+++ b/src/gui/dialogs/TextEventDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TextEventDialog.h b/src/gui/dialogs/TextEventDialog.h
index a790a95..906d17e 100644
--- a/src/gui/dialogs/TextEventDialog.h
+++ b/src/gui/dialogs/TextEventDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TimeDialog.cpp b/src/gui/dialogs/TimeDialog.cpp
index 8774ed9..fc3065a 100644
--- a/src/gui/dialogs/TimeDialog.cpp
+++ b/src/gui/dialogs/TimeDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TimeDialog.h b/src/gui/dialogs/TimeDialog.h
index ff2e5ee..9e0fae2 100644
--- a/src/gui/dialogs/TimeDialog.h
+++ b/src/gui/dialogs/TimeDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index 00183eb..6b4c555 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TimeSignatureDialog.h b/src/gui/dialogs/TimeSignatureDialog.h
index 84a8033..1109e63 100644
--- a/src/gui/dialogs/TimeSignatureDialog.h
+++ b/src/gui/dialogs/TimeSignatureDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TrackLabelDialog.cpp b/src/gui/dialogs/TrackLabelDialog.cpp
index 3909d32..7049692 100644
--- a/src/gui/dialogs/TrackLabelDialog.cpp
+++ b/src/gui/dialogs/TrackLabelDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TrackLabelDialog.h b/src/gui/dialogs/TrackLabelDialog.h
index ce02816..d1652a6 100644
--- a/src/gui/dialogs/TrackLabelDialog.h
+++ b/src/gui/dialogs/TrackLabelDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index 2ec1dd8..69e4772 100644
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TransportDialog.h b/src/gui/dialogs/TransportDialog.h
index 3000f4e..6e1d475 100644
--- a/src/gui/dialogs/TransportDialog.h
+++ b/src/gui/dialogs/TransportDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index 2d86cff..fa21c18 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TriggerSegmentDialog.h b/src/gui/dialogs/TriggerSegmentDialog.h
index 9d311d7..86ea7e2 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.h
+++ b/src/gui/dialogs/TriggerSegmentDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp
index 2ec3728..c9a95bc 100644
--- a/src/gui/dialogs/TupletDialog.cpp
+++ b/src/gui/dialogs/TupletDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/TupletDialog.h b/src/gui/dialogs/TupletDialog.h
index bc049b7..9ef286d 100644
--- a/src/gui/dialogs/TupletDialog.h
+++ b/src/gui/dialogs/TupletDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
index c49fe94..a16d3b8 100644
--- a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
+++ b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.h b/src/gui/dialogs/UnusedAudioSelectionDialog.h
index 6e45671..0cfe943 100644
--- a/src/gui/dialogs/UnusedAudioSelectionDialog.h
+++ b/src/gui/dialogs/UnusedAudioSelectionDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 33d9adb..50774ec 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/dialogs/UseOrnamentDialog.h b/src/gui/dialogs/UseOrnamentDialog.h
index bff616e..94acc57 100644
--- a/src/gui/dialogs/UseOrnamentDialog.h
+++ b/src/gui/dialogs/UseOrnamentDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index 018bb86..b0fb617 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/eventlist/EventView.h b/src/gui/editors/eventlist/EventView.h
index 6d5e7a5..e0d88c3 100644
--- a/src/gui/editors/eventlist/EventView.h
+++ b/src/gui/editors/eventlist/EventView.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/eventlist/EventViewItem.cpp b/src/gui/editors/eventlist/EventViewItem.cpp
index b493922..dbc9ac1 100644
--- a/src/gui/editors/eventlist/EventViewItem.cpp
+++ b/src/gui/editors/eventlist/EventViewItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/eventlist/EventViewItem.h b/src/gui/editors/eventlist/EventViewItem.h
index 70c0df3..b5be11e 100644
--- a/src/gui/editors/eventlist/EventViewItem.h
+++ b/src/gui/editors/eventlist/EventViewItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/eventlist/TrivialVelocityDialog.cpp b/src/gui/editors/eventlist/TrivialVelocityDialog.cpp
index 3a86ad0..6574c39 100644
--- a/src/gui/editors/eventlist/TrivialVelocityDialog.cpp
+++ b/src/gui/editors/eventlist/TrivialVelocityDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/eventlist/TrivialVelocityDialog.h b/src/gui/editors/eventlist/TrivialVelocityDialog.h
index 16b2616..ae24402 100644
--- a/src/gui/editors/eventlist/TrivialVelocityDialog.h
+++ b/src/gui/editors/eventlist/TrivialVelocityDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/Chord.cpp b/src/gui/editors/guitar/Chord.cpp
index 27543ee..ba10bb3 100644
--- a/src/gui/editors/guitar/Chord.cpp
+++ b/src/gui/editors/guitar/Chord.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/Chord.h b/src/gui/editors/guitar/Chord.h
index a169e5d..d702955 100644
--- a/src/gui/editors/guitar/Chord.h
+++ b/src/gui/editors/guitar/Chord.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/ChordMap.cpp b/src/gui/editors/guitar/ChordMap.cpp
index 0207592..c19169c 100644
--- a/src/gui/editors/guitar/ChordMap.cpp
+++ b/src/gui/editors/guitar/ChordMap.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/ChordMap.h b/src/gui/editors/guitar/ChordMap.h
index 231a9a6..4797977 100644
--- a/src/gui/editors/guitar/ChordMap.h
+++ b/src/gui/editors/guitar/ChordMap.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/ChordXmlHandler.cpp b/src/gui/editors/guitar/ChordXmlHandler.cpp
index 70fe8f2..54ca486 100644
--- a/src/gui/editors/guitar/ChordXmlHandler.cpp
+++ b/src/gui/editors/guitar/ChordXmlHandler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/editors/guitar/ChordXmlHandler.h b/src/gui/editors/guitar/ChordXmlHandler.h
index 00d6dc0..1865419 100644
--- a/src/gui/editors/guitar/ChordXmlHandler.h
+++ b/src/gui/editors/guitar/ChordXmlHandler.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp
index 00d81d1..3eb9f64 100644
--- a/src/gui/editors/guitar/Fingering.cpp
+++ b/src/gui/editors/guitar/Fingering.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/Fingering.h b/src/gui/editors/guitar/Fingering.h
index b19715b..148f660 100644
--- a/src/gui/editors/guitar/Fingering.h
+++ b/src/gui/editors/guitar/Fingering.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/FingeringBox.cpp b/src/gui/editors/guitar/FingeringBox.cpp
index 874ee26..80e70b1 100644
--- a/src/gui/editors/guitar/FingeringBox.cpp
+++ b/src/gui/editors/guitar/FingeringBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/FingeringBox.h b/src/gui/editors/guitar/FingeringBox.h
index e945bbb..86d2198 100644
--- a/src/gui/editors/guitar/FingeringBox.h
+++ b/src/gui/editors/guitar/FingeringBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/FingeringListBoxItem.cpp b/src/gui/editors/guitar/FingeringListBoxItem.cpp
index a94a644..84a8e2d 100644
--- a/src/gui/editors/guitar/FingeringListBoxItem.cpp
+++ b/src/gui/editors/guitar/FingeringListBoxItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/FingeringListBoxItem.h b/src/gui/editors/guitar/FingeringListBoxItem.h
index 6d6a74b..487592e 100644
--- a/src/gui/editors/guitar/FingeringListBoxItem.h
+++ b/src/gui/editors/guitar/FingeringListBoxItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
index 8fba984..316cf99 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.h b/src/gui/editors/guitar/GuitarChordEditorDialog.h
index c20ddc9..8ce7ec2 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.h
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
index eecf945..29ee504 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.h b/src/gui/editors/guitar/GuitarChordSelectorDialog.h
index 2fa4330..11b55a1 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.h
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/guitar/NoteSymbols.cpp b/src/gui/editors/guitar/NoteSymbols.cpp
index 7a5bc0e..465bca9 100644
--- a/src/gui/editors/guitar/NoteSymbols.cpp
+++ b/src/gui/editors/guitar/NoteSymbols.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file contains code from
Other copyrights also apply to some parts of this work. Please
diff --git a/src/gui/editors/guitar/NoteSymbols.h b/src/gui/editors/guitar/NoteSymbols.h
index 959796e..2df30d0 100644
--- a/src/gui/editors/guitar/NoteSymbols.h
+++ b/src/gui/editors/guitar/NoteSymbols.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file contains code from
Other copyrights also apply to some parts of this work. Please
diff --git a/src/gui/editors/matrix/MatrixCommandRegistry.cpp b/src/gui/editors/matrix/MatrixCommandRegistry.cpp
index a5868ca..8da9c96 100644
--- a/src/gui/editors/matrix/MatrixCommandRegistry.cpp
+++ b/src/gui/editors/matrix/MatrixCommandRegistry.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixCommandRegistry.h b/src/gui/editors/matrix/MatrixCommandRegistry.h
index 365dd58..df91918 100644
--- a/src/gui/editors/matrix/MatrixCommandRegistry.h
+++ b/src/gui/editors/matrix/MatrixCommandRegistry.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixElement.cpp b/src/gui/editors/matrix/MatrixElement.cpp
index 40eb23b..cb49a20 100644
--- a/src/gui/editors/matrix/MatrixElement.cpp
+++ b/src/gui/editors/matrix/MatrixElement.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -151,7 +151,10 @@ MatrixElement::reconfigure(timeT time, timeT duration, int pitch, int velocity)
m_scene->addItem(m_item);
}
float width = m_width;
- if (width < 1) width = 1;
+ if (width < 1) {
+ x0 = std::max(0.0, x1 - 1);
+ width = 1;
+ }
QRectF rect(0, 0, width, fres + 1);
item->setRect(rect);
item->setPen
@@ -189,11 +192,11 @@ MatrixElement::setSelected(bool selected)
dynamic_cast<QAbstractGraphicsShapeItem *>(m_item);
if (!item) return;
- QColor colour;
-
if (selected) {
- item->setPen(QPen(GUIPalette::getColour(GUIPalette::SelectedElement),
- 2, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin));
+ QPen pen(GUIPalette::getColour(GUIPalette::SelectedElement), 2,
+ Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
+ pen.setCosmetic(!m_drum);
+ item->setPen(pen);
} else {
item->setPen
(QPen(GUIPalette::getColour(GUIPalette::MatrixElementBorder), 0));
diff --git a/src/gui/editors/matrix/MatrixElement.h b/src/gui/editors/matrix/MatrixElement.h
index b8186d5..627b26a 100644
--- a/src/gui/editors/matrix/MatrixElement.h
+++ b/src/gui/editors/matrix/MatrixElement.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp
index 5e296f9..94f2e77 100644
--- a/src/gui/editors/matrix/MatrixEraser.cpp
+++ b/src/gui/editors/matrix/MatrixEraser.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixEraser.h b/src/gui/editors/matrix/MatrixEraser.h
index 7db8f81..82bcc8d 100644
--- a/src/gui/editors/matrix/MatrixEraser.h
+++ b/src/gui/editors/matrix/MatrixEraser.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixMouseEvent.h b/src/gui/editors/matrix/MatrixMouseEvent.h
index bef8ce3..9537511 100644
--- a/src/gui/editors/matrix/MatrixMouseEvent.h
+++ b/src/gui/editors/matrix/MatrixMouseEvent.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index 17b8ff0..c3253cb 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -96,7 +96,10 @@ MatrixMover::handleLeftButtonPress(const MatrixMouseEvent *e)
m_currentViewSegment = e->viewSegment;
m_currentElement = e->element;
- m_clickSnappedLeftTime = e->snappedLeftTime;
+
+ timeT snappedAbsoluteLeftTime =
+ getSnapGrid()->snapTime(m_currentElement->getViewAbsoluteTime());
+ m_clickSnappedLeftDeltaTime = e->snappedLeftTime - snappedAbsoluteLeftTime;
m_quickCopy = (e->modifiers & Qt::ControlModifier);
@@ -122,7 +125,7 @@ MatrixMover::handleLeftButtonPress(const MatrixMouseEvent *e)
} else {
newSelection = new EventSelection(m_currentViewSegment->getSegment());
}
-
+
// if the selection already contains the event, remove it from the
// selection if shift is pressed
if (selection->contains(event)) {
@@ -132,6 +135,7 @@ MatrixMover::handleLeftButtonPress(const MatrixMouseEvent *e)
} else {
newSelection->addEvent(event);
}
+
m_scene->setSelection(newSelection, true);
selection = newSelection;
} else {
@@ -189,8 +193,7 @@ MatrixMover::handleMouseMove(const MatrixMouseEvent *e)
clearContextHelp();
}
- timeT newTime = m_currentElement->getViewAbsoluteTime() +
- (e->snappedLeftTime - m_clickSnappedLeftTime);
+ timeT newTime = e->snappedLeftTime - m_clickSnappedLeftDeltaTime;
int newPitch = e->pitch;
emit hoveredOverNoteChanged(newPitch, true, newTime);
@@ -204,7 +207,7 @@ MatrixMover::handleMouseMove(const MatrixMouseEvent *e)
if (m_currentElement->event()->has(PITCH)) {
diffPitch = newPitch - m_currentElement->event()->get<Int>(PITCH);
}
-
+
EventSelection* selection = m_scene->getSelection();
// factor in transpose to adjust the height calculation
@@ -233,9 +236,8 @@ MatrixMover::handleMouseMove(const MatrixMouseEvent *e)
element->reconfigure(newTime + diffTime,
element->getViewDuration(),
epitch + diffPitch);
-
+
element->setSelected(true);
-
}
if (newPitch != m_lastPlayedPitch) {
@@ -258,8 +260,7 @@ MatrixMover::handleMouseRelease(const MatrixMouseEvent *e)
if (!m_currentElement || !m_currentViewSegment) return;
- timeT newTime = m_currentElement->getViewAbsoluteTime() +
- (e->snappedLeftTime - m_clickSnappedLeftTime);
+ timeT newTime = e->snappedLeftTime - m_clickSnappedLeftDeltaTime;
int newPitch = e->pitch;
if (newPitch > 127) newPitch = 127;
diff --git a/src/gui/editors/matrix/MatrixMover.h b/src/gui/editors/matrix/MatrixMover.h
index 3ac4a80..8148a0f 100644
--- a/src/gui/editors/matrix/MatrixMover.h
+++ b/src/gui/editors/matrix/MatrixMover.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -66,7 +66,7 @@ protected:
MatrixElement *m_currentElement;
MatrixViewSegment *m_currentViewSegment;
- timeT m_clickSnappedLeftTime;
+ timeT m_clickSnappedLeftDeltaTime;
std::vector<MatrixElement *> m_duplicateElements;
bool m_quickCopy;
diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp
index 9be0d74..148947f 100644
--- a/src/gui/editors/matrix/MatrixPainter.cpp
+++ b/src/gui/editors/matrix/MatrixPainter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixPainter.h b/src/gui/editors/matrix/MatrixPainter.h
index 3104110..02518d1 100644
--- a/src/gui/editors/matrix/MatrixPainter.h
+++ b/src/gui/editors/matrix/MatrixPainter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index ef7c904..0530e83 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixResizer.h b/src/gui/editors/matrix/MatrixResizer.h
index d21d705..78c6ebb 100644
--- a/src/gui/editors/matrix/MatrixResizer.h
+++ b/src/gui/editors/matrix/MatrixResizer.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixScene.cpp b/src/gui/editors/matrix/MatrixScene.cpp
index 85e9139..cc59f67 100644
--- a/src/gui/editors/matrix/MatrixScene.cpp
+++ b/src/gui/editors/matrix/MatrixScene.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -603,16 +603,26 @@ MatrixScene::slotCommandExecuted()
void
MatrixScene::checkUpdate()
{
+ bool updateSelectionElementStatus = false;
+
for (unsigned int i = 0; i < m_viewSegments.size(); ++i) {
SegmentRefreshStatus &rs = m_viewSegments[i]->getRefreshStatus();
-
+
if (rs.needsRefresh()) {
m_viewSegments[i]->updateElements(rs.from(), rs.to());
+ if (!updateSelectionElementStatus && m_selection) {
+ updateSelectionElementStatus =
+ (m_viewSegments[i]->getSegment() == m_selection->getSegment());
+ }
}
-
+
rs.setNeedsRefresh(false);
}
+
+ if (updateSelectionElementStatus) {
+ setSelectionElementStatus(m_selection, true);
+ }
}
void
diff --git a/src/gui/editors/matrix/MatrixScene.h b/src/gui/editors/matrix/MatrixScene.h
index d760b20..1b9d96b 100644
--- a/src/gui/editors/matrix/MatrixScene.h
+++ b/src/gui/editors/matrix/MatrixScene.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index 276e29a..cd7d063 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixSelector.h b/src/gui/editors/matrix/MatrixSelector.h
index ecc84d4..ad87145 100644
--- a/src/gui/editors/matrix/MatrixSelector.h
+++ b/src/gui/editors/matrix/MatrixSelector.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixTool.cpp b/src/gui/editors/matrix/MatrixTool.cpp
index 6686122..0f619c5 100644
--- a/src/gui/editors/matrix/MatrixTool.cpp
+++ b/src/gui/editors/matrix/MatrixTool.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixTool.h b/src/gui/editors/matrix/MatrixTool.h
index be675d2..ca7753d 100644
--- a/src/gui/editors/matrix/MatrixTool.h
+++ b/src/gui/editors/matrix/MatrixTool.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixToolBox.cpp b/src/gui/editors/matrix/MatrixToolBox.cpp
index 2dc0663..8b6e748 100644
--- a/src/gui/editors/matrix/MatrixToolBox.cpp
+++ b/src/gui/editors/matrix/MatrixToolBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixToolBox.h b/src/gui/editors/matrix/MatrixToolBox.h
index 7f3a869..b79bc27 100644
--- a/src/gui/editors/matrix/MatrixToolBox.h
+++ b/src/gui/editors/matrix/MatrixToolBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixVelocity.cpp b/src/gui/editors/matrix/MatrixVelocity.cpp
index d53bc0a..4325f18 100644
--- a/src/gui/editors/matrix/MatrixVelocity.cpp
+++ b/src/gui/editors/matrix/MatrixVelocity.cpp
@@ -226,15 +226,18 @@ MatrixVelocity::handleMouseRelease(const MatrixMouseEvent *e)
commandLabel = tr("Change Velocities");
}
+ m_scene->setSelection(0, false);
+
CommandHistory::getInstance()->addCommand
(new ChangeVelocityCommand(m_velocityDelta, *selection, false));
+
+ m_scene->setSelection(selection, false);
}
// Reset the start of mousemove
m_velocityDelta = m_mouseStartY = 0;
m_currentElement = 0;
setBasicContextHelp();
- delete selection;
}
void
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 5e7e2de..09b2c7b 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical matrix editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -746,6 +746,8 @@ conformRulerSelectionState(void)
ControlRulerWidget * cr = m_matrixWidget->getControlsWidget();
if (cr->isAnyRulerVisible())
{
+ cr->slotSelectionChanged(getSelection());
+
enterActionState("have_control_ruler");
if (cr->hasSelection())
{ enterActionState("have_controller_selection"); }
@@ -1645,13 +1647,17 @@ MatrixView::slotInsertableNoteEventReceived(int pitch, int velocity, bool noteOn
MATRIX_DEBUG << "WARNING: No toggle_step_by_step action" << endl;
return ;
}
- if (!action->isChecked())
- return ;
-// if (m_inPaintEvent) {
-// m_pendingInsertableNotes.push_back(std::pair<int, int>(pitch, velocity));
-// return ;
-// }
+ // return if not in step recording mode
+ if (!action->isChecked()) return;
+
+ // return if this window isn't active, to avoid filling a forgotten edit
+ // view with garbage while banging away in some other window.
+ //
+ // NOTE: This prevents using something like VMPK for step recording, but I
+ // see no better alternative.
+ if (!isActiveWindow()) return;
+
Segment *segment = getCurrentSegment();
@@ -1727,13 +1733,8 @@ MatrixView::slotInsertableNoteEventReceived(int pitch, int velocity, bool noteOn
timeT endTime(insertionTime + getSnapGrid()->getSnapTime(insertionTime));
if (endTime <= insertionTime) {
- static bool showingError = false;
- if (showingError)
- return ;
- showingError = true;
- QMessageBox::warning(this, tr("Rosegarden"), tr("Can't insert note: No grid duration selected"));
- showingError = false;
- return ;
+ // Fail silently, as in notation view
+ return;
}
MatrixInsertionCommand* command =
diff --git a/src/gui/editors/matrix/MatrixView.h b/src/gui/editors/matrix/MatrixView.h
index 04703ad..2474b4c 100644
--- a/src/gui/editors/matrix/MatrixView.h
+++ b/src/gui/editors/matrix/MatrixView.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixViewSegment.cpp b/src/gui/editors/matrix/MatrixViewSegment.cpp
index e77e253..87daabb 100644
--- a/src/gui/editors/matrix/MatrixViewSegment.cpp
+++ b/src/gui/editors/matrix/MatrixViewSegment.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixViewSegment.h b/src/gui/editors/matrix/MatrixViewSegment.h
index 5e428ea..0e2cf38 100644
--- a/src/gui/editors/matrix/MatrixViewSegment.h
+++ b/src/gui/editors/matrix/MatrixViewSegment.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/MatrixWidget.cpp b/src/gui/editors/matrix/MatrixWidget.cpp
index 2a2af7e..b629d89 100644
--- a/src/gui/editors/matrix/MatrixWidget.cpp
+++ b/src/gui/editors/matrix/MatrixWidget.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -62,6 +62,7 @@
#include "gui/rulers/StandardRuler.h"
#include "gui/rulers/TempoRuler.h"
#include "gui/rulers/ChordNameRuler.h"
+#include "gui/rulers/LoopRuler.h"
#include "gui/general/IconLoader.h"
@@ -80,6 +81,7 @@
#include "base/Controllable.h"
#include "base/Studio.h"
#include "base/Instrument.h"
+#include "base/InstrumentStaticSignals.h"
#include "base/Device.h"
#include "base/MidiDevice.h"
#include "base/SoftSynthDevice.h"
@@ -319,6 +321,14 @@ MatrixWidget::MatrixWidget(bool drumMode) :
// button isn't pressed. This way the keys on the piano keyboard
// to the left are always highlighted to show which note we are on.
m_view->setMouseTracking(true);
+
+ // Hold on to this to make sure it stays around as long as we do.
+ m_instrumentStaticSignals = Instrument::getStaticSignals();
+
+ connect(m_instrumentStaticSignals.data(),
+ SIGNAL(changed(Instrument *)),
+ this,
+ SLOT(slotInstrumentChanged(Instrument *)));
}
MatrixWidget::~MatrixWidget()
@@ -458,6 +468,11 @@ MatrixWidget::setSegments(RosegardenDocument *document,
connect(m_bottomStandardRuler, SIGNAL(dragPointerToPosition(timeT)),
this, SLOT(slotPointerPositionChanged(timeT)));
+ connect(m_topStandardRuler->getLoopRuler(), SIGNAL(dragLoopToPosition(timeT)),
+ this, SLOT(slotEnsureTimeVisible(timeT)));
+ connect(m_bottomStandardRuler->getLoopRuler(), SIGNAL(dragLoopToPosition(timeT)),
+ this, SLOT(slotEnsureTimeVisible(timeT)));
+
connect(m_document, SIGNAL(pointerPositionChanged(timeT)),
this, SLOT(slotPointerPositionChanged(timeT)));
@@ -589,23 +604,45 @@ MatrixWidget::generatePitchRuler()
}
void
-MatrixWidget::slotPercussionSetChanged(Instrument *instr)
+MatrixWidget::slotInstrumentChanged(Instrument *instrument)
{
- //@@@ In spite of its name (and of the name of the signal which trigs it),
- // this slot is called each time some change happens in any instrument
- // and not only when a percussion set changes [true in rev. 11782].
+ // This covers the test case when the user toggles the "Percussion"
+ // checkbox on the MIPP.
+
+ if (m_instrument->getId() == instrument->getId()) {
+
+ // ??? Can we further determine whether the Percussion state
+ // (instrument->isPercussion()) has really changed?
+ // We probably need to cache this in a member.
+ generatePitchRuler();
+ }
+}
+
+void
+MatrixWidget::slotPercussionSetChanged(Instrument *instr)
+{
// Regenerate the pitchruler if the instrument which changed
// is the current one...
if (instr == m_instrument) {
generatePitchRuler();
} else {
+ // m_instrument might not be pointing at the Instrument we are
+ // displaying. This will happen if the user changes the Instrument
+ // for the Segment that we are displaying.
+
Composition &comp = m_document->getComposition();
- Track *track = comp.getTrackById(m_scene->getCurrentSegment()->
- getTrack());
- Instrument *currInstr = m_document->getStudio().
- getInstrumentById(track->getInstrument());
- // ...or if the new current instrument appears to be one which changes.
+
+ // Get the Track for the segment we (MatrixScene) are displaying.
+ Track *track = comp.getTrackById(
+ m_scene->getCurrentSegment()->getTrack());
+
+ // Get the Instrument for the segment we are displaying.
+ Instrument *currInstr =
+ m_document->getStudio().getInstrumentById(track->getInstrument());
+
+ // If the Instrument that is changing is indeed the Instrument for
+ // the segment we are displaying, update the pitch ruler.
if (currInstr == instr) {
generatePitchRuler();
}
@@ -1393,7 +1430,7 @@ void MatrixWidget::slotKeySelected(unsigned int y, bool repeating)
slotHoveredOverKeyChanged(y);
-// getCanvasView()->slotScrollVertSmallSteps(y);
+// getCanvasView()->scrollVertSmallSteps(y);
int evPitch = m_scene->calculatePitchFromY(y);
diff --git a/src/gui/editors/matrix/MatrixWidget.h b/src/gui/editors/matrix/MatrixWidget.h
index 1f2c94c..f23d3d9 100644
--- a/src/gui/editors/matrix/MatrixWidget.h
+++ b/src/gui/editors/matrix/MatrixWidget.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -20,6 +20,7 @@
#include <QWidget>
#include <QPushButton>
+#include <QSharedPointer>
#include "base/Event.h" // for timeT
#include "base/MidiTypes.h" // for MidiByte
@@ -55,6 +56,8 @@ class TempoRuler;
class ChordNameRuler;
class Device;
class Instrument;
+class InstrumentStaticSignals;
+
/**
* Container widget for the matrix editor (which is a QGraphicsView)
@@ -199,6 +202,9 @@ protected slots:
void slotMouseLeavesView();
/// Pitch ruler may need regeneration
+ void slotInstrumentChanged(Instrument *instrument);
+
+ /// Pitch ruler may need regeneration
void slotPercussionSetChanged(Instrument *instr);
/// Instrument is being destroyed
@@ -301,6 +307,8 @@ private:
MAIN_COL,
};
+ QSharedPointer<InstrumentStaticSignals> m_instrumentStaticSignals;
+
};
}
diff --git a/src/gui/editors/matrix/PianoKeyboard.cpp b/src/gui/editors/matrix/PianoKeyboard.cpp
index d8bef3c..f6cb8a3 100644
--- a/src/gui/editors/matrix/PianoKeyboard.cpp
+++ b/src/gui/editors/matrix/PianoKeyboard.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/matrix/PianoKeyboard.h b/src/gui/editors/matrix/PianoKeyboard.h
index de21e8c..e80aa3a 100644
--- a/src/gui/editors/matrix/PianoKeyboard.h
+++ b/src/gui/editors/matrix/PianoKeyboard.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/BarLineItem.cpp b/src/gui/editors/notation/BarLineItem.cpp
index ea3d29c..b118550 100644
--- a/src/gui/editors/notation/BarLineItem.cpp
+++ b/src/gui/editors/notation/BarLineItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/BarLineItem.h b/src/gui/editors/notation/BarLineItem.h
index cbf141e..0c903d1 100644
--- a/src/gui/editors/notation/BarLineItem.h
+++ b/src/gui/editors/notation/BarLineItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/ClefInserter.cpp b/src/gui/editors/notation/ClefInserter.cpp
index 384f5d6..aa8d2d6 100644
--- a/src/gui/editors/notation/ClefInserter.cpp
+++ b/src/gui/editors/notation/ClefInserter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/ClefInserter.h b/src/gui/editors/notation/ClefInserter.h
index e12e1e2..d8ff0a9 100644
--- a/src/gui/editors/notation/ClefInserter.h
+++ b/src/gui/editors/notation/ClefInserter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/ClefKeyContext.cpp b/src/gui/editors/notation/ClefKeyContext.cpp
index 14dfddf..871a53f 100644
--- a/src/gui/editors/notation/ClefKeyContext.cpp
+++ b/src/gui/editors/notation/ClefKeyContext.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/ClefKeyContext.h b/src/gui/editors/notation/ClefKeyContext.h
index 1fc9d87..bab8f4a 100644
--- a/src/gui/editors/notation/ClefKeyContext.h
+++ b/src/gui/editors/notation/ClefKeyContext.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index a11e45b..23d9808 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h
index c4a62d8..59aaa0b 100644
--- a/src/gui/editors/notation/FontViewFrame.h
+++ b/src/gui/editors/notation/FontViewFrame.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/GuitarChordInserter.cpp b/src/gui/editors/notation/GuitarChordInserter.cpp
index 217c761..7b2e9a3 100644
--- a/src/gui/editors/notation/GuitarChordInserter.cpp
+++ b/src/gui/editors/notation/GuitarChordInserter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/GuitarChordInserter.h b/src/gui/editors/notation/GuitarChordInserter.h
index f545822..c1b79c1 100644
--- a/src/gui/editors/notation/GuitarChordInserter.h
+++ b/src/gui/editors/notation/GuitarChordInserter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/HeadersGroup.cpp b/src/gui/editors/notation/HeadersGroup.cpp
index bd629a9..5ebd808 100644
--- a/src/gui/editors/notation/HeadersGroup.cpp
+++ b/src/gui/editors/notation/HeadersGroup.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2007-2009
Yves Guillemot <yc.guillemot at wanadoo.fr>
diff --git a/src/gui/editors/notation/HeadersGroup.h b/src/gui/editors/notation/HeadersGroup.h
index 0aa334b..072f74c 100644
--- a/src/gui/editors/notation/HeadersGroup.h
+++ b/src/gui/editors/notation/HeadersGroup.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2007-2009
Yves Guillemot <yc.guillemot at wanadoo.fr>
diff --git a/src/gui/editors/notation/Inconsistencies.h b/src/gui/editors/notation/Inconsistencies.h
index f3a966b..f5dd20d 100644
--- a/src/gui/editors/notation/Inconsistencies.h
+++ b/src/gui/editors/notation/Inconsistencies.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/editors/notation/NotationChord.cpp b/src/gui/editors/notation/NotationChord.cpp
index 4033408..71cecf1 100644
--- a/src/gui/editors/notation/NotationChord.cpp
+++ b/src/gui/editors/notation/NotationChord.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationChord.h b/src/gui/editors/notation/NotationChord.h
index 0d8329d..a23a850 100644
--- a/src/gui/editors/notation/NotationChord.h
+++ b/src/gui/editors/notation/NotationChord.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationCommandRegistry.cpp b/src/gui/editors/notation/NotationCommandRegistry.cpp
index 7e69de6..87b2d8a 100644
--- a/src/gui/editors/notation/NotationCommandRegistry.cpp
+++ b/src/gui/editors/notation/NotationCommandRegistry.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -49,6 +49,7 @@
#include "commands/notation/UnTupletCommand.h"
#include "commands/notation/UntieNotesCommand.h"
+
namespace Rosegarden
{
diff --git a/src/gui/editors/notation/NotationCommandRegistry.h b/src/gui/editors/notation/NotationCommandRegistry.h
index 7982b07..42f006f 100644
--- a/src/gui/editors/notation/NotationCommandRegistry.h
+++ b/src/gui/editors/notation/NotationCommandRegistry.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationElement.cpp b/src/gui/editors/notation/NotationElement.cpp
index 1cb2ddc..2bfd4f3 100644
--- a/src/gui/editors/notation/NotationElement.cpp
+++ b/src/gui/editors/notation/NotationElement.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationElement.h b/src/gui/editors/notation/NotationElement.h
index 5445dd4..d8ca499 100644
--- a/src/gui/editors/notation/NotationElement.h
+++ b/src/gui/editors/notation/NotationElement.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index 85b4b31..b01a430 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationEraser.h b/src/gui/editors/notation/NotationEraser.h
index e8cb629..8b7063e 100644
--- a/src/gui/editors/notation/NotationEraser.h
+++ b/src/gui/editors/notation/NotationEraser.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationGroup.cpp b/src/gui/editors/notation/NotationGroup.cpp
index 227d4b2..8c21f44 100644
--- a/src/gui/editors/notation/NotationGroup.cpp
+++ b/src/gui/editors/notation/NotationGroup.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationGroup.h b/src/gui/editors/notation/NotationGroup.h
index f05f7de..48850c0 100644
--- a/src/gui/editors/notation/NotationGroup.h
+++ b/src/gui/editors/notation/NotationGroup.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 2816871..e6a9ed3 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationHLayout.h b/src/gui/editors/notation/NotationHLayout.h
index bb3bc4a..3a8362c 100644
--- a/src/gui/editors/notation/NotationHLayout.h
+++ b/src/gui/editors/notation/NotationHLayout.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationMouseEvent.h b/src/gui/editors/notation/NotationMouseEvent.h
index 2bfcf68..2a304fe 100644
--- a/src/gui/editors/notation/NotationMouseEvent.h
+++ b/src/gui/editors/notation/NotationMouseEvent.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationProperties.cpp b/src/gui/editors/notation/NotationProperties.cpp
index 330b4bb..dff6f87 100644
--- a/src/gui/editors/notation/NotationProperties.cpp
+++ b/src/gui/editors/notation/NotationProperties.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationProperties.h b/src/gui/editors/notation/NotationProperties.h
index 4237421..46abbfa 100644
--- a/src/gui/editors/notation/NotationProperties.h
+++ b/src/gui/editors/notation/NotationProperties.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationScene.cpp b/src/gui/editors/notation/NotationScene.cpp
index 3cbe934..9805873 100644
--- a/src/gui/editors/notation/NotationScene.cpp
+++ b/src/gui/editors/notation/NotationScene.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationScene.h b/src/gui/editors/notation/NotationScene.h
index 67d5530..3864bdf 100644
--- a/src/gui/editors/notation/NotationScene.h
+++ b/src/gui/editors/notation/NotationScene.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index 57eae76..92c2f72 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -554,7 +554,10 @@ void NotationSelector::drag(int x, int y, bool final)
*selection));
haveSomething = true;
} else {
- if (dragTime != clickedTime) {
+ timeT endTime = m_selectedStaff->getSegment().getEndTime();
+ timeT newEndTime = dragTime + selection->getTotalDuration();
+
+ if (dragTime != clickedTime && newEndTime <= endTime) {
mc = new MoveCommand
(m_selectedStaff->getSegment(), //!!!sort
dragTime - clickedTime, true, *selection);
diff --git a/src/gui/editors/notation/NotationSelector.h b/src/gui/editors/notation/NotationSelector.h
index cbbc559..616f89d 100644
--- a/src/gui/editors/notation/NotationSelector.h
+++ b/src/gui/editors/notation/NotationSelector.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index a76c768..a6bcdc8 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -1739,6 +1739,10 @@ NotationStaff::renderNote(ViewElementList::iterator &vli)
factory = m_graceNotePixmapFactory;
}
+ bool memberOfParallel = false;
+ elt->event()->get<Bool>(BaseProperties::MEMBER_OF_PARALLEL, memberOfParallel);
+ params.setMemberOfParallel(memberOfParallel);
+
if (m_printPainter) {
// Return no scene item, but instead render straight to
diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h
index 5afd4d0..d66899d 100644
--- a/src/gui/editors/notation/NotationStaff.h
+++ b/src/gui/editors/notation/NotationStaff.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index 57c579d..ecb4bad 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationStrings.h b/src/gui/editors/notation/NotationStrings.h
index b359d06..81d9ab8 100644
--- a/src/gui/editors/notation/NotationStrings.h
+++ b/src/gui/editors/notation/NotationStrings.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationTool.cpp b/src/gui/editors/notation/NotationTool.cpp
index b778aff..46f8a1b 100644
--- a/src/gui/editors/notation/NotationTool.cpp
+++ b/src/gui/editors/notation/NotationTool.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationTool.h b/src/gui/editors/notation/NotationTool.h
index 34fe0ac..3c4b77d 100644
--- a/src/gui/editors/notation/NotationTool.h
+++ b/src/gui/editors/notation/NotationTool.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp
index 851a53c..f60f62a 100644
--- a/src/gui/editors/notation/NotationToolBox.cpp
+++ b/src/gui/editors/notation/NotationToolBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationToolBox.h b/src/gui/editors/notation/NotationToolBox.h
index 8e9c5f3..79f297a 100644
--- a/src/gui/editors/notation/NotationToolBox.h
+++ b/src/gui/editors/notation/NotationToolBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp
index 648440c..2729871 100644
--- a/src/gui/editors/notation/NotationVLayout.cpp
+++ b/src/gui/editors/notation/NotationVLayout.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationVLayout.h b/src/gui/editors/notation/NotationVLayout.h
index b548240..9b52406 100644
--- a/src/gui/editors/notation/NotationVLayout.h
+++ b/src/gui/editors/notation/NotationVLayout.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 7f8f92c..aec4468 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -130,6 +130,8 @@
#include "gui/dialogs/SimpleEventEditDialog.h"
#include "gui/dialogs/ConfigureDialog.h"
+#include "gui/dialogs/CheckForParallelsDialog.h"
+
#include "gui/general/IconLoader.h"
#include "gui/general/LilyPondProcessor.h"
#include "gui/general/PresetHandlerDialog.h"
@@ -541,6 +543,7 @@ NotationView::setupActions()
//"document" Menubar menu
createAction("add_tempo", SLOT(slotAddTempo()));
createAction("add_time_signature", SLOT(slotAddTimeSignature()));
+ createAction("check_for_parallels", SLOT(slotCheckForParallels()));
//"segment" Menubar menu
// "open-with" subMenu
@@ -1184,6 +1187,8 @@ conformRulerSelectionState(void)
ControlRulerWidget * cr = m_notationWidget->getControlsWidget();
if (cr->isAnyRulerVisible())
{
+ cr->slotSelectionChanged(getSelection());
+
enterActionState("have_control_ruler");
if (cr->hasSelection())
{ enterActionState("have_controller_selection"); }
@@ -1686,7 +1691,9 @@ NotationView::slotEditPaste()
msgBox.setWindowTitle(tr("Rosegarden"));
msgBox.setIcon(QMessageBox::Warning);
msgBox.setText(tr("Couldn't paste at this point."));
- msgBox.setInformativeText(tr("<qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt>"));
+ if (defaultType == PasteEventsCommand::Restricted) {
+ msgBox.setInformativeText(tr("<qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt>"));
+ }
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.exec();
@@ -1742,7 +1749,9 @@ NotationView::slotEditGeneralPaste()
msgBox.setWindowTitle(tr("Rosegarden"));
msgBox.setIcon(QMessageBox::Warning);
msgBox.setText(tr("Couldn't paste at this point."));
- msgBox.setInformativeText(tr("<qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt>"));
+ if (type == PasteEventsCommand::Restricted) {
+ msgBox.setInformativeText(tr("<qt><p>The Restricted paste type requires enough empty space (containing only rests) at the paste position to hold all of the events to be pasted.</p><p>Not enough space was found.</p><p>If you want to paste anyway, consider using one of the other paste types from the <b>Paste...</b> option on the Edit menu. You can also change the default paste type to something other than Restricted if you wish.</p></qt>"));
+ }
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.exec();
@@ -3362,6 +3371,7 @@ NotationView::slotEditAddSustain(bool down)
instrument->getDevice()->getType() == Device::SoftSynth) {
CommandHistory::getInstance()->addCommand(
new SustainInsertionCommand(*segment, insertionTime, down, 64));
+ return;
}
}
}
@@ -3559,6 +3569,26 @@ NotationView::slotAddTimeSignature()
delete dialog;
}
+// check composition for parallels
+
+void
+NotationView::slotCheckForParallels()
+{
+ qDebug() << "check for parallels...";
+
+ Segment *segment = getCurrentSegment();
+
+ if (!segment) return ;
+
+ Composition *composition = segment->getComposition();
+
+ CheckForParallelsDialog *dialog = 0;
+
+ dialog = new CheckForParallelsDialog(this, m_document, m_notationWidget->getScene(), composition);
+
+ dialog->show();
+}
+
void
NotationView::slotToggleRawNoteRuler()
{
@@ -4161,44 +4191,36 @@ void
//NotationView::slotInsertableNoteEventReceived(int pitch, int velocity, bool noteOn)
NotationView::slotInsertableNoteEventReceived(int pitch, int velocity, bool noteOn)
{
- // NOTE: these next comments are from before 1.0, and that should be
- // understood when considering them in relation to Thorn
- //
- //!!! Problematic. Ideally we wouldn't insert events into windows
- //that weren't actually visible, otherwise all hell could break
- //loose (metaphorically speaking, I should probably add). I did
- //think of checking isActiveWindow() and returning if the current
- //window wasn't active, but that will prevent anyone from
- //step-recording from e.g. vkeybd, which cannot be used without
- //losing focus (and thus active-ness) from the Rosegarden window.
-
- //!!! I know -- we'll keep track of which edit view (or main view,
- //or mixer, etc) is active, and we'll only allow insertion into
- //the most recently activated. How about that?
-
- /* was toggle */
-// QAction *action = dynamic_cast<QAction*>
-// (actionCollection()->action("toggle_step_by_step"));
- QAction *action = findAction("toggle_step_by_step");
+
+ // find step recording action in menu (it ought to exist!)
+ QAction *action = findAction("toggle_step_by_step");
if (!action) {
NOTATION_DEBUG << "WARNING: No toggle_step_by_step action" << endl;
return ;
}
- if (!action->isChecked())
- return ;
+
+ // return if we're not in step recording (step by step) mode
+ if (!action->isChecked()) return ;
+
+ // return if this window is not active, to avoid a window that is out of
+ // sight and out of mind filling rapidly with unexpected gibberish which has
+ // to be undone one event at a time
+ //
+ // NOTE: This prevents using step recording mode with an external app like
+ // VMPK. I can't think of any other way to avoid the far greater problem of
+ // having to undo 15,000 unexpected events you didn't intend to record in an
+ // out of focus view that got left in step record mode.
+ if (!isActiveWindow()) return;
Segment *segment = getCurrentSegment();
NoteRestInserter *noteInserter = dynamic_cast<NoteRestInserter *>
(m_notationWidget->getCurrentTool());
if (!noteInserter) {
- static bool showingError = false;
- if (showingError)
- return ;
- showingError = true;
- QMessageBox::warning(this, tr("Rosegarden"), tr("Can't insert note: No note duration selected"));
- showingError = false;
- return ;
+ // The old behavior was totally evil, so let's try failing silently and
+ // see how obnoxious it is for the user to discover the hard way that
+ // nothing is happening, because the wrong tool is selected.
+ return;
}
// if (m_inPaintEvent) {
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 9836bcf..265dee3 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -284,6 +284,8 @@ protected slots:
void slotAddTempo();
void slotAddTimeSignature();
+ void slotCheckForParallels();
+
void slotToggleGeneralToolBar();
void slotToggleToolsToolBar();
void slotToggleDurationToolBar();
diff --git a/src/gui/editors/notation/NotationWidget.cpp b/src/gui/editors/notation/NotationWidget.cpp
index e919fcd..3e47461 100644
--- a/src/gui/editors/notation/NotationWidget.cpp
+++ b/src/gui/editors/notation/NotationWidget.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -65,6 +65,7 @@
#include "gui/rulers/TempoRuler.h"
#include "gui/rulers/ChordNameRuler.h"
#include "gui/rulers/RawNoteRuler.h"
+#include "gui/rulers/LoopRuler.h"
#include "gui/seqmanager/SequenceManager.h"
@@ -114,7 +115,6 @@ NotationWidget::NotationWidget() :
m_headersNeedRegeneration(false),
m_headersTimer(0),
m_layout(0),
- m_linearMode(true),
m_tempoRulerIsVisible(false),
m_rawNoteRulerIsVisible(false),
m_chordNameRulerIsVisible(false),
@@ -481,10 +481,8 @@ NotationWidget::setSegments(RosegardenDocument *document,
connect(m_view, SIGNAL(pannedRectChanged(QRectF)),
m_controlsWidget, SLOT(slotSetPannedRect(QRectF)));
- // There's a slotEnsureTimeVisible in MatrixWidget. Maybe this was
- // copied from there?
- //connect(m_controlsWidget, SIGNAL(dragScroll(timeT)),
- // this, SLOT(slotEnsureTimeVisible(timeT)));
+ connect(m_controlsWidget, SIGNAL(dragScroll(timeT)),
+ this, SLOT(slotEnsureTimeVisible(timeT)));
connect(m_scene, SIGNAL(layoutUpdated(timeT,timeT)),
m_controlsWidget, SLOT(slotUpdateRulers(timeT,timeT)));
@@ -538,6 +536,11 @@ NotationWidget::setSegments(RosegardenDocument *document,
connect(m_bottomStandardRuler, SIGNAL(dragPointerToPosition(timeT)),
this, SLOT(slotPointerPositionChanged(timeT)));
+ connect(m_topStandardRuler->getLoopRuler(), SIGNAL(dragLoopToPosition(timeT)),
+ this, SLOT(slotEnsureTimeVisible(timeT)));
+ connect(m_bottomStandardRuler->getLoopRuler(), SIGNAL(dragLoopToPosition(timeT)),
+ this, SLOT(slotEnsureTimeVisible(timeT)));
+
connect(m_document, SIGNAL(pointerPositionChanged(timeT)),
this, SLOT(slotPointerPositionChanged(timeT)));
@@ -602,6 +605,8 @@ NotationWidget::resumeLayoutUpdates()
void
NotationWidget::slotGenerateHeaders()
{
+ if (!linearMode()) return; // Staff headers don't exist out of linear mode
+
m_headersNeedRegeneration = false;
if (m_headersGroup) disconnect(m_headersGroup, SIGNAL(headersResized(int)),
@@ -612,6 +617,7 @@ NotationWidget::slotGenerateHeaders()
m_headersGroup->setFixedSize(m_headersGroup->sizeHint());
m_headersView->setFixedWidth(m_headersGroup->sizeHint().width());
+ m_headersButtons->setFixedWidth(m_headersGroup->sizeHint().width());
delete m_headersScene; // delete the old m_headersGroup if any
m_headersScene = new QGraphicsScene();
@@ -680,6 +686,13 @@ NotationWidget::locatePanner(bool tall)
}
}
+bool
+NotationWidget::linearMode()
+{
+ if (!m_scene) return true; // Default to true when no scene
+ return m_scene->getPageMode() == StaffLayout::LinearMode;
+}
+
void
NotationWidget::slotSetLinearMode()
{
@@ -688,7 +701,6 @@ NotationWidget::slotSetLinearMode()
locatePanner(false);
}
m_scene->setPageMode(StaffLayout::LinearMode);
- m_linearMode = true;
hideOrShowRulers();
}
@@ -699,7 +711,6 @@ NotationWidget::slotSetContinuousPageMode()
if (m_scene->getPageMode() == StaffLayout::ContinuousPageMode) return;
locatePanner(true);
m_scene->setPageMode(StaffLayout::ContinuousPageMode);
- m_linearMode = false;
hideOrShowRulers();
}
@@ -711,7 +722,6 @@ NotationWidget::slotSetMultiPageMode()
locatePanner(false);
}
m_scene->setPageMode(StaffLayout::MultiPageMode);
- m_linearMode = false;
hideOrShowRulers();
}
@@ -964,11 +974,11 @@ NotationWidget::slotDispatchMouseMove(const NotationMouseEvent *e)
if (getCanvasView()->isTimeForSmoothScroll()) {
if (follow & RosegardenScrollView::FollowHorizontal) {
- getCanvasView()->slotScrollHorizSmallSteps(e->x());
+ getCanvasView()->scrollHorizSmallSteps(e->x());
}
if (follow & RosegardenScrollView::FollowVertical) {
- getCanvasView()->slotScrollVertSmallSteps(e->y());
+ getCanvasView()->scrollVertSmallSteps(e->y());
}
}
@@ -989,6 +999,17 @@ NotationWidget::slotEnsureLastMouseMoveVisible()
}
void
+NotationWidget::slotEnsureTimeVisible(timeT t)
+{
+ m_inMove = true;
+ QPointF pos = m_view->mapToScene(0,m_view->height()/2);
+ pos.setX(m_scene->getRulerScale()->getXForTime(t));
+ if (m_scene) m_scene->constrainToSegmentArea(pos);
+ m_view->ensureVisible(QRectF(pos, pos));
+ m_inMove = false;
+}
+
+void
NotationWidget::slotDispatchMouseRelease(const NotationMouseEvent *e)
{
if (!m_currentTool) return;
@@ -1229,7 +1250,7 @@ NotationWidget::slotHScrollBarRangeChanged(int min, int max)
void
NotationWidget::setTempoRulerVisible(bool visible)
{
- if (visible && m_linearMode) m_tempoRuler->show();
+ if (visible && linearMode()) m_tempoRuler->show();
else m_tempoRuler->hide();
m_tempoRulerIsVisible = visible;
}
@@ -1237,7 +1258,7 @@ NotationWidget::setTempoRulerVisible(bool visible)
void
NotationWidget::setChordNameRulerVisible(bool visible)
{
- if (visible && m_linearMode) m_chordNameRuler->show();
+ if (visible && linearMode()) m_chordNameRuler->show();
else m_chordNameRuler->hide();
m_chordNameRulerIsVisible = visible;
}
@@ -1245,7 +1266,7 @@ NotationWidget::setChordNameRulerVisible(bool visible)
void
NotationWidget::setRawNoteRulerVisible(bool visible)
{
- if (visible && m_linearMode) m_rawNoteRuler->show();
+ if (visible && linearMode()) m_rawNoteRuler->show();
else m_rawNoteRuler->hide();
m_rawNoteRulerIsVisible = visible;
}
@@ -1254,7 +1275,7 @@ void
NotationWidget::setHeadersVisible(bool visible)
{
// Headers are shown in linear mode only
- if (visible && m_linearMode) {
+ if (visible && linearMode()) {
if (m_headersNeedRegeneration) slotGenerateHeaders();
m_headersView->show();
m_headersButtons->show();
@@ -1283,7 +1304,7 @@ NotationWidget::toggleHeadersView()
{
m_headersAreVisible = !m_headersAreVisible;
emit headersVisibilityChanged(m_headersAreVisible);
- if (m_headersAreVisible && m_linearMode) {
+ if (m_headersAreVisible && linearMode()) {
if (m_headersNeedRegeneration) slotGenerateHeaders();
m_headersView->show();
m_headersButtons->show();
@@ -1302,7 +1323,7 @@ NotationWidget::slotCloseHeaders()
void
NotationWidget::hideOrShowRulers()
{
- if (m_linearMode) {
+ if (linearMode()) {
if (m_tempoRulerIsVisible) m_tempoRuler->show();
if (m_rawNoteRulerIsVisible) m_rawNoteRuler->show();
if (m_chordNameRulerIsVisible) m_chordNameRuler->show();
@@ -1365,7 +1386,18 @@ NotationWidget::slotSetInsertedSymbol(Symbol type)
void
NotationWidget::setPointerPosition(timeT t)
{
+ // Fixes problem with sustaining notes while adding notes with
+ // the pencil tool. Also avoids moving playback position in
+ // playback mode, allowing editing of a loop in real-time.
+ disconnect(m_document, SIGNAL(pointerPositionChanged(timeT)),
+ RosegardenMainWindow::self(),
+ SLOT(slotSetPointerPosition(timeT)));
+
m_document->slotSetPointerPosition(t);
+
+ connect(m_document, SIGNAL(pointerPositionChanged(timeT)),
+ RosegardenMainWindow::self(),
+ SLOT(slotSetPointerPosition(timeT)));
}
void
@@ -1757,7 +1789,7 @@ NotationWidget::slotUpdateRawNoteRuler(ViewSegment *vs)
void
NotationWidget::slotRegenerateHeaders() {
// Don't use CPU time to regenerate headers if they are not visible
- if (m_linearMode && m_headersAreVisible) {
+ if (linearMode() && m_headersAreVisible) {
// When a clef or a key is modified, the signal "staffModified()" is
// emitted three times. A 100 ms delay, which should not be noticeable
// too much, is introduced here to avoid unnecessarily destroying and
diff --git a/src/gui/editors/notation/NotationWidget.h b/src/gui/editors/notation/NotationWidget.h
index 06606f7..c753065 100644
--- a/src/gui/editors/notation/NotationWidget.h
+++ b/src/gui/editors/notation/NotationWidget.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -175,6 +175,7 @@ public slots:
protected:
virtual void showEvent(QShowEvent * event);
void hideOrShowRulers();
+ bool linearMode(); // Return true when notation page layout is linear
protected slots:
void slotDispatchMousePress(const NotationMouseEvent *);
@@ -191,6 +192,7 @@ protected slots:
void slotHScroll();
void slotHScrollBarRangeChanged(int min, int max);
+ void slotEnsureTimeVisible(timeT);
/// The horizontal zoom thumbwheel moved
void slotHorizontalThumbwheelMoved(int);
@@ -286,7 +288,6 @@ private:
QGridLayout *m_layout; // I own this
- bool m_linearMode;
bool m_tempoRulerIsVisible; // Only valid in linear mode
bool m_rawNoteRulerIsVisible; // Only valid in linear mode
bool m_chordNameRulerIsVisible; // Only valid in linear mode
diff --git a/src/gui/editors/notation/NoteCharacter.cpp b/src/gui/editors/notation/NoteCharacter.cpp
index cd5dcd9..9b798a8 100644
--- a/src/gui/editors/notation/NoteCharacter.cpp
+++ b/src/gui/editors/notation/NoteCharacter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteCharacter.h b/src/gui/editors/notation/NoteCharacter.h
index d52b24e..7bf0940 100644
--- a/src/gui/editors/notation/NoteCharacter.h
+++ b/src/gui/editors/notation/NoteCharacter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteCharacterNames.cpp b/src/gui/editors/notation/NoteCharacterNames.cpp
index 2f7b808..f9f3253 100644
--- a/src/gui/editors/notation/NoteCharacterNames.cpp
+++ b/src/gui/editors/notation/NoteCharacterNames.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/editors/notation/NoteCharacterNames.h b/src/gui/editors/notation/NoteCharacterNames.h
index 24328e2..000f527 100644
--- a/src/gui/editors/notation/NoteCharacterNames.h
+++ b/src/gui/editors/notation/NoteCharacterNames.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp
index d6b818f..1a5cfc3 100644
--- a/src/gui/editors/notation/NoteFont.cpp
+++ b/src/gui/editors/notation/NoteFont.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteFont.h b/src/gui/editors/notation/NoteFont.h
index 0b92956..1aee6cb 100644
--- a/src/gui/editors/notation/NoteFont.h
+++ b/src/gui/editors/notation/NoteFont.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp
index 5b8c1ed..bd65c1e 100644
--- a/src/gui/editors/notation/NoteFontFactory.cpp
+++ b/src/gui/editors/notation/NoteFontFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteFontFactory.h b/src/gui/editors/notation/NoteFontFactory.h
index ed03d79..3feeb5b 100644
--- a/src/gui/editors/notation/NoteFontFactory.h
+++ b/src/gui/editors/notation/NoteFontFactory.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index b7e769f..bc00bd0 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/src/gui/editors/notation/NoteFontMap.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteFontMap.h b/src/gui/editors/notation/NoteFontMap.h
index 52dd425..0589b7c 100644
--- a/src/gui/editors/notation/NoteFontMap.h
+++ b/src/gui/editors/notation/NoteFontMap.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index 5802fb5..3341cb6 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteFontViewer.h b/src/gui/editors/notation/NoteFontViewer.h
index ee066a6..bd5d00b 100644
--- a/src/gui/editors/notation/NoteFontViewer.h
+++ b/src/gui/editors/notation/NoteFontViewer.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteItem.cpp b/src/gui/editors/notation/NoteItem.cpp
index 847f3a6..896fa5a 100644
--- a/src/gui/editors/notation/NoteItem.cpp
+++ b/src/gui/editors/notation/NoteItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteItem.h b/src/gui/editors/notation/NoteItem.h
index 1c7b567..4f1cd32 100644
--- a/src/gui/editors/notation/NoteItem.h
+++ b/src/gui/editors/notation/NoteItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index aa125ca..7d69cce 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -592,6 +592,7 @@ NotePixmapFactory::drawNoteAux(const NotePixmapParameters ¶ms,
bool inverted = charNameRec.second;
NoteCharacter body = getCharacter
(charName,
+ params.m_memberOfParallel ? MemberOfParallelColour :
params.m_highlighted ? HighlightedColour :
params.m_quantized ? QuantizedColour :
(params.m_trigger == NotePixmapParameters::triggerYes) ? TriggerColour :
@@ -3528,6 +3529,8 @@ NotePixmapFactory::getCharacter(CharName name, NoteCharacter &ch,
QColor white = Qt::white;
QColor red = Qt::red;
QColor gray = Qt::gray;
+ QColor magenta = Qt::magenta;
+
int h, s, v;
// getCharacterShaded() has been removed and replaced with a call to
@@ -3597,6 +3600,14 @@ NotePixmapFactory::getCharacter(CharName name, NoteCharacter &ch,
h,
v,
ch, charType, inverted, s);
+
+ case MemberOfParallelColour:
+ magenta.getHsv(&h, &s, &v);
+ return font->getCharacterColoured
+ (name,
+ h,
+ v,
+ ch, charType, inverted, s);
}
return font->getCharacter(name, ch, charType, inverted);
diff --git a/src/gui/editors/notation/NotePixmapFactory.h b/src/gui/editors/notation/NotePixmapFactory.h
index 8aeabe8..7a00116 100644
--- a/src/gui/editors/notation/NotePixmapFactory.h
+++ b/src/gui/editors/notation/NotePixmapFactory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -93,7 +93,8 @@ public:
TriggerSkipColour, /**< Defined in GUIPalette; used when masked-out trigger notes within ties are indicated */
OutRangeColour, /**< Defined in GUIPalette; used when out-of-range notes are indicated */
PlainColourLight, /**< The default basic Qt::white (hard coded) used when drawing on a black background */
- ConflictColour /**< Qt::red (hard coded) used by track headers to indicate, eg. a clef conflict */
+ ConflictColour, /**< Qt::red (hard coded) used by track headers to indicate, eg. a clef conflict */
+ MemberOfParallelColour /**< for members of parallels */
};
/** Used to notify the drawing code that the character is selected, and
diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h
index 10cb052..018ad34 100644
--- a/src/gui/editors/notation/NotePixmapPainter.h
+++ b/src/gui/editors/notation/NotePixmapPainter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NotePixmapParameters.cpp b/src/gui/editors/notation/NotePixmapParameters.cpp
index b058821..9189069 100644
--- a/src/gui/editors/notation/NotePixmapParameters.cpp
+++ b/src/gui/editors/notation/NotePixmapParameters.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -61,7 +61,8 @@ NotePixmapParameters::NotePixmapParameters(Note::Type noteType,
m_tieLength(0),
m_tiePositionExplicit(false),
m_tieAbove(false),
- m_inRange(true)
+ m_inRange(true),
+ m_memberOfParallel(false)
{
// nothing else
}
diff --git a/src/gui/editors/notation/NotePixmapParameters.h b/src/gui/editors/notation/NotePixmapParameters.h
index 4c54496..91bb764 100644
--- a/src/gui/editors/notation/NotePixmapParameters.h
+++ b/src/gui/editors/notation/NotePixmapParameters.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -88,6 +88,8 @@ public:
m_tieAbove = above;
}
+ void setMemberOfParallel(bool memberOfParallel) { m_memberOfParallel = memberOfParallel; }
+
void setMarks(const std::vector<Mark> &marks);
void removeMarks();
@@ -149,7 +151,9 @@ public:
m_tieAbove == p.m_tieAbove &&
m_inRange == p.m_inRange &&
- m_marks == p.m_marks);
+ m_marks == p.m_marks &&
+
+ m_memberOfParallel == p.m_memberOfParallel);
}
private:
@@ -202,6 +206,8 @@ private:
bool m_inRange;
std::vector<Mark> m_marks;
+
+ bool m_memberOfParallel;
};
diff --git a/src/gui/editors/notation/NoteRestInserter.cpp b/src/gui/editors/notation/NoteRestInserter.cpp
index ee3fee8..e95ef2e 100644
--- a/src/gui/editors/notation/NoteRestInserter.cpp
+++ b/src/gui/editors/notation/NoteRestInserter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -542,22 +542,24 @@ NoteRestInserter::doAddCommand(Segment &segment, timeT time, timeT endTime,
Command *activeCommand = 0; //Used in rest / note mode code
NoteInsertionCommand *insertionCommand = 0; //Used in rest / note mode code
-
- if(!isaRestInserter()) { //In Note Mode.
- // Insert Note (Code taken from old NoteInserter)
- timeT noteEnd = time + note.getDuration();
- // #1046934: make it possible to insert triplet at end of segment!
- if (m_widget->isInTupletMode()) {
- noteEnd = time + (note.getDuration() * m_widget->getTupledCount() / m_widget->getUntupledCount());
- }
+ // Insert Note (Code taken from old NoteInserter)
+ timeT noteEnd = time + note.getDuration();
- if (time < segment.getStartTime() ||
- endTime > segment.getEndMarkerTime() ||
- noteEnd > segment.getEndMarkerTime()) {
- return 0;
- }
+ // #1046934: make it possible to insert triplet at end of segment!
+ if (m_widget->isInTupletMode()) {
+ noteEnd = time + (note.getDuration() * m_widget->getTupledCount() / m_widget->getUntupledCount());
+ }
+
+ if (time < segment.getStartTime() ||
+ endTime > segment.getEndMarkerTime() ||
+ noteEnd > segment.getEndMarkerTime()) {
+ return 0;
+ }
+ if (isaRestInserter()) {
+ insertionCommand = new RestInsertionCommand(segment, time, endTime, note);
+ } else {
pitch += getOttavaShift(segment, time) * 12;
float targetSubordering = 0;
@@ -569,7 +571,8 @@ NoteRestInserter::doAddCommand(Segment &segment, timeT time, timeT endTime,
(segment, time, endTime, note, pitch, accidental,
(m_autoBeam && !m_widget->isInTupletMode() && !m_widget->isInGraceMode()) ?
NoteInsertionCommand::AutoBeamOn : NoteInsertionCommand::AutoBeamOff,
- m_autoTieBarlines ? NoteInsertionCommand::AutoTieBarlinesOn : NoteInsertionCommand::AutoTieBarlinesOff,
+ m_autoTieBarlines ?
+ NoteInsertionCommand::AutoTieBarlinesOn : NoteInsertionCommand::AutoTieBarlinesOff,
m_matrixInsertType && !m_widget->isInGraceMode() ?
NoteInsertionCommand::MatrixModeOn : NoteInsertionCommand::MatrixModeOff,
m_widget->isInGraceMode() ?
@@ -580,61 +583,36 @@ NoteRestInserter::doAddCommand(Segment &segment, timeT time, timeT endTime,
targetSubordering,
m_defaultStyle,
velocity);
+ }
- activeCommand = insertionCommand;
+ activeCommand = insertionCommand;
- if (m_widget->isInTupletMode() && !m_widget->isInGraceMode()) {
- Segment::iterator i(segment.findTime(time));
- if (i != segment.end() &&
- !(*i)->has(BaseProperties::BEAMED_GROUP_TUPLET_BASE)) {
-
- MacroCommand *command = new MacroCommand(insertionCommand->getName());
- //## Attempted fix to bug reported on rg-user by SlowPic
- //## <slowpic at web.de> 28/02/2005 22:32:56 UTC: Triplet input error
- //# HJJ: Comment out this attempt. It breaks the splitting of
- //# the first bars into rests.
- //## if ((*i)->isa(Note::EventRestType) &&
- //## (*i)->getNotationDuration() > (note.getDuration() * 3)) {
- // split the rest
- command->addCommand(new RestInsertionCommand
- (segment, time,
- time + note.getDuration() * 2,
- Note::getNearestNote(note.getDuration() * 2))); // have to find out what these 2 mean
- //## }
- //# These comments should probably be deleted.
+ if (m_widget->isInTupletMode() && !m_widget->isInGraceMode()) {
+ Segment::iterator i(segment.findTime(time));
+ if (i != segment.end() &&
+ !(*i)->has(BaseProperties::BEAMED_GROUP_TUPLET_BASE)) {
-
- command->addCommand(new TupletCommand
- (segment, time, note.getDuration(),
- m_widget->getUntupledCount(),
- m_widget->getTupledCount(), true)); // #1046934: "has timing already"
- command->addCommand(insertionCommand);
- activeCommand = command;
- }
- }
- } else { //In Rest Mode.
- // Insert a Rest (Code taken from old Rest Inserter)
- if (time < segment.getStartTime() ||
- endTime > segment.getEndMarkerTime() ||
- time + note.getDuration() > segment.getEndMarkerTime()) {
- return 0;
- }
-
- insertionCommand = new RestInsertionCommand(segment, time, endTime, note);
-
- activeCommand = insertionCommand;
-
- if (m_widget->isInTupletMode()) {
- Segment::iterator i(segment.findTime(time));
- if (i != segment.end() &&
- !(*i)->has(BaseProperties::BEAMED_GROUP_TUPLET_BASE)) { //+ scope
-
- MacroCommand *command = new MacroCommand(insertionCommand->getName());
- command->addCommand(new TupletCommand
- (segment, time, note.getDuration()));
- command->addCommand(insertionCommand);
- activeCommand = command;
- }
+ MacroCommand *command = new MacroCommand(insertionCommand->getName());
+ //## Attempted fix to bug reported on rg-user by SlowPic
+ //## <slowpic at web.de> 28/02/2005 22:32:56 UTC: Triplet input error
+ //# HJJ: Comment out this attempt. It breaks the splitting of
+ //# the first bars into rests.
+ //## if ((*i)->isa(Note::EventRestType) &&
+ //## (*i)->getNotationDuration() > (note.getDuration() * 3)) {
+ // split the rest
+ command->addCommand(new RestInsertionCommand
+ (segment, time,
+ time + note.getDuration() * 2,
+ Note::getNearestNote(note.getDuration() * 2))); // have to find out what these 2 mean
+ //## }
+ //# These comments should probably be deleted.
+
+ command->addCommand(new TupletCommand
+ (segment, time, note.getDuration(),
+ m_widget->getUntupledCount(),
+ m_widget->getTupledCount(), true)); // #1046934: "has timing already"
+ command->addCommand(insertionCommand);
+ activeCommand = command;
}
}
diff --git a/src/gui/editors/notation/NoteRestInserter.h b/src/gui/editors/notation/NoteRestInserter.h
index 4f21bcd..1fd7e3b 100644
--- a/src/gui/editors/notation/NoteRestInserter.h
+++ b/src/gui/editors/notation/NoteRestInserter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteStyle.cpp b/src/gui/editors/notation/NoteStyle.cpp
index 35345e5..962f330 100644
--- a/src/gui/editors/notation/NoteStyle.cpp
+++ b/src/gui/editors/notation/NoteStyle.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteStyle.h b/src/gui/editors/notation/NoteStyle.h
index 0582cdc..e629adf 100644
--- a/src/gui/editors/notation/NoteStyle.h
+++ b/src/gui/editors/notation/NoteStyle.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteStyleFactory.cpp b/src/gui/editors/notation/NoteStyleFactory.cpp
index 95dd397..d996025 100644
--- a/src/gui/editors/notation/NoteStyleFactory.cpp
+++ b/src/gui/editors/notation/NoteStyleFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteStyleFactory.h b/src/gui/editors/notation/NoteStyleFactory.h
index 9db50da..0d41c1b 100644
--- a/src/gui/editors/notation/NoteStyleFactory.h
+++ b/src/gui/editors/notation/NoteStyleFactory.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp
index 4caa805..add0b78 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.cpp
+++ b/src/gui/editors/notation/NoteStyleFileReader.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/NoteStyleFileReader.h b/src/gui/editors/notation/NoteStyleFileReader.h
index bfbe31d..1a73e62 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.h
+++ b/src/gui/editors/notation/NoteStyleFileReader.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/StaffHeader.cpp b/src/gui/editors/notation/StaffHeader.cpp
index 607871b..d359b43 100644
--- a/src/gui/editors/notation/StaffHeader.cpp
+++ b/src/gui/editors/notation/StaffHeader.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2007-2009
Yves Guillemot <yc.guillemot at wanadoo.fr>
diff --git a/src/gui/editors/notation/StaffHeader.h b/src/gui/editors/notation/StaffHeader.h
index fbdcdbf..2e12e6e 100644
--- a/src/gui/editors/notation/StaffHeader.h
+++ b/src/gui/editors/notation/StaffHeader.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2007-2009
Yves Guillemot <yc.guillemot at wanadoo.fr>
diff --git a/src/gui/editors/notation/StaffLayout.cpp b/src/gui/editors/notation/StaffLayout.cpp
index 81425ae..6ac8ea7 100644
--- a/src/gui/editors/notation/StaffLayout.cpp
+++ b/src/gui/editors/notation/StaffLayout.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/StaffLayout.h b/src/gui/editors/notation/StaffLayout.h
index 5a0fd73..0869e8a 100644
--- a/src/gui/editors/notation/StaffLayout.h
+++ b/src/gui/editors/notation/StaffLayout.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/SymbolInserter.cpp b/src/gui/editors/notation/SymbolInserter.cpp
index b65f3b4..69c46c7 100644
--- a/src/gui/editors/notation/SymbolInserter.cpp
+++ b/src/gui/editors/notation/SymbolInserter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/SymbolInserter.h b/src/gui/editors/notation/SymbolInserter.h
index 26a2222..bc38805 100644
--- a/src/gui/editors/notation/SymbolInserter.h
+++ b/src/gui/editors/notation/SymbolInserter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/SystemFont.cpp b/src/gui/editors/notation/SystemFont.cpp
index 14f383e..e7c6abb 100644
--- a/src/gui/editors/notation/SystemFont.cpp
+++ b/src/gui/editors/notation/SystemFont.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/SystemFont.h b/src/gui/editors/notation/SystemFont.h
index 3133160..2f87562 100644
--- a/src/gui/editors/notation/SystemFont.h
+++ b/src/gui/editors/notation/SystemFont.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/SystemFontQt.cpp b/src/gui/editors/notation/SystemFontQt.cpp
index 34b0f0c..8f163a9 100644
--- a/src/gui/editors/notation/SystemFontQt.cpp
+++ b/src/gui/editors/notation/SystemFontQt.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/SystemFontQt.h b/src/gui/editors/notation/SystemFontQt.h
index a51d42c..731723c 100644
--- a/src/gui/editors/notation/SystemFontQt.h
+++ b/src/gui/editors/notation/SystemFontQt.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/SystemFontXft.cpp b/src/gui/editors/notation/SystemFontXft.cpp
index a7f9a99..89d3b1b 100644
--- a/src/gui/editors/notation/SystemFontXft.cpp
+++ b/src/gui/editors/notation/SystemFontXft.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/SystemFontXft.h b/src/gui/editors/notation/SystemFontXft.h
index 4099acf..37e4677 100644
--- a/src/gui/editors/notation/SystemFontXft.h
+++ b/src/gui/editors/notation/SystemFontXft.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/TextInserter.cpp b/src/gui/editors/notation/TextInserter.cpp
index c949995..1c0978b 100644
--- a/src/gui/editors/notation/TextInserter.cpp
+++ b/src/gui/editors/notation/TextInserter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/notation/TextInserter.h b/src/gui/editors/notation/TextInserter.h
index 52deb95..e24508e 100644
--- a/src/gui/editors/notation/TextInserter.h
+++ b/src/gui/editors/notation/TextInserter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
index 87e111b..e286ec0 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,6 +23,7 @@
#include "misc/Strings.h"
#include "base/AudioPluginInstance.h"
#include "base/Instrument.h"
+#include "base/InstrumentStaticSignals.h"
#include "base/MidiProgram.h"
#include "document/RosegardenDocument.h"
#include "gui/studio/AudioPluginManager.h"
@@ -33,6 +34,7 @@
#include "gui/widgets/Fader.h"
#include "gui/widgets/Rotary.h"
#include "gui/widgets/AudioRouteMenu.h"
+#include "gui/widgets/SqueezedLabel.h"
#include "InstrumentParameterPanel.h"
#include "sound/MappedCommon.h"
#include "sound/MappedStudio.h"
@@ -81,8 +83,6 @@ AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenDocument*
m_aliasButton = new InstrumentAliasButton(this, 0);
m_aliasButton->setFixedSize(10, 6); // golden rectangle
m_aliasButton->setToolTip(tr("Click to rename this instrument"));
- // ??? updateAllBoxes() is not a slot, it is a signal.
-// connect (m_aliasButton, SIGNAL(changed()), this, SLOT(updateAllBoxes()));
// cheat on the layout, both this and the label at 0, 0; this all the way
// left, the label centered.
gridLayout->addWidget(m_aliasButton, 0, 0, 1, 2, Qt::AlignLeft);
@@ -117,58 +117,61 @@ AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenDocument*
connect(m_audioFader->m_pan, SIGNAL(valueChanged(float)),
this, SLOT(slotSetPan(float)));
- connect(m_audioFader->m_audioOutput, SIGNAL(changed()),
- this, SLOT(slotAudioRoutingChanged()));
-
- connect(m_audioFader->m_audioInput, SIGNAL(changed()),
- this, SLOT(slotAudioRoutingChanged()));
-
connect(m_audioFader->m_synthButton, SIGNAL(clicked()),
this, SLOT(slotSynthButtonClicked()));
connect(m_audioFader->m_synthGUIButton, SIGNAL(clicked()),
this, SLOT(slotSynthGUIButtonClicked()));
+
+ // Hold on to this to make sure it stays around as long as we do.
+ m_instrumentStaticSignals = Instrument::getStaticSignals();
+
+ connect(m_instrumentStaticSignals.data(),
+ SIGNAL(changed(Instrument *)),
+ this,
+ SLOT(slotInstrumentChanged(Instrument *)));
}
void
AudioInstrumentParameterPanel::slotSelectAudioLevel(float dB)
{
- if (m_selectedInstrument == 0)
+ if (getSelectedInstrument() == 0)
return ;
- if (m_selectedInstrument->getType() == Instrument::Audio ||
- m_selectedInstrument->getType() == Instrument::SoftSynth) {
- m_selectedInstrument->setLevel(dB);
+ if (getSelectedInstrument()->getType() == Instrument::Audio ||
+ getSelectedInstrument()->getType() == Instrument::SoftSynth) {
+ getSelectedInstrument()->setLevel(dB);
+ getSelectedInstrument()->changed();
+ // ??? Perhaps it would be better for StudioControl to monitor
+ // the Instrument objects (InstrumentStaticSignals::changed())
+ // and update the properties whenever the Instrument changes.
+ // Then this StudioControl code which is spread all over this
+ // class and duplicated in AudioMixerWindow would go away.
StudioControl::setStudioObjectProperty
- (MappedObjectId(m_selectedInstrument->getMappedId()),
+ (MappedObjectId(getSelectedInstrument()->getMappedId()),
MappedAudioFader::FaderLevel,
MappedObjectValue(dB));
}
-
- emit updateAllBoxes();
- emit instrumentParametersChanged(m_selectedInstrument->getId());
}
void
AudioInstrumentParameterPanel::slotSelectAudioRecordLevel(float dB)
{
- if (m_selectedInstrument == 0)
+ if (getSelectedInstrument() == 0)
return ;
// std::cerr << "AudioInstrumentParameterPanel::slotSelectAudioRecordLevel("
// << dB << ")" << std::endl;
- if (m_selectedInstrument->getType() == Instrument::Audio) {
- m_selectedInstrument->setRecordLevel(dB);
+ if (getSelectedInstrument()->getType() == Instrument::Audio) {
+ getSelectedInstrument()->setRecordLevel(dB);
+ getSelectedInstrument()->changed();
StudioControl::setStudioObjectProperty
- (MappedObjectId(m_selectedInstrument->getMappedId()),
+ (MappedObjectId(getSelectedInstrument()->getMappedId()),
MappedAudioFader::FaderRecordLevel,
MappedObjectValue(dB));
-
- emit updateAllBoxes();
- emit instrumentParametersChanged(m_selectedInstrument->getId());
}
}
@@ -176,8 +179,8 @@ void
AudioInstrumentParameterPanel::slotPluginSelected(InstrumentId instrumentId,
int index, int plugin)
{
- if (!m_selectedInstrument ||
- instrumentId != m_selectedInstrument->getId()) {
+ if (!getSelectedInstrument() ||
+ instrumentId != getSelectedInstrument()->getId()) {
return;
}
@@ -193,7 +196,7 @@ AudioInstrumentParameterPanel::slotPluginSelected(InstrumentId instrumentId,
QString noneText;
// updates synth gui button &c:
- m_audioFader->slotSetInstrument(&m_doc->getStudio(), m_selectedInstrument);
+ m_audioFader->slotSetInstrument(&m_doc->getStudio(), getSelectedInstrument());
if (index == (int)Instrument::SYNTH_PLUGIN_POSITION) {
button = m_audioFader->m_synthButton;
@@ -225,7 +228,7 @@ AudioInstrumentParameterPanel::slotPluginSelected(InstrumentId instrumentId,
}
AudioPluginInstance *inst =
- m_selectedInstrument->getPlugin(index);
+ getSelectedInstrument()->getPlugin(index);
if (inst)
bypassed = inst->isBypassed();
@@ -233,7 +236,14 @@ AudioInstrumentParameterPanel::slotPluginSelected(InstrumentId instrumentId,
setButtonColour(index, bypassed, pluginBackgroundColour);
if (index == (int)Instrument::SYNTH_PLUGIN_POSITION) {
- emit changeInstrumentLabel(instrumentId, button->text());
+ // A new plugin has been selected. Let everyone know.
+ // This makes sure the TrackParameterBox and TrackButtons
+ // are updated to show the name of the plugin.
+ // ??? Yeah, but. It would be better if the part of this that
+ // actually changed the Instrument (AudioPluginDialog maybe?)
+ // called changed() when it made the actual changes. The
+ // emitters of pluginSelected() would be a place to start.
+ getSelectedInstrument()->changed();
}
}
@@ -241,12 +251,12 @@ void
AudioInstrumentParameterPanel::slotPluginBypassed(InstrumentId instrumentId,
int pluginIndex, bool bp)
{
- if (!m_selectedInstrument ||
- instrumentId != m_selectedInstrument->getId())
+ if (!getSelectedInstrument() ||
+ instrumentId != getSelectedInstrument()->getId())
return ;
AudioPluginInstance *inst =
- m_selectedInstrument->getPlugin(pluginIndex);
+ getSelectedInstrument()->getPlugin(pluginIndex);
QColor backgroundColour = QColor(Qt::black); // default background colour
@@ -309,7 +319,7 @@ AudioInstrumentParameterPanel::slotSynthButtonClicked()
void
AudioInstrumentParameterPanel::slotSynthGUIButtonClicked()
{
- emit showPluginGUI(m_selectedInstrument->getId(),
+ emit showPluginGUI(getSelectedInstrument()->getId(),
Instrument::SYNTH_PLUGIN_POSITION);
}
@@ -320,12 +330,12 @@ AudioInstrumentParameterPanel::slotSetPan(float pan)
<< "pan = " << pan << endl;
StudioControl::setStudioObjectProperty
- (MappedObjectId(m_selectedInstrument->getMappedId()),
+ (MappedObjectId(getSelectedInstrument()->getMappedId()),
MappedAudioFader::Pan,
MappedObjectValue(pan));
- m_selectedInstrument->setPan(MidiByte(pan + 100.0));
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ getSelectedInstrument()->setPan(MidiByte(pan + 100.0));
+ getSelectedInstrument()->changed();
}
void
@@ -335,7 +345,7 @@ AudioInstrumentParameterPanel::setAudioMeter(float dBleft, float dBright,
// RG_DEBUG << "AudioInstrumentParameterPanel::setAudioMeter: (" << dBleft
// << "," << dBright << ")" << endl;
- if (m_selectedInstrument) {
+ if (getSelectedInstrument()) {
// Always set stereo, because we have to reflect what's happening
// with the pan setting even on mono tracks
m_audioFader->m_vuMeter->setLevel(dBleft, dBright);
@@ -353,7 +363,8 @@ AudioInstrumentParameterPanel::setupForInstrument(Instrument* instrument)
QString l = QString::fromStdString(instrument->getAlias());
if (l.isEmpty()) l = instrument->getLocalizedPresentationName();
- setSelectedInstrument(instrument, l);
+ setSelectedInstrument(instrument);
+ m_instrumentLabel->setText(l);
m_aliasButton->setInstrument(instrument);
@@ -426,32 +437,41 @@ AudioInstrumentParameterPanel::slotAudioChannels(int channels)
RG_DEBUG << "AudioInstrumentParameterPanel::slotAudioChannels - "
<< "channels = " << channels << endl;
- m_selectedInstrument->setAudioChannels(channels);
+ getSelectedInstrument()->setAudioChannels(channels);
+ getSelectedInstrument()->changed();
StudioControl::setStudioObjectProperty
- (MappedObjectId(m_selectedInstrument->getMappedId()),
+ (MappedObjectId(getSelectedInstrument()->getMappedId()),
MappedAudioFader::Channels,
MappedObjectValue(channels));
- emit instrumentParametersChanged(m_selectedInstrument->getId());
-
}
void
-AudioInstrumentParameterPanel::slotAudioRoutingChanged()
+AudioInstrumentParameterPanel::slotSelectPlugin(int index)
{
- if (m_selectedInstrument) {
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ if (getSelectedInstrument()) {
+ emit selectPlugin(0, getSelectedInstrument()->getId(), index);
}
}
void
-AudioInstrumentParameterPanel::slotSelectPlugin(int index)
+AudioInstrumentParameterPanel::slotInstrumentChanged(Instrument *instrument)
{
- if (m_selectedInstrument) {
- emit selectPlugin(0, m_selectedInstrument->getId(), index);
- }
+ if (!instrument)
+ return;
+
+ if (!getSelectedInstrument())
+ return;
+
+ // If this isn't a change for the Instrument we are displaying, bail.
+ if (getSelectedInstrument()->getId() != instrument->getId())
+ return;
+
+ // Update the parameters on the widgets
+ setupForInstrument(instrument);
}
+
}
#include "AudioInstrumentParameterPanel.moc"
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.h b/src/gui/editors/parameters/AudioInstrumentParameterPanel.h
index 868d67e..ca6deee 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.h
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -24,6 +24,7 @@
#include <QPixmap>
#include <QString>
+#include <QSharedPointer>
class QWidget;
@@ -35,6 +36,7 @@ namespace Rosegarden
class RosegardenDocument;
class Instrument;
+class InstrumentStaticSignals;
class InstrumentAliasButton;
class AudioFaderBox;
@@ -64,7 +66,6 @@ public slots:
void slotSelectAudioLevel(float dB);
void slotSelectAudioRecordLevel(float dB);
void slotAudioChannels(int channels);
- void slotAudioRoutingChanged();
void slotSelectPlugin(int index);
// From the parameter box clicks
@@ -80,15 +81,18 @@ public slots:
signals:
void selectPlugin(QWidget *, InstrumentId, int index);
- void instrumentParametersChanged(InstrumentId);
void showPluginGUI(InstrumentId, int index);
- void changeInstrumentLabel(InstrumentId id, QString label);
protected:
//--------------- Data members ---------------------------------
AudioFaderBox *m_audioFader;
+private slots:
+
+ /// Handle InstrumentStaticSignals::changed()
+ void slotInstrumentChanged(Instrument *);
+
private:
// This is the tiny button in the upper left that allows the user
@@ -98,6 +102,7 @@ private:
QPixmap m_monoPixmap;
QPixmap m_stereoPixmap;
+ QSharedPointer<InstrumentStaticSignals> m_instrumentStaticSignals;
};
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp
index ecec531..0319ef9 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -74,14 +74,6 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenDocument *doc,
m_widgetStack->addWidget(m_audioInstrumentParameters);
m_widgetStack->addWidget(m_noInstrumentParameters);
- connect(m_audioInstrumentParameters, SIGNAL(updateAllBoxes()),
- this, SLOT(slotUpdateAllBoxes()));
-
- connect(m_audioInstrumentParameters,
- SIGNAL(instrumentParametersChanged(InstrumentId)),
- this,
- SIGNAL(instrumentParametersChanged(InstrumentId)));
-
connect(m_audioInstrumentParameters,
SIGNAL(selectPlugin(QWidget *, InstrumentId, int)),
this,
@@ -92,22 +84,6 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenDocument *doc,
this,
SIGNAL(showPluginGUI(InstrumentId, int)));
- connect(m_midiInstrumentParameters, SIGNAL(updateAllBoxes()),
- this, SLOT(slotUpdateAllBoxes()));
-
- connect(m_midiInstrumentParameters,
- SIGNAL(changeInstrumentLabel(InstrumentId, QString)),
- this, SIGNAL(changeInstrumentLabel(InstrumentId, QString)));
-
- connect(m_audioInstrumentParameters,
- SIGNAL(changeInstrumentLabel(InstrumentId, QString)),
- this, SIGNAL(changeInstrumentLabel(InstrumentId, QString)));
-
- connect(m_midiInstrumentParameters,
- SIGNAL(instrumentParametersChanged(InstrumentId)),
- this,
- SIGNAL(instrumentParametersChanged(InstrumentId)));
-
// Layout the groups left to right.
QBoxLayout *layout = new QVBoxLayout(this);
@@ -134,8 +110,8 @@ InstrumentParameterBox::~InstrumentParameterBox()
MIDIInstrumentParameterPanel *
InstrumentParameterBox::getMIDIInstrumentParameterPanel()
{
- if (!m_midiInstrumentParameters) return 0;
- return m_midiInstrumentParameters;
+ if (!m_midiInstrumentParameters) return 0;
+ return m_midiInstrumentParameters;
}
@@ -182,32 +158,36 @@ InstrumentParameterBox::slotPluginBypassed(InstrumentId id, int index, bool bypa
void
InstrumentParameterBox::useInstrument(Instrument *instrument)
{
- if (instrument == 0) {
- m_widgetStack->setCurrentWidget(m_noInstrumentParameters); // was raiseWidget
- emit instrumentPercussionSetChanged(instrument);
- return ;
- }
+ if (!instrument) {
+ // Go with a blank frame.
+ m_widgetStack->setCurrentWidget(m_noInstrumentParameters);
- // ok
- if (instrument) {
- m_selectedInstrument = instrument->getId();
- } else {
m_selectedInstrument = -1;
+
+ // Update the MatrixWidget's PitchRuler.
+ emit instrumentPercussionSetChanged(instrument);
+
+ return;
}
+ m_selectedInstrument = instrument->getId();
+
// Hide or Show according to Instrument type
//
if (instrument->getType() == Instrument::Audio ||
instrument->getType() == Instrument::SoftSynth) {
- m_audioInstrumentParameters->setupForInstrument(getSelectedInstrument());
+ // Update the audio panel and bring it to the top.
+ m_audioInstrumentParameters->setupForInstrument(instrument);
m_widgetStack->setCurrentWidget(m_audioInstrumentParameters);
-// m_widgetStack->raiseWidget(m_audioInstrumentParameters);
} else { // Midi
- m_midiInstrumentParameters->setupForInstrument(getSelectedInstrument());
- m_widgetStack->setCurrentWidget(m_midiInstrumentParameters);
+ // Update the MIDI panel and bring it to the top.
+ m_midiInstrumentParameters->displayInstrument(instrument);
+ m_widgetStack->setCurrentWidget(m_midiInstrumentParameters);
+
+ // Update the MatrixWidget's PitchRuler.
emit instrumentPercussionSetChanged(instrument);
}
@@ -215,66 +195,10 @@ InstrumentParameterBox::useInstrument(Instrument *instrument)
}
void
-InstrumentParameterBox::slotUpdateAllBoxes()
+InstrumentParameterBox::emitInstrumentPercussionSetChanged()
{
- // This causes the MatrixWidget to redraw the pitch ruler.
- // ??? Instead of monitoring the UI, the MatrixWidget should monitor
- // changes to the Instrument and update itself based
- // on that. See if that is possible and give it a shot.
+ // Update the MatrixWidget's PitchRuler.
emit instrumentPercussionSetChanged(getSelectedInstrument());
-
-#if 0
-// Now that there is only one of these, the rest of this can be
-// removed.
- // For each IPB
- for (IPBVector::iterator it = m_instrumentParamBoxes.begin();
- it != m_instrumentParamBoxes.end();
- ++it) {
- if ((*it) != this && getSelectedInstrument() &&
- (*it)->getSelectedInstrument() == getSelectedInstrument()) {
- // Update this IPB to show the currently selected instrument.
- (*it)->useInstrument(getSelectedInstrument());
- }
- }
-#endif
-}
-
-void
-InstrumentParameterBox::slotInstrumentParametersChanged(InstrumentId id)
-{
- // ??? Why? There seems to be a lot of this around here. Perhaps this
- // is to break up endless update loops. Maybe that's another side-
- // effect of UI-to-UI notifications.
- blockSignals(true);
-
-#if 0
- // For each IPB
- for (IPBVector::iterator it = m_instrumentParamBoxes.begin();
- it != m_instrumentParamBoxes.end();
- ++it) {
- if ((*it)->getSelectedInstrument()) {
- // If this IPB happens to be displaying the instrument whose
- // parameters are changing (id)
- if ((*it)->getSelectedInstrument()->getId() == id) {
- // Update this IPB to show the current parameters.
- (*it)->useInstrument((*it)->getSelectedInstrument());
- }
- }
- }
-#else
-// Since there is only one IPB, the above reduces to this.
- Instrument *instrument = getSelectedInstrument();
- if (instrument) {
- // If this IPB happens to be displaying the instrument whose
- // parameters are changing (id)
- if (instrument->getId() == id) {
- // Update this IPB to show the current parameters.
- useInstrument(instrument);
- }
- }
-#endif
-
- blockSignals(false);
}
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.h b/src/gui/editors/parameters/InstrumentParameterBox.h
index f698b23..4bceb1a 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.h
+++ b/src/gui/editors/parameters/InstrumentParameterBox.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -78,26 +78,11 @@ public:
virtual QString getPreviousBox(RosegardenParameterArea::Arrangement) const;
+ /// Update the MatrixWidget's PitchRuler.
+ void emitInstrumentPercussionSetChanged();
public slots:
- // To update all InstrumentParameterBoxen for an Instrument. Called
- // from one of the parameter panels when something changes.
- //
- void slotUpdateAllBoxes();
-
- /// Update InstrumentParameterBoxes that are showing a given instrument.
- /**
- * Called from the Outside.
- * Translated from RosegardenMainWindow::instrumentParametersChanged().
- * instrumentParametersChanged() signals from various objects are
- * funneled into here.
- *
- * ??? Is this a case where monitoring the Instrument might
- * be a better idea? Is there support for that?
- */
- void slotInstrumentParametersChanged(InstrumentId id);
-
// From Plugin dialog
//
void slotPluginSelected(InstrumentId id, int index, int plugin);
@@ -105,14 +90,10 @@ public slots:
signals:
- void changeInstrumentLabel(InstrumentId id, QString label);
-
void selectPlugin(QWidget *, InstrumentId id, int index);
void showPluginGUI(InstrumentId id, int index);
- void instrumentParametersChanged(InstrumentId);
-
- // This causes the MatrixWidget to redraw the pitch ruler.
+ /// Update the MatrixWidget's PitchRuler.
void instrumentPercussionSetChanged(Instrument *);
private:
@@ -135,7 +116,7 @@ private:
// Since there is only one instance of InstrumentParameterBox
// ever created, this is probably unnecessary. Consider getting
// rid of it altogether.
- // Used by: slotUpdateAllBoxes() and slotInstrumentParametersChanged().
+ // Used by: nobody
typedef std::vector<InstrumentParameterBox *> IPBVector;
static IPBVector m_instrumentParamBoxes;
};
diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.cpp b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
index e654934..51645be 100644
--- a/src/gui/editors/parameters/InstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -22,7 +22,6 @@
#include "gui/widgets/SqueezedLabel.h"
#include <QFrame>
-#include <QLabel>
#include <QWidget>
@@ -33,8 +32,8 @@ InstrumentParameterPanel::InstrumentParameterPanel(RosegardenDocument *doc,
QWidget *parent) :
QFrame(parent),
m_doc(doc),
- m_selectedInstrument(0),
- m_instrumentLabel(new SqueezedLabel(this))
+ m_instrumentLabel(new SqueezedLabel(this)),
+ m_selectedInstrument(0)
{
}
@@ -46,8 +45,7 @@ InstrumentParameterPanel::setDocument(RosegardenDocument *doc)
}
void
-InstrumentParameterPanel::
-setSelectedInstrument(Instrument *instrument, QString label)
+InstrumentParameterPanel::setSelectedInstrument(Instrument *instrument)
{
m_selectedInstrument = instrument;
if (instrument) {
@@ -55,7 +53,12 @@ setSelectedInstrument(Instrument *instrument, QString label)
connect(instrument, SIGNAL(destroyed()),
this, SLOT(slotInstrumentGone()));
}
- m_instrumentLabel->setText(label);
+}
+
+Instrument *
+InstrumentParameterPanel::getSelectedInstrument()
+{
+ return m_selectedInstrument;
}
void
@@ -66,6 +69,7 @@ slotInstrumentGone(void)
m_instrumentLabel->setText(tr("none"));
}
+
}
#include "InstrumentParameterPanel.moc"
diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.h b/src/gui/editors/parameters/InstrumentParameterPanel.h
index 158d6cf..d8f7dfe 100644
--- a/src/gui/editors/parameters/InstrumentParameterPanel.h
+++ b/src/gui/editors/parameters/InstrumentParameterPanel.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -32,6 +32,7 @@ namespace Rosegarden
class RosegardenDocument;
class Instrument;
+class SqueezedLabel;
////////////////////////////////////////////////////////////////////////
@@ -46,21 +47,20 @@ public:
void setDocument(RosegardenDocument *doc);
-signals:
- // Connected to InstrumentParameterBox::slotUpdateAllBoxes().
- void updateAllBoxes();
-
protected:
RosegardenDocument *m_doc;
- Instrument *m_selectedInstrument;
- QLabel *m_instrumentLabel;
- /// Make instrument our selected instrument.
- void setSelectedInstrument(Instrument *instrument, QString label);
+ void setSelectedInstrument(Instrument *);
+ Instrument *getSelectedInstrument();
+
+ SqueezedLabel *m_instrumentLabel;
private slots:
/// m_selectedInstrument is being destroyed
void slotInstrumentGone(void);
+
+private:
+ Instrument *m_selectedInstrument;
};
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index 9b89437..3446376 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -34,6 +34,7 @@
#include "base/Composition.h"
#include "base/ControlParameter.h"
#include "base/Instrument.h"
+#include "base/InstrumentStaticSignals.h"
#include "base/MidiDevice.h"
#include "base/MidiProgram.h"
@@ -52,9 +53,10 @@
#include <QString>
#include <QWidget>
-#include <algorithm> // std::sort
+#include <algorithm> // std::sort(), std::remove_if()
#include <string>
#include <iostream>
+#include <cmath>
namespace Rosegarden
{
@@ -62,8 +64,8 @@ namespace Rosegarden
MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(
RosegardenDocument *doc, QWidget *parent) :
InstrumentParameterPanel(doc, parent),
- m_rotaryFrame(0),
- m_rotaryMapper(new QSignalMapper(this))
+ m_rotaryFrame(NULL),
+ m_rotaryGrid(NULL)
{
RG_DEBUG << "MIDIInstrumentParameterPanel ctor";
@@ -82,21 +84,22 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(
f.setPointSize(f.pointSize() * 90 / 100);
f.setBold(false);
QFontMetrics metrics(f);
+ // Compute a width for the labels that will prevent them from becoming
+ // so large that they make a mess out of the layout.
+ const int labelWidth = metrics.width("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
// Instrument Label
m_instrumentLabel->setFont(f);
- const int width25 = metrics.width("1234567890123456789012345");
- m_instrumentLabel->setFixedWidth(width25);
+ // Set a fixed width to prevent the label from growing too large.
+ m_instrumentLabel->setFixedWidth(labelWidth);
m_instrumentLabel->setAlignment(Qt::AlignCenter);
m_mainGrid->addWidget(m_instrumentLabel, 0, 0, 1, 4, Qt::AlignCenter);
// Connection Label
m_connectionLabel = new SqueezedLabel(this);
m_connectionLabel->setFont(f);
- // we still have to use the QFontMetrics here, or a SqueezedLabel will
- // squeeze itself down to 0.
- const int width30 = metrics.width("123456789012345678901234567890");
- m_connectionLabel->setFixedWidth(width30);
+ // Set a fixed width to prevent the label from growing too large.
+ m_connectionLabel->setFixedWidth(labelWidth);
m_connectionLabel->setAlignment(Qt::AlignCenter);
m_mainGrid->addWidget(m_connectionLabel, 1, 0, 1, 4, Qt::AlignCenter);
@@ -234,9 +237,33 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(
m_receiveExternalCheckBox->setChecked(false);
m_mainGrid->addWidget(m_receiveExternalCheckBox, 8, 3, Qt::AlignLeft);
+ // Rotary Frame and Grid
+ m_rotaryFrame = new QFrame(this);
+ m_rotaryFrame->setContentsMargins(8, 8, 8, 8);
+ m_rotaryGrid = new QGridLayout(m_rotaryFrame);
+ m_rotaryGrid->setSpacing(1);
+ m_rotaryGrid->setMargin(0);
+ m_rotaryGrid->addItem(new QSpacerItem(10, 4), 0, 1);
+ m_rotaryFrame->setLayout(m_rotaryGrid);
+ // Add the rotary frame to the main grid layout.
+ m_mainGrid->addWidget(m_rotaryFrame, 10, 0, 1, 4, Qt::AlignHCenter);
+ // Add a spacer to take up the rest of the space. This keeps
+ // the widgets above compact vertically.
+ m_mainGrid->addItem(new QSpacerItem(1, 1), 11, 0, 1, 4);
+ m_mainGrid->setRowStretch(11, 1);
+
// Rotary Mapper
+ m_rotaryMapper = new QSignalMapper(this);
connect(m_rotaryMapper, SIGNAL(mapped(int)),
this, SLOT(slotControllerChanged(int)));
+
+ // Hold on to this to make sure it stays around as long as we do.
+ m_instrumentStaticSignals = Instrument::getStaticSignals();
+
+ connect(m_instrumentStaticSignals.data(),
+ SIGNAL(changed(Instrument *)),
+ this,
+ SLOT(slotInstrumentChanged(Instrument *)));
}
void
@@ -248,132 +275,91 @@ MIDIInstrumentParameterPanel::clearReceiveExternal()
}
void
-MIDIInstrumentParameterPanel::setupForInstrument(Instrument *instrument)
+MIDIInstrumentParameterPanel::displayInstrument(Instrument *instrument)
{
- RG_DEBUG << "setupForInstrument() begin";
-
if (!instrument)
return;
- // In some cases setupForInstrument gets called several times.
- // This shortcuts this activity since only one setup is needed.
- // ??? Problem is that this prevents legitimate changes to the
- // instrument from getting to the UI. Removing this fixes
- // numerous update bugs related to making changes in the
- // Manage MIDI Devices window.
- // ??? This might be preventing endless recursion as this routine
- // might indirectly fire off calls to itself. This seems unlikely
- // as testing with the following check removed has revealed no
- // endless loops or crashes.
- // ??? Another possibility is that this was put here to prevent reloading
- // the comboboxes (updateBankComboBox(), etc...). Without this
- // check, every change by the user will trigger a reloading of the
- // comboboxes. Since the combobox values are cached (e.g. m_banks),
- // it's easy to detect changes without help from the client and avoid
- // unnecessary updates. I will add that check as I review the
- // combobox update routines. Then this will no longer be a
- // possibility.
-#if 0
- if (m_selectedInstrument == instrument) {
- RG_DEBUG << "setupForInstrument(): Early exit. Instrument didn't change.";
- RG_DEBUG << "setupForInstrument() end";
+ setSelectedInstrument(instrument);
+ m_instrumentLabel->setText(instrument->getLocalizedPresentationName());
+
+ updateWidgets();
+}
+
+void
+MIDIInstrumentParameterPanel::updateWidgets()
+{
+ RG_DEBUG << "updateWidgets() begin";
+
+ if (!getSelectedInstrument())
return;
- }
-#endif
- MidiDevice *md = dynamic_cast<MidiDevice*>
- (instrument->getDevice());
+ MidiDevice *md = dynamic_cast<MidiDevice *>(getSelectedInstrument()->getDevice());
if (!md) {
- std::cerr << "WARNING: MIDIInstrumentParameterPanel::setupForInstrument(): No MidiDevice for Instrument " << instrument->getId() << '\n';
+ std::cerr << "WARNING: MIDIInstrumentParameterPanel::updateWidgets(): No MidiDevice for Instrument " << getSelectedInstrument()->getId() << '\n';
RG_DEBUG << "setupForInstrument() end";
- return ;
+ return;
}
- setSelectedInstrument(instrument,
- instrument->getLocalizedPresentationName());
+ // Instrument name
+
+ m_instrumentLabel->setText(
+ getSelectedInstrument()->getLocalizedPresentationName());
+
+ // Studio Device (connection) name
- // Set Studio Device name
- //
QString connection(RosegardenSequencer::getInstance()->getConnection(md->getId()));
if (connection == "") {
- m_connectionLabel->setText(tr("[ %1 ]").arg(tr("No connection")));
+ connection = tr("No connection");
} else {
-
// remove trailing "(duplex)", "(read only)", "(write only)" etc
connection.replace(QRegExp("\\s*\\([^)0-9]+\\)\\s*$"), "");
-
- QString text = QObject::tr("[ %1 ]").arg(connection);
- /*QString origText(text);
-
- QFontMetrics metrics(m_connectionLabel->fontMetrics());
- int maxwidth = metrics.width
- ("Program: [X] Acoustic Grand Piano 123");// kind of arbitrary!
-
- int hlen = text.length() / 2;
- while (metrics.width(text) > maxwidth && text.length() > 10) {
- --hlen;
- text = origText.left(hlen) + "..." + origText.right(hlen);
- }
-
- if (text.length() > origText.length() - 7) text = origText;*/
- m_connectionLabel->setText(QObject::tr(text.toStdString().c_str()));
}
- // Update CheckBoxes
-
- m_percussionCheckBox->setChecked(instrument->isPercussion());
- m_programCheckBox->setChecked(instrument->sendsProgramChange());
- m_bankCheckBox->setChecked(instrument->sendsBankSelect());
- m_variationCheckBox->setChecked(instrument->sendsBankSelect());
-
- // Update ComboBoxes
+ m_connectionLabel->setText("[ " + connection + " ]");
- m_channelValue->setCurrentIndex(
- m_selectedInstrument->hasFixedChannel() ? 1 : 0);
-
- // ??? Do these fire off the combobox handlers? Maybe. Although each of
- // these culminates in a setCurrentIndex() which we've verified does
- // not fire an activated(int), some of these do directly call the
- // handlers which in turn will fire multiple signals. This needs
- // to be investigated.
+ // Percussion
+ m_percussionCheckBox->setChecked(getSelectedInstrument()->isPercussion());
+
+ // Bank
+ m_bankCheckBox->setChecked(getSelectedInstrument()->sendsBankSelect());
updateBankComboBox();
+
+ // Program
+ m_programCheckBox->setChecked(getSelectedInstrument()->sendsProgramChange());
updateProgramComboBox();
+
+ // Variation
+ m_variationCheckBox->setChecked(getSelectedInstrument()->sendsBankSelect());
updateVariationComboBox();
- // Update Rotary Widgets
+ // Channel
+ m_channelValue->setCurrentIndex(
+ getSelectedInstrument()->hasFixedChannel() ? 1 : 0);
+
+ // Controller Rotaries
- // Setup the Rotaries
- // ??? Does this fire off the rotary handlers? Probably not.
+ // Make sure we have the right number of Rotary widgets and
+ // they have the proper labels.
+ // rename: setupRotaries()?
setupControllers(md);
- // Set all the positions by controller number
- //
- for (RotaryInfoVector::iterator it = m_rotaries.begin() ;
- it != m_rotaries.end(); ++it) {
+ // For each rotary
+ for (RotaryInfoVector::iterator rotaryIter = m_rotaries.begin();
+ rotaryIter != m_rotaries.end(); ++rotaryIter) {
MidiByte value = 0;
try {
- value = instrument->getControllerValue(
- MidiByte(it->controller));
- } catch (...) {
+ value = getSelectedInstrument()->getControllerValue(rotaryIter->controller);
+ } catch (...) { // unknown controller, try the next one
continue;
}
- // ??? Does this fire off the rotary handlers? Testing indicates no.
- setRotaryToValue(it->controller, int(value));
- }
-
- // Make sure MatrixWidget's pitch ruler shows notes or percussion map
- // as appropriate.
- emit updateAllBoxes();
- // Make sure other parts of the system are in sync with the program
- // name. Most notably the TrackButton for the current track.
- emit changeInstrumentLabel(
- m_selectedInstrument->getId(),
- m_selectedInstrument->getProgramName().c_str());
+ rotaryIter->rotary->setPosition(static_cast<float>(value));
+ }
- RG_DEBUG << "setupForInstrument() end";
+ RG_DEBUG << "updateWidgets() end";
}
void
@@ -384,39 +370,23 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
if (!md)
return;
- if (!m_rotaryFrame) {
- m_rotaryFrame = new QFrame(this);
- m_rotaryFrame->setContentsMargins(8, 8, 8, 8);
- m_rotaryGrid = new QGridLayout(m_rotaryFrame);
- m_rotaryGrid->setSpacing(1);
- m_rotaryGrid->setMargin(0);
- m_rotaryGrid->addItem(new QSpacerItem(10, 4), 0, 1);
- m_rotaryFrame->setLayout(m_rotaryGrid);
-
- // Add the rotary frame to the main grid layout.
- m_mainGrid->addWidget(m_rotaryFrame, 10, 0, 1, 4, Qt::AlignHCenter);
- // Add a spacer to take up the rest of the space. This keeps
- // the widgets above compact vertically.
- m_mainGrid->addItem(new QSpacerItem(1, 1), 11, 0, 1, 4);
- m_mainGrid->setRowStretch(11, 1);
- }
-
// To cut down on flicker, we avoid destroying and recreating
// widgets as far as possible here. If a label already exists,
// we just set its text; if a rotary exists, we only replace it
// if we actually need a different one.
Composition &comp = m_doc->getComposition();
+
ControlList list = md->getControlParameters();
- // sort by IPB position
- //
+ // Sort by IPB position.
std::sort(list.begin(), list.end(),
ControlParameter::ControlPositionCmp());
int count = 0;
- RotaryInfoVector::iterator rmi = m_rotaries.begin();
+ RotaryInfoVector::iterator rotaryIter = m_rotaries.begin();
+ // For each controller
for (ControlList::iterator it = list.begin();
it != list.end(); ++it) {
if (it->getIPBPosition() == -1)
@@ -433,28 +403,30 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
Rotary *rotary = 0;
// If the Rotary widgets have already been created, update them.
- if (rmi != m_rotaries.end()) {
+ if (rotaryIter != m_rotaries.end()) {
// Update the controller number that is associated with the
// existing rotary widget.
- rmi->controller = it->getControllerValue();
+ rotaryIter->controller = it->getControllerValue();
// Update the properties of the existing rotary widget.
- rotary = rmi->rotary;
+ rotary = rotaryIter->rotary;
rotary->setMinimum(it->getMin());
rotary->setMaximum(it->getMax());
+ // If the default is 64, then this is most likely a "centered"
+ // control which should show its distance from the 12 o'clock
+ // position around the outside.
rotary->setCentered((it->getDefault() == 64));
- rotary->setPosition(it->getDefault());
rotary->setKnobColour(knobColour);
// Update the controller name.
- rmi->label->setText(QObject::tr(it->getName().c_str()));
+ rotaryIter->label->setText(QObject::tr(it->getName().c_str()));
// Next Rotary widget
- ++rmi;
+ ++rotaryIter;
} else { // Need to create the Rotary widget.
@@ -482,7 +454,7 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
20, // size
Rotary::NoTicks, // ticks
false, // snapToTicks
- (it->getDefault() == 64)); // centred
+ (it->getDefault() == 64)); // centred, see setCentered() above
rotary->setKnobColour(knobColour);
hboxLayout->addWidget(rotary);
@@ -509,7 +481,7 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
connect(rotary, SIGNAL(valueChanged(float)),
m_rotaryMapper, SLOT(map()));
- rmi = m_rotaries.end();
+ rotaryIter = m_rotaries.end();
}
// Add signal mapping
@@ -522,42 +494,18 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
// If there are more rotary widgets than this instrument needs,
// delete them.
- if (rmi != m_rotaries.end()) {
- for (RotaryInfoVector::iterator rmj = rmi; rmj != m_rotaries.end(); ++rmj) {
- delete rmj->rotary;
- delete rmj->label;
+ if (rotaryIter != m_rotaries.end()) {
+ for (RotaryInfoVector::iterator it = rotaryIter; it != m_rotaries.end(); ++it) {
+ // ??? Instead of deleting and recreating, we could hide the
+ // extras and bring them back when needed.
+ delete it->rotary;
+ delete it->label;
}
- m_rotaries = RotaryInfoVector(m_rotaries.begin(), rmi);
+ m_rotaries.resize(count);
}
}
void
-MIDIInstrumentParameterPanel::setRotaryToValue(int controller, int value)
-{
- RG_DEBUG << "setRotaryToValue(controller => " << controller << ", value => " << value << ")";
-
- for (RotaryInfoVector::iterator it = m_rotaries.begin(); it != m_rotaries.end(); ++it) {
- if (it->controller == controller) {
- it->rotary->setPosition(float(value));
- return ;
- }
- }
-}
-
-int
-MIDIInstrumentParameterPanel::getValueFromRotary(int controller)
-{
- RG_DEBUG << "getValueFromRotary(" << controller << ")";
-
- for (RotaryInfoVector::iterator it = m_rotaries.begin(); it != m_rotaries.end(); ++it) {
- if (it->controller == controller)
- return int(it->rotary->getPosition());
- }
-
- return -1;
-}
-
-void
MIDIInstrumentParameterPanel::showBank(bool show)
{
// Show/hide all bank-related widgets.
@@ -571,14 +519,14 @@ MIDIInstrumentParameterPanel::updateBankComboBox()
{
RG_DEBUG << "updateBankComboBox()";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
MidiDevice *md =
- dynamic_cast<MidiDevice *>(m_selectedInstrument->getDevice());
+ dynamic_cast<MidiDevice *>(getSelectedInstrument()->getDevice());
if (!md) {
- std::cerr << "WARNING: MIDIInstrumentParameterPanel::updateBankComboBox(): No MidiDevice for Instrument " << m_selectedInstrument->getId() << '\n';
- return ;
+ std::cerr << "WARNING: MIDIInstrumentParameterPanel::updateBankComboBox(): No MidiDevice for Instrument " << getSelectedInstrument()->getId() << '\n';
+ return;
}
int currentBank = -1;
@@ -588,7 +536,7 @@ MIDIInstrumentParameterPanel::updateBankComboBox()
if (md->getVariationType() == MidiDevice::NoVariations) {
- banks = md->getBanks(m_selectedInstrument->isPercussion());
+ banks = md->getBanks(getSelectedInstrument()->isPercussion());
// If there are banks to display, show the bank widgets.
// Why not showBank(banks.size()>1)? Because that would hide the
@@ -599,7 +547,7 @@ MIDIInstrumentParameterPanel::updateBankComboBox()
// Find the selected bank in the MIDI Device's bank list.
for (unsigned int i = 0; i < banks.size(); ++i) {
- if (m_selectedInstrument->getProgram().getBank() == banks[i]) {
+ if (getSelectedInstrument()->getProgram().getBank().partialCompare(banks[i])) {
currentBank = i;
break;
}
@@ -620,9 +568,9 @@ MIDIInstrumentParameterPanel::updateBankComboBox()
MidiByteList bytes;
if (useMSB) {
- bytes = md->getDistinctMSBs(m_selectedInstrument->isPercussion());
+ bytes = md->getDistinctMSBs(getSelectedInstrument()->isPercussion());
} else {
- bytes = md->getDistinctLSBs(m_selectedInstrument->isPercussion());
+ bytes = md->getDistinctLSBs(getSelectedInstrument()->isPercussion());
}
// If more than one bank value is found, show the bank widgets.
@@ -633,12 +581,12 @@ MIDIInstrumentParameterPanel::updateBankComboBox()
if (useMSB) {
for (unsigned int i = 0; i < bytes.size(); ++i) {
BankList bl = md->getBanksByMSB
- (m_selectedInstrument->isPercussion(), bytes[i]);
+ (getSelectedInstrument()->isPercussion(), bytes[i]);
RG_DEBUG << "updateBankComboBox(): Have " << bl.size() << " variations for MSB " << bytes[i];
if (bl.size() == 0)
continue;
- if (m_selectedInstrument->getMSB() == bytes[i]) {
+ if (getSelectedInstrument()->getMSB() == bytes[i]) {
currentBank = banks.size();
}
banks.push_back(bl[0]);
@@ -646,13 +594,13 @@ MIDIInstrumentParameterPanel::updateBankComboBox()
} else {
for (unsigned int i = 0; i < bytes.size(); ++i) {
BankList bl = md->getBanksByLSB
- (m_selectedInstrument->isPercussion(), bytes[i]);
+ (getSelectedInstrument()->isPercussion(), bytes[i]);
RG_DEBUG << "updateBankComboBox(): Have " << bl.size() << " variations for LSB " << bytes[i];
if (bl.size() == 0)
continue;
- if (m_selectedInstrument->getLSB() == bytes[i]) {
+ if (getSelectedInstrument()->getLSB() == bytes[i]) {
currentBank = banks.size();
}
banks.push_back(bl[0]);
@@ -676,63 +624,66 @@ MIDIInstrumentParameterPanel::updateBankComboBox()
}
}
- // Keep bank value enabled if percussion map is in use
- if (m_percussionCheckBox->isChecked()) {
- m_bankComboBox->setEnabled(true);
- } else {
- m_bankComboBox->setEnabled(m_selectedInstrument->sendsBankSelect());
- }
+ m_bankComboBox->setEnabled(getSelectedInstrument()->sendsBankSelect());
+
+#if 0
+// ??? This is a pretty nifty idea, but unfortunately, it requires
+// that we maintain a bogus combobox entry. For now, we'll go
+// with the simpler "unselected" approach.
// If the current bank was not found...
if (currentBank < 0 && !banks.empty()) {
- RG_DEBUG << "updateBankComboBox(): Current bank not found.";
- // Go with the first one.
- // ??? Side-effect. Need to rethink this.
- m_bankComboBox->setCurrentIndex(0);
- slotSelectBank(0);
-
- return;
+ // Format bank MSB:LSB and add to combobox.
+ MidiBank bank = getSelectedInstrument()->getProgram().getBank();
+ QString bankString = QString("%1:%2").arg(bank.getMSB()).arg(bank.getLSB());
+ m_bankComboBox->addItem(bankString);
+ currentBank = banks.size();
}
+#endif
+
+ // If the bank wasn't in the Device, show the bank widgets so
+ // the user can fix it if they want.
+ if (currentBank == -1 && !banks.empty())
+ showBank(true);
// Display the current bank.
m_bankComboBox->setCurrentIndex(currentBank);
}
+bool
+MIDIInstrumentParameterPanel::hasNoName(const MidiProgram &p)
+{
+ return (p.getName() == "");
+}
+
void
MIDIInstrumentParameterPanel::updateProgramComboBox()
{
RG_DEBUG << "updateProgramComboBox()";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
MidiDevice *md =
- dynamic_cast<MidiDevice *>(m_selectedInstrument->getDevice());
+ dynamic_cast<MidiDevice *>(getSelectedInstrument()->getDevice());
if (!md) {
- std::cerr << "WARNING: MIDIInstrumentParameterPanel::updateProgramComboBox(): No MidiDevice for Instrument " << m_selectedInstrument->getId() << '\n';
- return ;
+ std::cerr << "WARNING: MIDIInstrumentParameterPanel::updateProgramComboBox(): No MidiDevice for Instrument " << getSelectedInstrument()->getId() << '\n';
+ return;
}
RG_DEBUG << "updateProgramComboBox(): variation type is " << md->getVariationType();
- MidiBank bank = m_selectedInstrument->getProgram().getBank();
+ MidiBank bank = getSelectedInstrument()->getProgram().getBank();
- ProgramList programsAll = md->getPrograms(bank);
+ ProgramList programs =
+ md->getPrograms0thVariation(getSelectedInstrument()->isPercussion(), bank);
- // Filter out the programs that have no name.
- // ??? We should probably do this in place with erase(). Although
- // ProgramList is a vector, it's very unlikely that we will ever
- // find anything to erase(), so performance isn't an issue. We
- // would just need to be careful to avoid using an invalidated
- // iterator. Should be able to avoid that by sticking to indexes.
- ProgramList programs;
- for (unsigned i = 0; i < programsAll.size(); ++i) {
- if (programsAll[i].getName() != "") {
- programs.push_back(programsAll[i]);
- }
- }
+ // Remove the programs that have no name.
+ programs.erase(std::remove_if(programs.begin(), programs.end(),
+ MIDIInstrumentParameterPanel::hasNoName),
+ programs.end());
- // If we've got programs, show the Program and "Receive external" widgets.
+ // If we've got programs, show the Program widgets.
// Why not "show = (programs.size()>1)"? Because that would hide the
// program checkbox which would take away the user's ability to
// enable/disable program changes. If we do away with the checkbox
@@ -741,21 +692,20 @@ MIDIInstrumentParameterPanel::updateProgramComboBox()
m_programLabel->setVisible(show);
m_programCheckBox->setVisible(show);
m_programComboBox->setVisible(show);
- m_receiveExternalCheckBox->setVisible(show);
- m_receiveExternalLabel->setVisible(show);
int currentProgram = -1;
// Compute the current program.
for (unsigned i = 0; i < programs.size(); ++i) {
- if (m_selectedInstrument->getProgram() == programs[i]) {
+ // If the program change is the same...
+ if (getSelectedInstrument()->getProgram().getProgram() == programs[i].getProgram()) {
currentProgram = i;
break;
}
}
// If the programs have changed, we need to repopulate the combobox.
- if (programs != m_programs)
+ if (!partialCompareWithName(programs, m_programs))
{
// Update the cache.
m_programs = programs;
@@ -769,23 +719,21 @@ MIDIInstrumentParameterPanel::updateProgramComboBox()
}
}
- // Keep program value enabled if percussion map is in use
- if (m_percussionCheckBox->isChecked()) {
- m_programComboBox->setEnabled(true);
- } else {
- m_programComboBox->setEnabled(m_selectedInstrument->sendsProgramChange());
- }
+ m_programComboBox->setEnabled(getSelectedInstrument()->sendsProgramChange());
+
+#if 0
+// ??? This is a pretty nifty idea, but unfortunately, it requires
+// that we maintain a bogus combobox entry. For now, we'll go
+// with the simpler "unselected" approach.
// If the current program was not found...
if (currentProgram < 0 && !m_programs.empty()) {
- RG_DEBUG << "updateProgramComboBox(): Current program not found.";
- // Go with the first one.
- // ??? Side-effect. Need to rethink this.
- m_programComboBox->setCurrentIndex(0);
- slotSelectProgram(0);
-
- return;
+ // Format program change and add to combobox.
+ MidiByte programChange = getSelectedInstrument()->getProgram().getProgram();
+ m_programComboBox->addItem(QString::number(programChange + 1));
+ currentProgram = programs.size();
}
+#endif
// Display the current program.
m_programComboBox->setCurrentIndex(currentProgram);
@@ -805,14 +753,14 @@ MIDIInstrumentParameterPanel::updateVariationComboBox()
{
RG_DEBUG << "updateVariationComboBox() begin...";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
- MidiDevice *md = dynamic_cast<MidiDevice*>
- (m_selectedInstrument->getDevice());
+ MidiDevice *md =
+ dynamic_cast<MidiDevice *>(getSelectedInstrument()->getDevice());
if (!md) {
- std::cerr << "WARNING: MIDIInstrumentParameterPanel::updateVariationComboBox(): No MidiDevice for Instrument " << m_selectedInstrument->getId() << '\n';
- return ;
+ std::cerr << "WARNING: MIDIInstrumentParameterPanel::updateVariationComboBox(): No MidiDevice for Instrument " << getSelectedInstrument()->getId() << '\n';
+ return;
}
RG_DEBUG << "updateVariationComboBox(): Variation type is " << md->getVariationType();
@@ -828,14 +776,14 @@ MIDIInstrumentParameterPanel::updateVariationComboBox()
MidiByteList variationBanks;
if (useMSB) {
- MidiByte lsb = m_selectedInstrument->getLSB();
- variationBanks = md->getDistinctMSBs(m_selectedInstrument->isPercussion(),
+ MidiByte lsb = getSelectedInstrument()->getLSB();
+ variationBanks = md->getDistinctMSBs(getSelectedInstrument()->isPercussion(),
lsb);
RG_DEBUG << "updateVariationComboBox(): Have " << variationBanks.size() << " variations for LSB " << lsb;
} else {
- MidiByte msb = m_selectedInstrument->getMSB();
- variationBanks = md->getDistinctLSBs(m_selectedInstrument->isPercussion(),
+ MidiByte msb = getSelectedInstrument()->getMSB();
+ variationBanks = md->getDistinctLSBs(getSelectedInstrument()->isPercussion(),
msb);
RG_DEBUG << "updateVariationComboBox(): Have " << variationBanks.size() << " variations for MSB " << msb;
@@ -850,15 +798,15 @@ MIDIInstrumentParameterPanel::updateVariationComboBox()
// Assemble the program for the variation.
MidiBank bank;
if (useMSB) {
- bank = MidiBank(m_selectedInstrument->isPercussion(),
+ bank = MidiBank(getSelectedInstrument()->isPercussion(),
variationBanks[i],
- m_selectedInstrument->getLSB());
+ getSelectedInstrument()->getLSB());
} else {
- bank = MidiBank(m_selectedInstrument->isPercussion(),
- m_selectedInstrument->getMSB(),
+ bank = MidiBank(getSelectedInstrument()->isPercussion(),
+ getSelectedInstrument()->getMSB(),
variationBanks[i]);
}
- MidiProgram program(bank, m_selectedInstrument->getProgramChange());
+ MidiProgram program(bank, getSelectedInstrument()->getProgramChange());
// Skip any programs without names.
if (md->getProgramName(program) == "")
@@ -868,19 +816,20 @@ MIDIInstrumentParameterPanel::updateVariationComboBox()
}
// Compute the current variation.
+ // ??? This might be combined into the previous for loop.
int currentVariation = -1;
// For each variation
for (size_t i = 0; i < variations.size(); ++i) {
- if (m_selectedInstrument->getProgram() == variations[i]) {
+ if (getSelectedInstrument()->getProgram().partialCompare(variations[i])) {
currentVariation = i;
break;
}
}
// If the variations have changed, repopulate the combobox.
- if (m_variations != variations) {
+ if (!partialCompareWithName(variations, m_variations)) {
RG_DEBUG << "updateVariationComboBox(): Repopulating the combobox";
// Update the cache.
@@ -901,37 +850,33 @@ MIDIInstrumentParameterPanel::updateVariationComboBox()
}
}
- // If the current program was not found...
- if (currentVariation < 0 && !m_variations.empty()) {
- RG_DEBUG << "updateVariationComboBox(): Current variation not found.";
+ // Display the current variation.
+ m_variationComboBox->setCurrentIndex(currentVariation);
- // ??? There's actually no way to exercise this because
- // updateBankComboBox() always beats this routine to noticing
- // something is amiss.
+ // Show the variation widgets in either of two cases:
+ // 1. More than one variation is available for this program.
+ // 2. The variation was not in the Device and there is a variation
+ // to choose from.
+ showVariation(m_variations.size() > 1 ||
+ (currentVariation == -1 && !m_variations.empty()));
- // Go with the first one.
- // ??? Side-effect. Need to rethink this.
- m_variationComboBox->setCurrentIndex(0);
- slotSelectVariation(0);
+ m_variationComboBox->setEnabled(getSelectedInstrument()->sendsBankSelect());
+}
- // Via recursion (slotSelectVariation(0)), we've already done the
- // rest of this routine. (Recursion!? We *really* need to rethink
- // this.)
+void
+MIDIInstrumentParameterPanel::slotInstrumentChanged(Instrument *instrument)
+{
+ if (!instrument)
return;
- }
- // Display the current variation.
- m_variationComboBox->setCurrentIndex(currentVariation);
+ if (!getSelectedInstrument())
+ return;
- // If more than one variation is found, show the variation widgets.
- showVariation(m_variations.size() > 1);
+ // If this isn't a change for the Instrument we are displaying, bail.
+ if (getSelectedInstrument()->getId() != instrument->getId())
+ return;
- // Keep variation value enabled if percussion map is in use
- if (m_percussionCheckBox->isChecked()) {
- m_variationComboBox->setEnabled(true);
- } else {
- m_variationComboBox->setEnabled(m_selectedInstrument->sendsBankSelect());
- }
+ updateWidgets();
}
void
@@ -939,18 +884,23 @@ MIDIInstrumentParameterPanel::slotPercussionClicked(bool checked)
{
RG_DEBUG << "slotPercussionClicked(" << checked << ")";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
// Update the Instrument.
- m_selectedInstrument->setPercussion(checked);
-
- // Make sure other widgets are in sync.
- // ??? Shouldn't instrumentParametersChanged() trigger this?
- setupForInstrument(m_selectedInstrument);
-
- // Instrument::hasChanged()?
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ getSelectedInstrument()->setPercussion(checked);
+ getSelectedInstrument()->changed();
+
+ // At this point, the bank will be invalid. We could select
+ // the first valid bank/program for the current mode (percussion
+ // or not percussion). This seems to be the right thing to
+ // do for the most common use case of setting up a track for
+ // percussion on a new device. OTOH, the Device should already
+ // know which channels are percussion and which aren't. So, it
+ // seems highly unlikely that anyone will ever click the Percussion
+ // checkbox. Probably best just to leave this simple. The user
+ // will normally be presented with a blank bank combobox and they
+ // can fix the problem themselves.
}
void
@@ -958,18 +908,12 @@ MIDIInstrumentParameterPanel::slotBankClicked(bool checked)
{
RG_DEBUG << "slotBankClicked()";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
// Update the Instrument.
- m_selectedInstrument->setSendBankSelect(checked);
-
- // Make sure other widgets are in sync.
- // ??? Shouldn't instrumentParametersChanged() trigger this?
- setupForInstrument(m_selectedInstrument);
-
- // Instrument::hasChanged()?
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ getSelectedInstrument()->setSendBankSelect(checked);
+ getSelectedInstrument()->changed();
}
void
@@ -977,18 +921,12 @@ MIDIInstrumentParameterPanel::slotProgramClicked(bool checked)
{
RG_DEBUG << "slotProgramClicked()";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
// Update the Instrument.
- m_selectedInstrument->setSendProgramChange(checked);
-
- // Make sure other widgets are in sync.
- // ??? Shouldn't instrumentParametersChanged() trigger this?
- setupForInstrument(m_selectedInstrument);
-
- // Instrument::hasChanged()?
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ getSelectedInstrument()->setSendProgramChange(checked);
+ getSelectedInstrument()->changed();
}
void
@@ -1003,18 +941,12 @@ MIDIInstrumentParameterPanel::slotVariationClicked(bool checked)
// rid of this checkbox (and always send banks selects) and no one
// will notice.
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
// Update the Instrument.
- m_selectedInstrument->setSendBankSelect(checked);
-
- // Make sure other widgets are in sync.
- // ??? Shouldn't instrumentParametersChanged() trigger this?
- setupForInstrument(m_selectedInstrument);
-
- // Instrument::hasChanged()?
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ getSelectedInstrument()->setSendBankSelect(checked);
+ getSelectedInstrument()->changed();
}
void
@@ -1022,29 +954,29 @@ MIDIInstrumentParameterPanel::slotSelectBank(int index)
{
RG_DEBUG << "slotSelectBank() begin...";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
- MidiDevice *md = dynamic_cast<MidiDevice*>
- (m_selectedInstrument->getDevice());
+ MidiDevice *md =
+ dynamic_cast<MidiDevice *>(getSelectedInstrument()->getDevice());
if (!md) {
- std::cerr << "WARNING: MIDIInstrumentParameterPanel::slotSelectBank(): No MidiDevice for Instrument " << m_selectedInstrument->getId() << '\n';
- return ;
+ std::cerr << "WARNING: MIDIInstrumentParameterPanel::slotSelectBank(): No MidiDevice for Instrument " << getSelectedInstrument()->getId() << '\n';
+ return;
}
- const MidiBank *bank = &m_banks[index];
+ const MidiBank &bank = m_banks[index];
bool change = false;
if (md->getVariationType() != MidiDevice::VariationFromLSB) {
- if (m_selectedInstrument->getLSB() != bank->getLSB()) {
- m_selectedInstrument->setLSB(bank->getLSB());
+ if (getSelectedInstrument()->getLSB() != bank.getLSB()) {
+ getSelectedInstrument()->setLSB(bank.getLSB());
change = true;
}
}
if (md->getVariationType() != MidiDevice::VariationFromMSB) {
- if (m_selectedInstrument->getMSB() != bank->getMSB()) {
- m_selectedInstrument->setMSB(bank->getMSB());
+ if (getSelectedInstrument()->getMSB() != bank.getMSB()) {
+ getSelectedInstrument()->setMSB(bank.getMSB());
change = true;
}
}
@@ -1053,12 +985,70 @@ MIDIInstrumentParameterPanel::slotSelectBank(int index)
if (!change)
return;
- // Make sure other widgets are in sync.
- // ??? Shouldn't instrumentParametersChanged() trigger this?
- setupForInstrument(m_selectedInstrument);
+ // Make sure the Instrument is valid WRT the Device.
+
+ // If the current bank/program is not valid for this device, fix it.
+ if (!getSelectedInstrument()->isProgramValid()) {
- // Instrument::hasChanged()?
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ // If we're not in variations mode...
+ if (md->getVariationType() == MidiDevice::NoVariations) {
+
+ // ...go with the first program
+ ProgramList programList = md->getPrograms(bank);
+ if (!programList.empty()) {
+ // Switch to the first program in this bank.
+ getSelectedInstrument()->setProgram(programList.front());
+ } else {
+ // No programs for this bank. Just go with 0.
+ getSelectedInstrument()->setProgramChange(0);
+ }
+
+ } else { // We're in variations mode...
+
+ // This is the three-comboboxes (bank/program/variation) case.
+ // It's an extremely difficult case to handle, so we're just
+ // going to punt and give them the first program/variation in
+ // the bank they just selected.
+
+ // Get the variation bank list for this bank
+ BankList bankList;
+ if (md->getVariationType() == MidiDevice::VariationFromMSB) {
+ bankList = md->getBanksByLSB(
+ getSelectedInstrument()->isPercussion(), bank.getLSB());
+ } else {
+ bankList = md->getBanksByMSB(
+ getSelectedInstrument()->isPercussion(), bank.getMSB());
+ }
+ if (!bankList.empty()) {
+ // Pick the first bank
+ MidiBank firstBank = bankList.front();
+ // Get the program list
+ ProgramList programList = md->getPrograms(firstBank);
+ if (!programList.empty()) {
+ // Pick the first program
+ getSelectedInstrument()->setProgram(programList.front());
+ }
+ }
+
+ // To make the above more complex, we could consider the
+ // case where the Program Change happens to be valid for
+ // some variation bank in the newly selected bank. Then
+ // go with the 0th variation bank that has that program
+ // change. But I think this is complicated enough.
+
+ }
+ }
+
+ // This is why changed() isn't called within
+ // the setters. If it were, then each of the above changes would
+ // result in a change notification going out. Worst case, that
+ // would be three change notifications and the first two would be
+ // sent when the Instrument was in an inconsistent state.
+ // Rule: Avoid sending change notifications from setters.
+ // Why? It reduces the number of notifications which improves
+ // performance. It avoids sending notifications when an object's
+ // state is inconsistent. It avoids endless loops.
+ getSelectedInstrument()->changed();
}
void
@@ -1070,26 +1060,16 @@ MIDIInstrumentParameterPanel::slotExternalProgramChange(int programChange, int b
if (!m_receiveExternalCheckBox->isChecked())
return;
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
-#if 0
- MidiDevice *md =
- dynamic_cast<MidiDevice *>(m_selectedInstrument->getDevice());
-
- if (!md) {
- std::cerr << "WARNING: MIDIInstrumentParameterPanel::slotExternalProgramChange(): No MidiDevice for Instrument " << m_selectedInstrument->getId() << '\n';
- return ;
- }
-#endif
-
bool bankChanged = false;
// MSB Bank Select
if (bankMSB >= 0) { // && md->getVariationType() != MidiDevice::VariationFromMSB ) {
// If the MSB is changing
- if (m_selectedInstrument->getMSB() != bankMSB) {
- m_selectedInstrument->setMSB(bankMSB);
+ if (getSelectedInstrument()->getMSB() != bankMSB) {
+ getSelectedInstrument()->setMSB(bankMSB);
bankChanged = true;
}
}
@@ -1097,20 +1077,18 @@ MIDIInstrumentParameterPanel::slotExternalProgramChange(int programChange, int b
// LSB Bank Select
if (bankLSB >= 0) { // && md->getVariationType() != MidiDevice::VariationFromLSB) {
// If the LSB is changing
- if (m_selectedInstrument->getLSB() != bankLSB) {
- m_selectedInstrument->setLSB(bankLSB);
+ if (getSelectedInstrument()->getLSB() != bankLSB) {
+ getSelectedInstrument()->setLSB(bankLSB);
bankChanged = true;
}
}
bool pcChanged = false;
- // ??? Can programChange be -1?
-
// If the Program Change is changing
- if (m_selectedInstrument->getProgramChange() !=
+ if (getSelectedInstrument()->getProgramChange() !=
static_cast<MidiByte>(programChange)) {
- m_selectedInstrument->setProgramChange(static_cast<MidiByte>(programChange));
+ getSelectedInstrument()->setProgramChange(static_cast<MidiByte>(programChange));
pcChanged = true;
}
@@ -1118,12 +1096,15 @@ MIDIInstrumentParameterPanel::slotExternalProgramChange(int programChange, int b
if (!pcChanged && !bankChanged)
return;
- // Make sure other widgets are in sync.
- // ??? Shouldn't instrumentParametersChanged() trigger this?
- setupForInstrument(m_selectedInstrument);
+ // ??? If an unexpected bank/program change comes in, we could
+ // pop up a message box to let the user know the values so
+ // they can fix their device file. Might be pretty annoying.
+ // Maybe with a "[X] Don't *ever* show this pop-up again"
+ // checkbox.
- // Instrument::hasChanged()?
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ // Just one change notification for the three potential changes.
+ // See comments in slotSelectBank() for further discussion.
+ getSelectedInstrument()->changed();
}
void
@@ -1131,27 +1112,54 @@ MIDIInstrumentParameterPanel::slotSelectProgram(int index)
{
RG_DEBUG << "slotSelectProgram()";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
+ return;
+
+ MidiDevice *md =
+ dynamic_cast<MidiDevice *>(getSelectedInstrument()->getDevice());
+ if (!md)
return;
const MidiProgram *prg = &m_programs[index];
- if (prg == 0) {
- std::cerr << "MIDIInstrumentParameterPanel::slotSelectProgram(): Program change not found in bank.\n";
- return ;
- }
// If there has been no change, bail.
- if (m_selectedInstrument->getProgramChange() == prg->getProgram())
+ if (getSelectedInstrument()->getProgramChange() == prg->getProgram())
return;
- m_selectedInstrument->setProgramChange(prg->getProgram());
+ getSelectedInstrument()->setProgramChange(prg->getProgram());
+
+ // In Variations mode, select the 0th variation.
- // Make sure other widgets are in sync.
- // ??? Shouldn't instrumentParametersChanged() trigger this?
- setupForInstrument(m_selectedInstrument);
+ // In Variations mode, it's very easy to select an "invalid"
+ // program change. I.e. one for which the bank is not valid. Go
+ // from one program/variation to a program that doesn't have that
+ // variation. We need to handle that here by selecting the 0th
+ // variation. That's what the user expects.
+
+ if (md->getVariationType() == MidiDevice::VariationFromMSB) {
+ MidiBank bank = getSelectedInstrument()->getProgram().getBank();
+ // Get the list of MSB variations.
+ BankList bankList = md->getBanksByLSB(
+ getSelectedInstrument()->isPercussion(), bank.getLSB());
+ if (!bankList.empty()) {
+ // Pick the first MSB variation
+ getSelectedInstrument()->setMSB(bankList.front().getMSB());
+ }
+ }
+ if (md->getVariationType() == MidiDevice::VariationFromLSB) {
+ MidiBank bank = getSelectedInstrument()->getProgram().getBank();
+ // Get the list of LSB variations.
+ BankList bankList = md->getBanksByMSB(
+ getSelectedInstrument()->isPercussion(), bank.getMSB());
+ if (!bankList.empty()) {
+ // Pick the first LSB variation
+ getSelectedInstrument()->setLSB(bankList.front().getLSB());
+ }
+ }
- // Instrument::hasChanged()?
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ // Just one change notification for the two potential changes.
+ // See comments in slotSelectBank() for further discussion.
+ getSelectedInstrument()->changed();
}
void
@@ -1159,37 +1167,27 @@ MIDIInstrumentParameterPanel::slotSelectVariation(int index)
{
RG_DEBUG << "slotSelectVariation()";
- if (!m_selectedInstrument)
- return;
-
- if (index < 0 || index > static_cast<int>(m_variations.size())) {
- std::cerr << "WARNING: MIDIInstrumentParameterPanel::slotSelectVariation(): index " << index << " out of range\n";
+ if (!getSelectedInstrument())
return;
- }
MidiBank newBank = m_variations[index].getBank();
bool changed = false;
// Update bank MSB/LSB as needed.
- if (m_selectedInstrument->getMSB() != newBank.getMSB()) {
- m_selectedInstrument->setMSB(newBank.getMSB());
+ if (getSelectedInstrument()->getMSB() != newBank.getMSB()) {
+ getSelectedInstrument()->setMSB(newBank.getMSB());
changed = true;
}
- if (m_selectedInstrument->getLSB() != newBank.getLSB()) {
- m_selectedInstrument->setLSB(newBank.getLSB());
+ if (getSelectedInstrument()->getLSB() != newBank.getLSB()) {
+ getSelectedInstrument()->setLSB(newBank.getLSB());
changed = true;
}
if (!changed)
return;
- // Make sure other widgets are in sync.
- // ??? Shouldn't instrumentParametersChanged() trigger this?
- setupForInstrument(m_selectedInstrument);
-
- // Instrument::hasChanged()?
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ getSelectedInstrument()->changed();
}
// In place of the old sendBankAndProgram, instruments themselves now
@@ -1200,31 +1198,24 @@ MIDIInstrumentParameterPanel::slotControllerChanged(int controllerNumber)
{
RG_DEBUG << "slotControllerChanged(" << controllerNumber << ")";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
- int value = getValueFromRotary(controllerNumber);
+ int value = -1;
+
+ // Figure out who sent this signal.
+ Rotary *rotary = dynamic_cast<Rotary *>(m_rotaryMapper->mapping(controllerNumber));
+ if (rotary)
+ value = static_cast<int>(std::floor(rotary->getPosition() + .5));
if (value == -1) {
std::cerr << "MIDIInstrumentParameterPanel::slotControllerChanged(): Couldn't get value of rotary for controller " << controllerNumber << '\n';
return;
}
- m_selectedInstrument->setControllerValue(
+ getSelectedInstrument()->setControllerValue(
MidiByte(controllerNumber), MidiByte(value));
-
- // Make sure other widgets are in sync.
- // For this particular change, this is probably pretty pointless. But
- // since I'm heading toward having a single notification mechanism
- // (something like Instrument::hasChanged()), this is a good test to make
- // sure there aren't any hidden issues.
- // Rotary is smart enough to ignore this update since there will appear
- // to be no change from its perspective.
- // ??? Shouldn't instrumentParametersChanged() trigger this?
- setupForInstrument(m_selectedInstrument);
-
- // Instrument::hasChanged()?
- emit instrumentParametersChanged(m_selectedInstrument->getId());
+ getSelectedInstrument()->changed();
}
void
@@ -1233,14 +1224,17 @@ slotSelectChannel(int index)
{
RG_DEBUG << "slotSelectChannel(" << index << ")";
- if (!m_selectedInstrument)
+ if (!getSelectedInstrument())
return;
// Fixed
if (index == 1)
- m_selectedInstrument->setFixedChannel();
+ getSelectedInstrument()->setFixedChannel();
else // Auto
- m_selectedInstrument->releaseFixedChannel();
+ getSelectedInstrument()->releaseFixedChannel();
+
+ // A call to getSelectedInstrument()->changed() is not required as the
+ // auto/fixed channel feature has its own notification mechanisms.
}
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h
index 8d1ef8b..76c8326 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -20,11 +20,11 @@
#include "base/MidiProgram.h" // InstrumentId
#include "base/MidiDevice.h" // MidiByteList
-#include "gui/widgets/SqueezedLabel.h"
#include "InstrumentParameterPanel.h"
#include <QString>
+#include <QSharedPointer>
class QWidget;
@@ -38,24 +38,30 @@ class QComboBox;
namespace Rosegarden
{
+
class RosegardenDocument;
class MidiDevice;
class Instrument;
+class InstrumentStaticSignals;
class Rotary;
+class SqueezedLabel;
+/// "Instrument Parameters" box for MIDI Instrument's. AKA "MIPP".
class MIDIInstrumentParameterPanel : public InstrumentParameterPanel
{
Q_OBJECT
+
public:
MIDIInstrumentParameterPanel(RosegardenDocument *doc, QWidget *parent);
- /// Update all widgets from the Instrument.
+ /// Display a potentially different Instrument.
/**
- * Called each time the selected track changes.
+ * This is called whenever a different Instrument needs to be displayed.
+ * E.g. when the user selects a different track.
*/
- void setupForInstrument(Instrument *);
+ void displayInstrument(Instrument *);
/// Uncheck the Receive External checkbox.
/**
@@ -65,23 +71,8 @@ public:
*/
void clearReceiveExternal();
-signals:
- /// Emitted for almost any parameter change.
- /**
- * Connected to InstrumentParameterBox::changeInstrumentLabel().
- *
- * Oddly, never emitted for setupForInstrument(), the one time the
- * instrument and label might actually change.
- */
- void changeInstrumentLabel(InstrumentId id, QString label);
-
- /// Emitted for almost any parameter change.
- /**
- * Connected to InstrumentParameterBox::instrumentParametersChanged().
- */
- void instrumentParametersChanged(InstrumentId);
-
public slots:
+
/// Handle external Bank Selects and Program Changes.
/**
* When the "Receive External" checkbox is checked, this routine takes
@@ -111,6 +102,10 @@ public slots:
int programChange, int bankLSB, int bankMSB);
private slots:
+
+ /// Handle InstrumentStaticSignals::changed()
+ void slotInstrumentChanged(Instrument *);
+
/// Handle m_percussionCheckBox clicked()
void slotPercussionClicked(bool checked);
@@ -141,7 +136,7 @@ private:
// m_instrumentLabel is inherited from InstrumentParameterPanel.
- QLabel *m_connectionLabel;
+ SqueezedLabel *m_connectionLabel;
QCheckBox *m_percussionCheckBox;
@@ -161,11 +156,10 @@ private:
ProgramList m_programs;
/// From the selected instrument.
void updateProgramComboBox();
+ static bool hasNoName(const MidiProgram &p);
// Variation
QLabel *m_variationLabel;
- // ??? See comments in slotVariationClicked() related to getting
- // rid of this checkbox.
QCheckBox *m_variationCheckBox;
QComboBox *m_variationComboBox;
ProgramList m_variations;
@@ -184,14 +178,15 @@ private:
QFrame *m_rotaryFrame;
QGridLayout *m_rotaryGrid;
+ // ??? Consider creating a RotaryWithLabel class. Maybe derived
+ // from QWidget? Then much of the creation code in
+ // setupControllers() could be moved to this new class.
struct RotaryInfo
{
Rotary *rotary;
SqueezedLabel *label;
- int controller;
+ MidiByte controller;
};
- // ??? getValueFromRotary() and setRotaryToValue() would benefit
- // from this being a std::map indexed by controller.
typedef std::vector<RotaryInfo> RotaryInfoVector;
RotaryInfoVector m_rotaries;
@@ -200,10 +195,11 @@ private:
/// Create or update the rotary controls for each controller.
void setupControllers(MidiDevice *);
- int getValueFromRotary(int controller);
- void setRotaryToValue(int controller, int value);
-};
+ /// Update all widgets from the selected Instrument.
+ void updateWidgets();
+ QSharedPointer<InstrumentStaticSignals> m_instrumentStaticSignals;
+};
}
diff --git a/src/gui/editors/parameters/RosegardenParameterArea.cpp b/src/gui/editors/parameters/RosegardenParameterArea.cpp
index 5d46476..5551225 100644
--- a/src/gui/editors/parameters/RosegardenParameterArea.cpp
+++ b/src/gui/editors/parameters/RosegardenParameterArea.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file Copyright 2006 Martin Shepherd <mcs at astro.caltech.edu>.
diff --git a/src/gui/editors/parameters/RosegardenParameterArea.h b/src/gui/editors/parameters/RosegardenParameterArea.h
index 7887479..77da462 100644
--- a/src/gui/editors/parameters/RosegardenParameterArea.h
+++ b/src/gui/editors/parameters/RosegardenParameterArea.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file Copyright 2006 Martin Shepherd <mcs at astro.caltech.edu>.
diff --git a/src/gui/editors/parameters/RosegardenParameterBox.cpp b/src/gui/editors/parameters/RosegardenParameterBox.cpp
index e7bf346..580189a 100644
--- a/src/gui/editors/parameters/RosegardenParameterBox.cpp
+++ b/src/gui/editors/parameters/RosegardenParameterBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/parameters/RosegardenParameterBox.h b/src/gui/editors/parameters/RosegardenParameterBox.h
index 986534d..cfbd8dd 100644
--- a/src/gui/editors/parameters/RosegardenParameterBox.h
+++ b/src/gui/editors/parameters/RosegardenParameterBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 1f69247..158d200 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/parameters/SegmentParameterBox.h b/src/gui/editors/parameters/SegmentParameterBox.h
index cd41260..a41524b 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.h
+++ b/src/gui/editors/parameters/SegmentParameterBox.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -21,6 +21,7 @@
#include "base/Composition.h"
#include "base/MidiProgram.h"
+#include "base/Selection.h"
#include "gui/widgets/ColourTable.h"
#include "RosegardenParameterArea.h"
#include "RosegardenParameterBox.h"
@@ -43,7 +44,6 @@ namespace Rosegarden
class Command;
class TristateCheckBox;
class Label;
-class SegmentSelection;
class Segment;
class RosegardenDocument;
class Composition;
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index 146d7f8..6871cd5 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2006
Pedro Lopez-Cabanillas <plcl at users.sourceforge.net>
@@ -35,6 +35,7 @@
#include "base/Device.h"
#include "base/Exception.h"
#include "base/Instrument.h"
+#include "base/InstrumentStaticSignals.h"
#include "base/MidiDevice.h"
#include "base/MidiProgram.h"
#include "base/NotationTypes.h"
@@ -327,22 +328,22 @@ TrackParameterBox::TrackParameterBox(RosegardenDocument *doc,
m_defClef->setFont(m_font);
m_defClef->setToolTip(tr("<qt><p>New segments will be created with this clef inserted at the beginning</p></qt>"));
m_defClef->setMinimumWidth(width11);
- m_defClef->addItem(tr("treble"), TrebleClef);
- m_defClef->addItem(tr("bass"), BassClef);
- m_defClef->addItem(tr("crotales"), CrotalesClef);
- m_defClef->addItem(tr("xylophone"), XylophoneClef);
- m_defClef->addItem(tr("guitar"), GuitarClef);
- m_defClef->addItem(tr("contrabass"), ContrabassClef);
- m_defClef->addItem(tr("celesta"), CelestaClef);
- m_defClef->addItem(tr("old celesta"), OldCelestaClef);
- m_defClef->addItem(tr("french"), FrenchClef);
- m_defClef->addItem(tr("soprano"), SopranoClef);
- m_defClef->addItem(tr("mezzosoprano"), MezzosopranoClef);
- m_defClef->addItem(tr("alto"), AltoClef);
- m_defClef->addItem(tr("tenor"), TenorClef);
- m_defClef->addItem(tr("baritone"), BaritoneClef);
- m_defClef->addItem(tr("varbaritone"), VarbaritoneClef);
- m_defClef->addItem(tr("subbass"), SubbassClef);
+ m_defClef->addItem(tr("treble", "Clef name"), TrebleClef);
+ m_defClef->addItem(tr("bass", "Clef name"), BassClef);
+ m_defClef->addItem(tr("crotales", "Clef name"), CrotalesClef);
+ m_defClef->addItem(tr("xylophone", "Clef name"), XylophoneClef);
+ m_defClef->addItem(tr("guitar", "Clef name"), GuitarClef);
+ m_defClef->addItem(tr("contrabass", "Clef name"), ContrabassClef);
+ m_defClef->addItem(tr("celesta", "Clef name"), CelestaClef);
+ m_defClef->addItem(tr("old celesta", "Clef name"), OldCelestaClef);
+ m_defClef->addItem(tr("french", "Clef name"), FrenchClef);
+ m_defClef->addItem(tr("soprano", "Clef name"), SopranoClef);
+ m_defClef->addItem(tr("mezzosoprano", "Clef name"), MezzosopranoClef);
+ m_defClef->addItem(tr("alto", "Clef name"), AltoClef);
+ m_defClef->addItem(tr("tenor", "Clef name"), TenorClef);
+ m_defClef->addItem(tr("baritone", "Clef name"), BaritoneClef);
+ m_defClef->addItem(tr("varbaritone", "Clef name"), VarbaritoneClef);
+ m_defClef->addItem(tr("subbass", "Clef name"), SubbassClef);
/* clef types in the datbase that are not yet supported must be ignored for
* now:
m_defClef->addItem(tr("two bar"), TwoBarClef); */
@@ -466,6 +467,14 @@ TrackParameterBox::TrackParameterBox(RosegardenDocument *doc,
m_doc->getComposition().addObserver(this);
+ // Hold on to this to make sure it stays around as long as we do.
+ m_instrumentStaticSignals = Instrument::getStaticSignals();
+
+ connect(m_instrumentStaticSignals.data(),
+ SIGNAL(changed(Instrument *)),
+ this,
+ SLOT(slotInstrumentChanged(Instrument *)));
+
slotUpdateControls(-1);
}
@@ -965,9 +974,9 @@ TrackParameterBox::slotRecordingChannelChanged(int index)
}
void
-TrackParameterBox::slotInstrumentLabelChanged(InstrumentId id, QString label)
+TrackParameterBox::slotInstrumentChanged(Instrument * /*instrument*/)
{
- RG_DEBUG << "TrackParameterBox::slotInstrumentLabelChanged(" << id << ") = " << label << "\n";
+ //RG_DEBUG << "TrackParameterBox::slotInstrumentChanged()";
populatePlaybackDeviceList();
slotUpdateControls(-1);
}
diff --git a/src/gui/editors/parameters/TrackParameterBox.h b/src/gui/editors/parameters/TrackParameterBox.h
index 13aa3f3..611134b 100644
--- a/src/gui/editors/parameters/TrackParameterBox.h
+++ b/src/gui/editors/parameters/TrackParameterBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2006
Pedro Lopez-Cabanillas <plcl at users.sourceforge.net>
@@ -31,6 +31,7 @@
#include "gui/widgets/ColourTable.h"
#include <QString>
+#include <QSharedPointer>
#include <map>
#include <vector>
@@ -47,6 +48,7 @@ namespace Rosegarden
{
class RosegardenDocument;
+class InstrumentStaticSignals;
class TrackParameterBox : public RosegardenParameterBox,
@@ -81,7 +83,7 @@ public slots:
* the cryptic "-1".
*/
void slotUpdateControls(int dummy);
- void slotInstrumentLabelChanged(InstrumentId id, QString label);
+ void slotInstrumentChanged(Instrument *instrument);
void slotClefChanged(int clef);
void slotTransposeChanged(int transpose);
@@ -165,6 +167,7 @@ private:
void selectedTrackNameChanged();
+ QSharedPointer<InstrumentStaticSignals> m_instrumentStaticSignals;
};
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 75fe311..0bbb2c1 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/MarkerEditor.h b/src/gui/editors/segment/MarkerEditor.h
index 3477b65..98bf782 100644
--- a/src/gui/editors/segment/MarkerEditor.h
+++ b/src/gui/editors/segment/MarkerEditor.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/MarkerEditorViewItem.cpp b/src/gui/editors/segment/MarkerEditorViewItem.cpp
index 7b6ecc0..ce63e03 100644
--- a/src/gui/editors/segment/MarkerEditorViewItem.cpp
+++ b/src/gui/editors/segment/MarkerEditorViewItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/MarkerEditorViewItem.h b/src/gui/editors/segment/MarkerEditorViewItem.h
index 4d169d8..3270580 100644
--- a/src/gui/editors/segment/MarkerEditorViewItem.h
+++ b/src/gui/editors/segment/MarkerEditorViewItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index f4af393..3be8bce 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/PlayList.h b/src/gui/editors/segment/PlayList.h
index 87f9bf5..9b1e25f 100644
--- a/src/gui/editors/segment/PlayList.h
+++ b/src/gui/editors/segment/PlayList.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/PlayListDialog.cpp b/src/gui/editors/segment/PlayListDialog.cpp
index 5b2a784..ae01454 100644
--- a/src/gui/editors/segment/PlayListDialog.cpp
+++ b/src/gui/editors/segment/PlayListDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/PlayListDialog.h b/src/gui/editors/segment/PlayListDialog.h
index d8623ad..7cd99f4 100644
--- a/src/gui/editors/segment/PlayListDialog.h
+++ b/src/gui/editors/segment/PlayListDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/PlayListView.cpp b/src/gui/editors/segment/PlayListView.cpp
index 8057460..c79a588 100644
--- a/src/gui/editors/segment/PlayListView.cpp
+++ b/src/gui/editors/segment/PlayListView.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/PlayListView.h b/src/gui/editors/segment/PlayListView.h
index cfc7159..e39ca3d 100644
--- a/src/gui/editors/segment/PlayListView.h
+++ b/src/gui/editors/segment/PlayListView.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/PlayListViewItem.cpp b/src/gui/editors/segment/PlayListViewItem.cpp
index 8f54af6..43ef59a 100644
--- a/src/gui/editors/segment/PlayListViewItem.cpp
+++ b/src/gui/editors/segment/PlayListViewItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/PlayListViewItem.h b/src/gui/editors/segment/PlayListViewItem.h
index 3932ae3..6062f9f 100644
--- a/src/gui/editors/segment/PlayListViewItem.h
+++ b/src/gui/editors/segment/PlayListViewItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index 0efcb65..2252d11 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -28,6 +28,7 @@
#include "base/Composition.h"
#include "base/Device.h"
#include "base/Instrument.h"
+#include "base/InstrumentStaticSignals.h"
#include "base/MidiProgram.h"
#include "base/Studio.h"
#include "base/Track.h"
@@ -131,6 +132,14 @@ TrackButtons::TrackButtons(RosegardenDocument* doc,
setMinimumHeight(overallHeight);
m_doc->getComposition().addObserver(this);
+
+ // Hold on to this to make sure it stays around as long as we do.
+ m_instrumentStaticSignals = Instrument::getStaticSignals();
+
+ connect(m_instrumentStaticSignals.data(),
+ SIGNAL(changed(Instrument *)),
+ this,
+ SLOT(slotInstrumentChanged(Instrument *)));
}
TrackButtons::~TrackButtons() {
@@ -301,7 +310,7 @@ TrackButtons::slotToggleMute(int pos)
void
TrackButtons::removeButtons(int position)
{
- //RG_DEBUG << "TrackButtons::removeButtons - deleting track button at position " << position;
+ //RG_DEBUG << "removeButtons() - deleting track button at position:" << position;
if (position < 0 || position >= m_tracks) {
RG_DEBUG << "%%%%%%%%% BIG PROBLEM : TrackButtons::removeButtons() was passed a non-existing index\n";
@@ -881,10 +890,8 @@ TrackButtons::changeLabelDisplayMode(TrackLabel::DisplayMode mode)
}
void
-TrackButtons::changeInstrumentName(InstrumentId id, QString programChangeName)
+TrackButtons::slotInstrumentChanged(Instrument *instrument)
{
- //RG_DEBUG << "TrackButtons::changeInstrumentName( id =" << id << ", programChangeName = " << programChangeName << ")";
-
Composition &comp = m_doc->getComposition();
// For each track, search for the one with this instrument ID.
@@ -892,10 +899,45 @@ TrackButtons::changeInstrumentName(InstrumentId id, QString programChangeName)
for (int i = 0; i < m_tracks; i++) {
Track *track = comp.getTrackByPosition(i);
- if (track && track->getInstrument() == id) {
+ if (track && track->getInstrument() == instrument->getId()) {
// Set the program change name and update the UI.
- m_trackLabels[i]->setProgramChangeName(programChangeName);
+
+ // For a SoftSynth, use the plugin's name.
+ if (instrument->getType() == Instrument::SoftSynth) {
+
+ // ??? This code is in at least four places. Twice here, once
+ // in TrackParameterBox, once in ManageMetronomeDialog, ...
+ // Search on "strtoqstr(plugin->getIdentifier())" to find
+ // them.
+ // Probably should factor out into an AudioPluginInstance
+ // member. getDisplayName()?
+
+ AudioPluginInstance *plugin =
+ instrument->getPlugin(Instrument::SYNTH_PLUGIN_POSITION);
+ if (plugin) {
+ // we don't translate any plugin program names or other texts
+ QString pname = strtoqstr(plugin->getProgram());
+ QString identifier = strtoqstr(plugin->getIdentifier());
+ if (identifier != "") {
+ QString type, soName, label;
+ PluginIdentifier::parseIdentifier(identifier, type, soName, label);
+ if (pname == "") {
+ pname = strtoqstr(plugin->getDistinctiveConfigurationText());
+ }
+ if (pname != "") {
+ pname = QString("%1: %2").arg(label).arg(pname);
+ } else {
+ pname = label;
+ }
+ }
+
+ m_trackLabels[i]->setProgramChangeName(pname);
+ }
+ } else {
+ m_trackLabels[i]->setProgramChangeName(QObject::tr(instrument->getProgramName().c_str()));
+ }
+
m_trackLabels[i]->updateLabel();
}
@@ -1133,6 +1175,15 @@ TrackButtons::trackSelectionChanged(const Composition *, TrackId trackId)
}
void
+TrackButtons::segmentRemoved(const Composition *, Segment *)
+{
+ // If recording causes the track heights to change, this makes sure
+ // they go back if needed when recording stops.
+
+ slotUpdateTracks();
+}
+
+void
TrackButtons::slotTrackSelected(int trackId)
{
// Select the track.
diff --git a/src/gui/editors/segment/TrackButtons.h b/src/gui/editors/segment/TrackButtons.h
index b841835..05cf15a 100644
--- a/src/gui/editors/segment/TrackButtons.h
+++ b/src/gui/editors/segment/TrackButtons.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -25,6 +25,7 @@
#include "TrackLabel.h"
#include <QFrame>
#include <QString>
+#include <QSharedPointer>
#include <vector>
@@ -42,6 +43,7 @@ class TrackVUMeter;
class RosegardenDocument;
class LedButton;
class Instrument;
+class InstrumentStaticSignals;
/// The QFrame containing the various widgets for each track.
/**
@@ -98,9 +100,6 @@ public:
*/
void changeLabelDisplayMode(TrackLabel::DisplayMode mode);
- /// Handles a change to the Program in the Instrument Parameters box.
- void changeInstrumentName(InstrumentId id, QString programChangeName);
-
/// Fill the instrument popup menu with the available instruments.
/**
* @see RosegardenMainWindow::slotPopulateTrackInstrumentPopup()
@@ -286,6 +285,7 @@ protected:
virtual void trackChanged(const Composition *, Track*);
virtual void tracksDeleted(const Composition *, std::vector<TrackId> &trackIds);
virtual void trackSelectionChanged(const Composition *, TrackId trackId);
+ virtual void segmentRemoved(const Composition *, Segment *);
int labelWidth();
int trackHeight(TrackId trackId);
@@ -352,6 +352,9 @@ private slots:
/// Handles clicks from m_clickedSigMapper.
void slotTrackSelected(int trackId);
+ /// Handles a change to the Program in the Instrument Parameters box.
+ void slotInstrumentChanged(Instrument *instrument);
+
private:
// Hide copy ctor and op=
TrackButtons(const TrackButtons &);
@@ -359,6 +362,8 @@ private:
/// Select the given track. This displays it with a highlight.
void selectTrack(int position);
+
+ QSharedPointer<InstrumentStaticSignals> m_instrumentStaticSignals;
};
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 87a2ffc..6aa4a2c 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -44,10 +44,10 @@
#include "document/CommandHistory.h"
#include "document/RosegardenDocument.h"
#include "gui/application/RosegardenMainWindow.h"
+#include "gui/application/RosegardenMainViewWidget.h"
#include "gui/rulers/ChordNameRuler.h"
#include "gui/rulers/TempoRuler.h"
#include "gui/rulers/LoopRuler.h"
-#include "gui/general/IconLoader.h"
#include "gui/widgets/ProgressDialog.h"
#include "gui/widgets/DeferScrollArea.h"
#include "sound/AudioFile.h"
@@ -76,54 +76,59 @@
#include <QDropEvent>
#include <QMimeData>
+#include <vector>
+#include <algorithm>
+#include <math.h>
namespace Rosegarden
{
-TrackEditor::TrackEditor(RosegardenDocument* doc,
- QWidget* rosegardenguiview,
- RulerScale *rulerScale,
- bool showTrackLabels,
- double initialUnitsPerPixel,
- QWidget* parent) :
- QWidget(parent),
+
+TrackEditor::TrackEditor(RosegardenDocument *doc,
+ RosegardenMainViewWidget *mainViewWidget,
+ SimpleRulerScale *rulerScale,
+ bool showTrackLabels) :
+ QWidget(mainViewWidget),
m_doc(doc),
- m_rulerScale(rulerScale),
- m_topStandardRuler(0),
- m_bottomStandardRuler(0),
- m_trackButtons(0),
+ m_compositionRefreshStatusId(doc->getComposition().getNewRefreshStatusId()),
m_compositionView(0),
+ m_compositionModel(0),
+ m_playTracking(true),
+ m_trackCellHeight(0),
+ m_trackButtons(0),
m_trackButtonScroll(0),
m_showTrackLabels(showTrackLabels),
- m_canvasWidth(0),
- m_compositionRefreshStatusId(doc->getComposition().getNewRefreshStatusId()),
- m_playTracking(true),
- m_initialUnitsPerPixel(initialUnitsPerPixel)
+ m_rulerScale(rulerScale),
+ m_tempoRuler(0),
+ m_chordNameRuler(0),
+ m_topStandardRuler(0),
+ m_bottomStandardRuler(0)
+ //m_canvasWidth(0)
{
- // accept dnd
+ // Accept objects dragged and dropped onto this widget.
setAcceptDrops(true);
- //setDragEnabled(true);
-
-
- init(rosegardenguiview);
- slotReadjustCanvasSize();
-}
-TrackEditor::~TrackEditor()
-{
- delete m_chordNameRuler;
- delete m_compositionModel;
+ // ??? Only called here. Inline it here.
+ init(mainViewWidget);
+
+ updateCanvasSize();
}
void
-TrackEditor::init(QWidget* rosegardenguiview)
+TrackEditor::init(RosegardenMainViewWidget *mainViewWidget)
{
+ QFontMetrics fontMetrics(QApplication::font(this));
+ m_trackCellHeight = std::min(fontMetrics.height() + 9, 24);
+
QGridLayout *grid = new QGridLayout(this);
grid->setMargin(0);
grid->setSpacing(0);
- int trackLabelWidth = 200;
- int barButtonsHeight = 25;
+ // Height for top and bottom standard rulers.
+ // rename: standardRulerHeight
+ const int barButtonsHeight = 25;
+
+ // Top Rulers
m_chordNameRuler = new ChordNameRuler(m_rulerScale,
m_doc,
@@ -132,8 +137,6 @@ TrackEditor::init(QWidget* rosegardenguiview)
this);
grid->addWidget(m_chordNameRuler, 0, 1);
-// m_chordNameRuler->hide();
-
m_tempoRuler = new TempoRuler(m_rulerScale,
m_doc,
RosegardenMainWindow::self(),
@@ -141,16 +144,9 @@ TrackEditor::init(QWidget* rosegardenguiview)
24,
true,
this);
-
- grid->addWidget(m_tempoRuler, 1, 1);
-
m_tempoRuler->connectSignals();
+ grid->addWidget(m_tempoRuler, 1, 1);
-// m_tempoRuler->hide();
-
- //
- // Top Bar Buttons
- //
m_topStandardRuler = new StandardRuler(m_doc,
m_rulerScale,
0,
@@ -159,49 +155,21 @@ TrackEditor::init(QWidget* rosegardenguiview)
true,
this);
m_topStandardRuler->connectRulerToDocPointer(m_doc);
- m_topStandardRuler->setContentsMargins(2,0,0,0);
-
grid->addWidget(m_topStandardRuler, 2, 1);
-// m_topStandardRuler->hide();
+ // Segment Canvas (CompositionView)
- //
- // Segment Canvas
- //
- m_compositionModel = new CompositionModelImpl(m_doc->getComposition(),
- m_doc->getStudio(),
- m_rulerScale, getTrackCellHeight());
-
- connect(rosegardenguiview, SIGNAL(instrumentParametersChanged(InstrumentId)),
- m_compositionModel, SLOT(slotInstrumentParametersChanged(InstrumentId)));
- connect(rosegardenguiview->parent(), SIGNAL(instrumentParametersChanged(InstrumentId)),
- m_compositionModel, SLOT(slotInstrumentParametersChanged(InstrumentId)));
+ m_compositionModel =
+ new CompositionModelImpl(this,
+ m_doc->getComposition(),
+ m_doc->getStudio(),
+ m_rulerScale, m_trackCellHeight);
m_compositionView = new CompositionView(m_doc, m_compositionModel, this);
+ m_compositionView->verticalScrollBar()->setSingleStep(m_trackCellHeight);
- IconLoader il;
-
- QSettings settings;
- settings.beginGroup( GeneralOptionsConfigGroup );
-
- if ( qStrToBool( settings.value("backgroundtextures", "true" ) ) ) {
+ // Bottom Ruler
- QPixmap background = il.loadPixmap("bg-segmentcanvas");
-
- if (!background.isNull()) {
- m_compositionView->setBackgroundPixmap(background);
-// m_compositionView->viewport()->setBackgroundPixmap(background);
- QPalette palette;
- palette.setBrush(m_compositionView->backgroundRole(), QBrush(background));
- palette.setBrush(m_compositionView->viewport()->backgroundRole(), QBrush(background));
- m_compositionView->setPalette(palette);
- m_compositionView->viewport()->setPalette(palette);
- }
- }
-
- //
- // Bottom Bar Buttons
- //
m_bottomStandardRuler = new StandardRuler(m_doc,
m_rulerScale,
0,
@@ -210,32 +178,41 @@ TrackEditor::init(QWidget* rosegardenguiview)
true,
m_compositionView);
m_bottomStandardRuler->connectRulerToDocPointer(m_doc);
- m_bottomStandardRuler->setContentsMargins(2,0,0,0);
- m_compositionView->setBottomFixedWidget(m_bottomStandardRuler);
+ m_compositionView->setBottomRuler(m_bottomStandardRuler);
- grid->addWidget(m_compositionView, 3, 1, 2, 1); // Multi-cell widget FromRow, FromCol, RowSpan, ColSpan
+ // Span 2 rows (3 and 4) so that there is an extra cell at the bottom of
+ // column 0 to take up space below the TrackButtons.
+ grid->addWidget(m_compositionView, 3, 1, 2, 1);
- QSize hsbSize = m_compositionView->horizontalScrollBar()->sizeHint();
- grid->setRowMinimumHeight(4,hsbSize.height() + m_bottomStandardRuler->height());
+ // Reserve space at the bottom below the TrackButtons to make sure they
+ // don't extend down too far.
+ // ??? This looks great when there is no horizontal scrollbar (zoom all
+ // the way out). It extends too far down when there *is* a
+ // scrollbar. Need to figure out a way to update this when the
+ // scrollbar shows/hides. Use m_compositionView->viewport()
+ // to do the computations since it takes the scrollbar and ruler
+ // into account.
+ grid->setRowMinimumHeight(4, m_bottomStandardRuler->sizeHint().height());
- grid->setColumnStretch(1, 10); // to make sure the seg canvas doesn't leave a "blank" grey space when
- // loading a file which has a low zoom factor
+ // Make sure the segment canvas doesn't leave a "blank" grey space when
+ // loading a file which has a low zoom factor.
+ grid->setColumnStretch(1, 10);
// Track Buttons
- //
+
m_trackButtonScroll = new DeferScrollArea(this);
// Scroll bars always off
m_trackButtonScroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_trackButtonScroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
grid->addWidget(m_trackButtonScroll, 3, 0);
-
- int canvasHeight = getTrackCellHeight() *
+ const int trackLabelWidth = 200;
+ const int canvasHeight = m_trackCellHeight *
std::max(40u, m_doc->getComposition().getNbTracks());
m_trackButtons = new TrackButtons(m_doc,
- getTrackCellHeight(),
+ m_trackCellHeight,
trackLabelWidth,
m_showTrackLabels,
canvasHeight,
@@ -245,17 +222,19 @@ TrackEditor::init(QWidget* rosegardenguiview)
m_trackButtonScroll->setWidget(m_trackButtons);
+ // Connections
+
//connect(m_trackButtons, SIGNAL(widthChanged()),
// this, SLOT(slotTrackButtonsWidthChanged()));
connect(m_trackButtons, SIGNAL(trackSelected(int)),
- rosegardenguiview, SLOT(slotSelectTrackSegments(int)));
+ mainViewWidget, SLOT(slotSelectTrackSegments(int)));
connect(m_trackButtons, SIGNAL(instrumentSelected(int)),
- rosegardenguiview, SLOT(slotUpdateInstrumentParameterBox(int)));
+ mainViewWidget, SLOT(slotUpdateInstrumentParameterBox(int)));
connect(this, SIGNAL(stateChange(QString, bool)),
- rosegardenguiview, SIGNAL(stateChange(QString, bool)));
+ mainViewWidget, SIGNAL(stateChange(QString, bool)));
// No such signal. Was there ever?
// connect(m_trackButtons, SIGNAL(modified()),
@@ -263,13 +242,13 @@ TrackEditor::init(QWidget* rosegardenguiview)
// connect loop rulers' follow-scroll signals
connect(m_topStandardRuler->getLoopRuler(), SIGNAL(startMouseMove(int)),
- m_compositionView, SLOT(startAutoScroll(int)));
+ m_compositionView, SLOT(slotStartAutoScroll(int)));
connect(m_topStandardRuler->getLoopRuler(), SIGNAL(stopMouseMove()),
- m_compositionView, SLOT(stopAutoScroll()));
+ m_compositionView, SLOT(slotStopAutoScroll()));
connect(m_bottomStandardRuler->getLoopRuler(), SIGNAL(startMouseMove(int)),
- m_compositionView, SLOT(startAutoScroll(int)));
+ m_compositionView, SLOT(slotStartAutoScroll(int)));
connect(m_bottomStandardRuler->getLoopRuler(), SIGNAL(stopMouseMove()),
- m_compositionView, SLOT(stopAutoScroll()));
+ m_compositionView, SLOT(slotStopAutoScroll()));
//&&& Interesting one here. Q(3)ScrollArea had a contentsMoving signal we
// used to grab for some purpose. Q(Abstract)ScrollArea has no usable
@@ -280,22 +259,20 @@ TrackEditor::init(QWidget* rosegardenguiview)
//connect(m_compositionView, SIGNAL(contentsMoving(int, int)),
// this, SLOT(slotCanvasScrolled(int, int)));
- // Synchronize bar buttons' scrollview with segment canvas' scrollbar
- //
+ // Synchronize TrackButtons scroll area (m_trackButtonScroll) with
+ // segment canvas's vertical scrollbar.
connect(m_compositionView->verticalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(slotVerticalScrollTrackButtons(int)));
-// connect(m_vertScrollBar, SIGNAL(valueChanged(int)),
-// this, SLOT(slotVerticalScrollTrackButtons(int)));
-
connect(m_compositionView->verticalScrollBar(), SIGNAL(sliderMoved(int)),
this, SLOT(slotVerticalScrollTrackButtons(int)));
- // scrolling with mouse wheel
+ // Connect scrolling with the mouse wheel in the TrackButtons to
+ // scrolling the CompositionView.
connect(m_trackButtonScroll, SIGNAL(gotWheelEvent(QWheelEvent*)),
m_compositionView, SLOT(slotExternalWheelEvent(QWheelEvent*)));
- // Connect horizontal scrollbar
- //
+ // Synchronize the rulers with the horizontal scrollbar.
+
connect(m_compositionView->horizontalScrollBar(), SIGNAL(valueChanged(int)),
m_topStandardRuler, SLOT(slotScrollHoriz(int)));
connect(m_compositionView->horizontalScrollBar(), SIGNAL(sliderMoved(int)),
@@ -321,42 +298,40 @@ TrackEditor::init(QWidget* rosegardenguiview)
// m_compositionView, SLOT(slotUpdateAll()));
connect(m_compositionView->getModel(),
- SIGNAL(selectedSegments(const SegmentSelection &)),
- rosegardenguiview,
+ SIGNAL(selectionChanged(const SegmentSelection &)),
+ mainViewWidget,
SLOT(slotSelectedSegments(const SegmentSelection &)));
+ connect(m_compositionView, SIGNAL(viewportResize()),
+ this, SLOT(slotViewportResize()));
connect(m_compositionView, SIGNAL(zoomIn()),
RosegardenMainWindow::self(), SLOT(slotZoomIn()));
connect(m_compositionView, SIGNAL(zoomOut()),
RosegardenMainWindow::self(), SLOT(slotZoomOut()));
connect(CommandHistory::getInstance(), SIGNAL(commandExecuted()),
- this, SLOT(update()));
+ this, SLOT(slotCommandExecuted()));
connect(m_doc, SIGNAL(pointerPositionChanged(timeT)),
this, SLOT(slotSetPointerPosition(timeT)));
- //
- // pointer and loop drag signals from top and bottom bar buttons (loop rulers actually)
- //
+ // Top/Bottom ruler pointer drag.
connect(m_topStandardRuler, SIGNAL(dragPointerToPosition(timeT)),
this, SLOT(slotPointerDraggedToPosition(timeT)));
connect(m_bottomStandardRuler, SIGNAL(dragPointerToPosition(timeT)),
this, SLOT(slotPointerDraggedToPosition(timeT)));
+ // Top/Bottom ruler loop drag.
connect(m_topStandardRuler, SIGNAL(dragLoopToPosition(timeT)),
this, SLOT(slotLoopDraggedToPosition(timeT)));
connect(m_bottomStandardRuler, SIGNAL(dragLoopToPosition(timeT)),
this, SLOT(slotLoopDraggedToPosition(timeT)));
- connect(m_doc, SIGNAL(loopChanged(timeT,
- timeT)),
+ connect(m_doc, SIGNAL(loopChanged(timeT, timeT)),
this, SLOT(slotSetLoop(timeT, timeT)));
-
- settings.endGroup();
}
-void TrackEditor::slotReadjustCanvasSize()
+void TrackEditor::updateCanvasSize()
{
m_compositionView->slotUpdateSize();
}
@@ -373,151 +348,55 @@ void TrackEditor::slotTrackButtonsWidthChanged()
}
#endif
-int TrackEditor::getTrackCellHeight() const
-{
- int size;
- static QFont defaultFont;
-
- // do some scrabbling around for a reasonable size
- //
- size = defaultFont.pixelSize();
-
- if (size < 8) {
- if (QApplication::font(this).pixelSize() < 8)
- size = 12;
- else
- size = QApplication::font(this).pixelSize();
- }
-
- return size + 12;
-}
-
-bool TrackEditor::isCompositionModified()
-{
- return m_doc->getComposition().getRefreshStatus
- (m_compositionRefreshStatusId).needsRefresh();
-}
-
-void TrackEditor::setCompositionModified(bool c)
-{
- m_doc->getComposition().getRefreshStatus
- (m_compositionRefreshStatusId).setNeedsRefresh(c);
-}
-
void TrackEditor::updateRulers()
{
- if (getTempoRuler() != 0)
- getTempoRuler()->update();
+ if (m_tempoRuler)
+ m_tempoRuler->update();
- if (getChordNameRuler() != 0)
- getChordNameRuler()->update();
+ if (m_chordNameRuler)
+ m_chordNameRuler->update();
- getTopStandardRuler()->update();
- getBottomStandardRuler()->update();
-}
-
-void TrackEditor::paintEvent(QPaintEvent* e)
-{
-#if 0
- RG_DEBUG << "TrackEditor::paintEvent()";
- static QTime t;
- RG_DEBUG << " elapsed: " << t.restart();
- QRect wr = rect();
- RG_DEBUG << " widget rect: (" << wr.x() << "," << wr.y() << ") - (" << wr.right() << "," << wr.bottom() << ")";
- QRect r = e->rect();
- RG_DEBUG << " pe rect: (" << r.x() << "," << r.y() << ") - (" << r.right() << "," << r.bottom() << ")";
- QVector<QRect> rects = e->region().rects();
- for (unsigned i = 0; i < (unsigned)rects.size(); ++i) {
- QRect &s = rects[i];
- RG_DEBUG << " pe region rect #" << i+1 << " (" << s.x() << "," << s.y() << ") - (" << s.right() << "," << s.bottom() << ")";
- }
-#endif
-
- // ??? If we are asked to paint, we should paint. It shouldn't matter
- // whether anything has changed. This may be here as a way to stop the
- // endless loop that would otherwise be created by the
- // m_compositionView->updateContents() call inside this "if".
- if (isCompositionModified()) {
-
- //RG_DEBUG << "TrackEditor::paintEvent: Composition modified";
-
- // !!! These calls from within a paintEvent look ugly
- // ??? Need to investigate each of these calls and see if we can
- // implement them in a more appropriate way. Some are causing
- // serious CPU issues. None belong here.
+ if (m_topStandardRuler)
+ m_topStandardRuler->update();
- slotReadjustCanvasSize();
-
- // ??? At one time, this was linked to excessive CPU usage while
- // recording MIDI. Now, it doesn't seem to make much difference.
- m_trackButtons->slotUpdateTracks();
-
- m_compositionView->clearSegmentRectsCache(true);
-
- // ??? This is directly contrary to the advice in the Qt docs. This
- // is asking a child QWidget to paint itself. From the Qt docs for
- // QWidget::paintEvent():
- // "Generally, you should refrain from calling update() or
- // repaint() inside a paintEvent(). For example, calling
- // update() or repaint() on children inside a paintevent()
- // results in undefined behavior; the child may or may not get
- // a paint event."
- m_compositionView->updateContents();
-
- //m_compositionView->update();
-
- Composition &composition = m_doc->getComposition();
-
- if (composition.getNbSegments() == 0) {
- emit stateChange("have_segments", false); // no segments : reverse state
- emit stateChange("have_selection", false); // no segments : reverse state
- } else {
- emit stateChange("have_segments", true);
- if (m_compositionView->haveSelection())
- emit stateChange("have_selection", true);
- else
- emit stateChange("have_selection", false); // no selection : reverse state
- }
-
- setCompositionModified(false);
- }
-
- QWidget::paintEvent(e);
+ if (m_bottomStandardRuler)
+ m_bottomStandardRuler->update();
}
-void TrackEditor::slotAddTracks(unsigned int nbNewTracks,
- InstrumentId id,
- int position)
+void TrackEditor::addTracks(unsigned int nbNewTracks,
+ InstrumentId id,
+ int position)
{
Composition &comp = m_doc->getComposition();
- AddTracksCommand* command = new AddTracksCommand(&comp, nbNewTracks, id,
- position);
- addCommandToHistory(command);
- slotReadjustCanvasSize();
+ addCommandToHistory(new AddTracksCommand(&comp, nbNewTracks, id, position));
+
+ updateCanvasSize();
}
-void TrackEditor::slotDeleteTracks(std::vector<TrackId> tracks)
+void TrackEditor::deleteTracks(std::vector<TrackId> tracks)
{
MacroCommand *macro = new MacroCommand(tr("Delete Tracks"));
Composition &comp = m_doc->getComposition();
- const segmentcontainer &segments = comp.getSegments();
+ const SegmentMultiSet &segments = comp.getSegments();
// Delete the segments.
// for each track we are deleting
for (size_t i = 0; i < tracks.size(); ++i) {
- TrackId trackId = tracks[i];
+ const TrackId trackId = tracks[i];
// for each segment in the composition
- for (segmentcontainer::const_iterator j = segments.begin();
- j != segments.end();
- ++j) {
+ for (SegmentMultiSet::const_iterator segmentIter = segments.begin();
+ segmentIter != segments.end();
+ ++segmentIter) {
+ Segment *segment = *segmentIter;
+
// if this segment is in the track
- if ((*j)->getTrack() == trackId) {
+ if (segment->getTrack() == trackId) {
macro->addCommand(new SegmentEraseCommand(
- *j, &m_doc->getAudioFileManager()));
+ segment, &m_doc->getAudioFileManager()));
}
}
}
@@ -528,6 +407,7 @@ void TrackEditor::slotDeleteTracks(std::vector<TrackId> tracks)
addCommandToHistory(macro);
}
+#if 0
void TrackEditor::addSegment(int track, int time, unsigned int duration)
{
if (!m_doc)
@@ -538,6 +418,7 @@ void TrackEditor::addSegment(int track, int time, unsigned int duration)
addCommandToHistory(command);
}
+#endif
#if 0
// Dead Code.
@@ -551,6 +432,7 @@ void TrackEditor::slotSegmentOrderChanged(int section, int fromIdx, int toIdx)
}
#endif
+#if 0
void
TrackEditor::slotCanvasScrolled(int x, int /*y*/)
{
@@ -570,44 +452,34 @@ TrackEditor::slotCanvasScrolled(int x, int /*y*/)
// slotSetPointerPosition(t);
}
}
+#endif
void
-TrackEditor::slotSetPointerPosition(timeT position)
+TrackEditor::slotSetPointerPosition(timeT pointerTime)
{
- SimpleRulerScale *ruler =
- dynamic_cast<SimpleRulerScale*>(m_rulerScale);
-
- if (!ruler)
- return ;
-
- double pos = m_compositionView->grid().getRulerScale()->getXForTime(position);
-
- int currentPointerPos = m_compositionView->getPointerPos();
+ if (!m_rulerScale)
+ return;
- double distance = pos - currentPointerPos;
- if (distance < 0.0)
- distance = -distance;
+ const double newPosition = m_rulerScale->getXForTime(pointerTime);
+ const int currentPosition = m_compositionView->getPointerPos();
+ const double distance = fabs(newPosition - currentPosition);
+ // If we're moving at least one pixel
if (distance >= 1.0) {
- if (m_doc && m_doc->getSequenceManager() &&
- (m_doc->getSequenceManager()->getTransportStatus() != STOPPED)) {
+ if (m_doc && m_doc->getSequenceManager() &&
+ m_doc->getSequenceManager()->getTransportStatus() != STOPPED) {
if (m_playTracking) {
- getCompositionView()->slotScrollHoriz(int(double(position) / ruler->getUnitsPerPixel()));
+ m_compositionView->scrollHoriz(newPosition);
}
- } else if (!getCompositionView()->isAutoScrolling()) {
- int newpos = int(double(position) / ruler->getUnitsPerPixel());
- // RG_DEBUG << "TrackEditor::slotSetPointerPosition("
- // << position
- // << ") : calling canvas->slotScrollHoriz() "
- // << newpos << endl;
- getCompositionView()->slotScrollHoriz(newpos);
+ } else if (!m_compositionView->isAutoScrolling()) {
+ m_compositionView->scrollHoriz(newPosition);
}
- m_compositionView->setPointerPos(pos);
- }
+ m_compositionView->drawPointer(newPosition);
+ }
}
void
@@ -618,45 +490,40 @@ TrackEditor::slotPointerDraggedToPosition(timeT position)
double newPosition;
if (handleAutoScroll(currentPointerPos, position, newPosition))
- m_compositionView->setPointerPos(int(newPosition));
+ m_compositionView->drawPointer(int(newPosition));
}
void
TrackEditor::slotLoopDraggedToPosition(timeT position)
{
- if (m_doc) {
- int currentEndLoopPos = m_doc->getComposition().getLoopEnd();
- double dummy;
- handleAutoScroll(currentEndLoopPos, position, dummy);
- }
+ if (!m_doc)
+ return;
+
+ int currentEndLoopPos = m_doc->getComposition().getLoopEnd();
+ double dummy;
+ handleAutoScroll(currentEndLoopPos, position, dummy);
}
bool TrackEditor::handleAutoScroll(int currentPosition, timeT newTimePosition, double &newPosition)
{
- SimpleRulerScale *ruler =
- dynamic_cast<SimpleRulerScale*>(m_rulerScale);
-
- if (!ruler)
+ if (!m_rulerScale)
return false;
- newPosition = m_compositionView->grid().getRulerScale()->getXForTime(newTimePosition);
-
- double distance = fabs(newPosition - currentPosition);
+ newPosition = m_rulerScale->getXForTime(newTimePosition);
+ const double distance = fabs(newPosition - currentPosition);
- bool moveDetected = distance >= 1.0;
+ bool moveDetected = (distance >= 1.0);
if (moveDetected) {
- if (m_doc && m_doc->getSequenceManager() &&
- (m_doc->getSequenceManager()->getTransportStatus() != STOPPED)) {
+ if (m_doc && m_doc->getSequenceManager() &&
+ m_doc->getSequenceManager()->getTransportStatus() != STOPPED) {
if (m_playTracking) {
- getCompositionView()->slotScrollHoriz(int(double(newTimePosition) / ruler->getUnitsPerPixel()));
+ m_compositionView->scrollHoriz(newPosition);
}
} else {
- int newpos = int(double(newTimePosition) / ruler->getUnitsPerPixel());
- getCompositionView()->slotScrollHorizSmallSteps(newpos);
- getCompositionView()->doAutoScroll();
+ m_compositionView->doAutoScroll();
}
}
@@ -665,7 +532,7 @@ bool TrackEditor::handleAutoScroll(int currentPosition, timeT newTimePosition, d
}
void
-TrackEditor::slotToggleTracking()
+TrackEditor::toggleTracking()
{
m_playTracking = !m_playTracking;
}
@@ -673,8 +540,8 @@ TrackEditor::slotToggleTracking()
void
TrackEditor::slotSetLoop(timeT start, timeT end)
{
- getTopStandardRuler()->getLoopRuler()->slotSetLoopMarker(start, end);
- getBottomStandardRuler()->getLoopRuler()->slotSetLoopMarker(start, end);
+ m_topStandardRuler->getLoopRuler()->slotSetLoopMarker(start, end);
+ m_bottomStandardRuler->getLoopRuler()->slotSetLoopMarker(start, end);
}
void
@@ -686,120 +553,193 @@ TrackEditor::addCommandToHistory(Command *command)
void
TrackEditor::slotScrollToTrack(int track)
{
- ///!!! Reconfigure to use m_compositionmodel to return y value for track number
// Find the vertical track pos
- int newY = track * getTrackCellHeight();
-
- RG_DEBUG << "TrackEditor::scrollToTrack(" << track <<
- ") scrolling to Y " << newY << endl;
-
- // Scroll the segment view; it will scroll tracks by connected signals
- // slotVerticalScrollTrackButtons(newY);
+ int newY = track * m_trackCellHeight;
- // This is currently a bit broke
- m_compositionView->slotScrollVertSmallSteps(newY);
-
- // This works but is basic McBasic
- //m_compositionView->setContentsPos(m_compositionView->contentsX(),newY);
+ m_compositionView->scrollVert(newY);
}
void
-TrackEditor::slotDeleteSelectedSegments()
+TrackEditor::deleteSelectedSegments()
{
- MacroCommand *macro = new MacroCommand(tr("Delete Segments"));
-
- SegmentSelection segments =
- m_compositionView->getSelectedSegments();
+ SegmentSelection segments = m_compositionView->getSelectedSegments();
- if (segments.size() == 0)
- return ;
-
- SegmentSelection::iterator it;
+ if (segments.empty())
+ return;
// Clear the selection before erasing the Segments
// the selection points to
//
m_compositionView->getModel()->clearSelected();
- // Create the compound command
- //
- for (it = segments.begin(); it != segments.end(); ++it) {
+ MacroCommand *macro = new MacroCommand(tr("Delete Segments"));
+
+ // For each selected segment
+ for (SegmentSelection::iterator it = segments.begin();
+ it != segments.end();
+ ++it) {
macro->addCommand(new SegmentEraseCommand(*it,
&m_doc->getAudioFileManager()));
}
addCommandToHistory(macro);
-
}
void
-TrackEditor::slotTurnRepeatingSegmentToRealCopies()
+TrackEditor::turnRepeatingSegmentToRealCopies()
{
- RG_DEBUG << "TrackEditor::slotTurnRepeatingSegmentToRealCopies" << endl;
+ RG_DEBUG << "turnRepeatingSegmentToRealCopies()";
- SegmentSelection segments =
- m_compositionView->getSelectedSegments();
+ SegmentSelection segments = m_compositionView->getSelectedSegments();
- if (segments.size() == 0)
- return ;
+ if (segments.empty())
+ return;
QString text = tr("Turn %n Repeating Segment(s) into Real Copies", "", segments.size());
MacroCommand *macro = new MacroCommand(text);
- SegmentSelection::iterator it = segments.begin();
- for (; it != segments.end(); ++it) {
+ // For each selected segment
+ for (SegmentSelection::iterator it = segments.begin();
+ it != segments.end();
+ ++it) {
if ((*it)->isRepeating()) {
macro->addCommand(new SegmentRepeatToCopyCommand(*it));
}
}
addCommandToHistory(macro);
-
}
void
-TrackEditor::slotTurnLinkedSegmentsToRealCopies()
+TrackEditor::turnLinkedSegmentsToRealCopies()
{
- RG_DEBUG << "TrackEditor::slotTurnLinkedSegmentsToRealCopies" << endl;
+ RG_DEBUG << "turnLinkedSegmentsToRealCopies()";
- SegmentSelection segments =
- m_compositionView->getSelectedSegments();
+ SegmentSelection segments = m_compositionView->getSelectedSegments();
- if (segments.size() == 0) return ;
+ if (segments.empty())
+ return;
QString text = tr("Turn %n Linked Segment(s) into Real Copies", "", segments.size());
MacroCommand *macro = new MacroCommand(text);
- SegmentSelection::iterator it = segments.begin();
- for (; it != segments.end(); ++it) {
+ // For each selected segment
+ for (SegmentSelection::iterator it = segments.begin();
+ it != segments.end();
+ ++it) {
if ((*it)->isLinked()) {
macro->addCommand(new SegmentLinkToCopyCommand(*it));
}
}
addCommandToHistory(macro);
-
}
void
TrackEditor::slotVerticalScrollTrackButtons(int y)
{
-// m_trackButtonScroll->setContentsPos(0, y);
+ // Make sure the TrackButtons are scrolled the same amount as the
+ // segment canvas (CompositionView).
m_trackButtonScroll->verticalScrollBar()->setValue(y);
-
-// ensureVisible ( int x, int y, int xmargin = 50, int ymargin = 50 )
-// m_trackButtonScroll->ensureVisible ( 0, y, 50, 20 );
+}
+
+void TrackEditor::slotCommandExecuted()
+{
+ // ??? This routine doesn't belong here. It is doing things for other
+ // objects. Those objects should take care of themselves.
+
+ // ??? Is there a way to do this at a more relevant time? Like when
+ // the Composition changes, instead for every command that is
+ // executed regardless of whether that command changes the
+ // Composition?
+
+ // ??? RosegardenMainViewWidget also connects
+ // CompositionView::slotUpdateAll() to commandExecuted().
+
+ bool compositionNeedsRefresh = m_doc->getComposition().
+ getRefreshStatus(m_compositionRefreshStatusId).needsRefresh();
+
+ // If the composition has changed, redraw the CompositionView's
+ // contents.
+ if (compositionNeedsRefresh) {
+
+ // ??? Need to investigate each of these calls and see if we can
+ // implement them in a more appropriate way. E.g. can
+ // CompositionView take care of itself?
+ // ??? It would be more logical if CompositionView redrew its
+ // contents and repainted itself in response to a change
+ // to the Composition. The change notification would need
+ // to be called responsibly (e.g. not for every single
+ // modification to an event while recording!). And observers
+ // would need to be smart about detecting relevant changes
+ // and avoiding work. It's the same old story.
+
+ // In case the composition has grown.
+ // ??? CompositionView should take care of this.
+ updateCanvasSize();
+
+ // In case any tracks have been added, deleted, or changed.
+ // ??? TrackButtons should take care of this.
+ m_trackButtons->slotUpdateTracks();
+
+ // Redraw the contents.
+ // ??? CompositionView should take care of this.
+ m_compositionView->deleteCachedPreviews();
+ m_compositionView->updateContents();
+
+ Composition &composition = m_doc->getComposition();
+
+ // ??? Composition should take care of have_segments.
+ if (composition.getNbSegments() == 0) {
+ emit stateChange("have_segments", false);
+ emit stateChange("have_selection", false);
+ } else {
+ emit stateChange("have_segments", true);
+ // ??? CompositionView should take care of have_selection.
+ if (m_compositionView->haveSelection())
+ emit stateChange("have_selection", true);
+ else
+ emit stateChange("have_selection", false);
+ }
+
+ // Clear the composition refresh flag.
+ m_doc->getComposition().
+ getRefreshStatus(m_compositionRefreshStatusId).
+ setNeedsRefresh(false);
+ }
+
+ // Send a paint event to all children.
+ // ??? Painting every time a command is executed is overkill. We should
+ // only paint when relevant changes are made to the Composition.
+ // ??? The children should paint themselves in response to changes.
+ // TrackEditor shouldn't care.
+ update();
+}
+
+void TrackEditor::slotViewportResize()
+{
+ QGridLayout *grid = dynamic_cast<QGridLayout *>(layout());
+ if (!grid)
+ return;
+
+ // The height of the segment canvas.
+ int viewportHeight = m_compositionView->viewport()->height();
+
+ // Force TrackButtons to the same size as the viewport.
+ // The only way to do this with a grid is to adjust the minimum height of
+ // the row below TrackButtons to take up the appropriate amount of space.
+ // In this case, that's the height of the bottom ruler and the horizontal
+ // scrollbar, if it exists.
+ grid->setRowMinimumHeight(4, m_compositionView->height() - viewportHeight);
}
void TrackEditor::dragEnterEvent(QDragEnterEvent *e)
{
- const QMimeData *mime;
- mime = e->mimeData();
- QStringList formats(mime->formats());
+ const QMimeData *mime = e->mimeData();
- if (mime->hasUrls() || mime->hasText()) {
+ if (mime->hasUrls() || mime->hasText()) {
if (e->proposedAction() & Qt::CopyAction) {
e->acceptProposedAction();
@@ -807,25 +747,24 @@ void TrackEditor::dragEnterEvent(QDragEnterEvent *e)
e->setDropAction(Qt::CopyAction);
e->accept();
}
- }else{
+ } else {
+ QStringList formats(mime->formats());
RG_DEBUG << "HINT: Unaccepted MimeFormat in TrackEditor::dragEnterEvent : " << formats << endl;
}
}
-
-void TrackEditor::dragMoveEvent(QDragMoveEvent *){
- // pass
+void TrackEditor::dragMoveEvent(QDragMoveEvent *)
+{
+ // Prevent QWidget from handling this.
+ // QWidget::dragMoveEvent() does nothing, so this isn't really necessary.
}
-
void TrackEditor::dropEvent(QDropEvent *e)
{
- QList<QUrl> uList;
QStringList uriList;
QString text;
- QString audioText;
if (e->mimeData()->hasUrls() || e->mimeData()->hasText()) {
@@ -837,7 +776,7 @@ void TrackEditor::dropEvent(QDropEvent *e)
}
if (e->mimeData()->hasUrls()) {
- uList = e->mimeData()->urls();
+ QList<QUrl> uList = e->mimeData()->urls();
if (!uList.isEmpty()) {
for (int i = 0; i < uList.size(); ++i) {
uriList.append(QString::fromLocal8Bit(uList.value(i).toEncoded().data()));
@@ -875,7 +814,7 @@ void TrackEditor::dropEvent(QDropEvent *e)
if (!internal && !uriList.empty()) {
// Update code allow multiple audio drops to TrackEditor
- // Old behavoir of stopping if .rg or .midi file encountered still works
+ // Old behavior of stopping if .rg or .midi file encountered still works
// We have a URI, and it didn't come from within RG
RG_DEBUG << "TrackEditor::dropEvent() : got URI :" << uriList.first() << endl;
@@ -911,15 +850,17 @@ void TrackEditor::dropEvent(QDropEvent *e)
<< ", x = " << e->pos().x()
<< endl;
- audioText.clear();
+ QString audioText;
QTextStream t(&audioText, QIODevice::ReadWrite);
t << uri << "\n";
t << track->getId() << "\n";
t << time << "\n";
t.flush();
+
RG_DEBUG << "TrackEditor::dropEvent() audioText = \n " << audioText << "\n";
- emit droppedNewAudio(QString(audioText));
- // connected to RosegardenMainViewWidget::droppedNewAudio()
+
+ emit droppedNewAudio(audioText);
+ // connected to RosegardenMainViewWidget::slotDroppedNewAudio()
}
}
diff --git a/src/gui/editors/segment/TrackEditor.h b/src/gui/editors/segment/TrackEditor.h
index 2777294..fb951bb 100644
--- a/src/gui/editors/segment/TrackEditor.h
+++ b/src/gui/editors/segment/TrackEditor.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -26,7 +26,7 @@
#include <QWidget>
#include <QScrollArea>
-#include <map>
+#include <vector>
class QPaintEvent;
@@ -42,40 +42,43 @@ class Command;
class TrackButtons;
class TempoRuler;
class Segment;
-class RulerScale;
+class SimpleRulerScale;
class RosegardenDocument;
-class QDeferScrollView;
+class DeferScrollArea;
class CompositionView;
class CompositionModelImpl;
class ChordNameRuler;
class StandardRuler;
+/// Holds the CompositionView, TrackButtons, and Rulers.
/**
- * Global widget for segment edition.
+ * An object of this class is created and owned by RosegardenMainViewWidget.
+ * It can be accessed globally as follows:
*
- * Shows a global overview of the composition, and lets the user
- * manipulate the segments.
+ * RosegardenMainWindow::self()->getView()->getTrackEditor()
*
- * An object of this class is created and owned by RosegardenMainViewWidget.
+ * This class owns instances of the following classes:
+ *
+ * * CompositionView - The segment canvas.
+ * * TrackButtons - The buttons to the left of the segment canvas.
+ * * Various Rulers
*
- * @see CompositionView
* @see RosegardenMainViewWidget::getTrackEditor()
*/
class TrackEditor : public QWidget
{
Q_OBJECT
public:
- /**
- * Create a new TrackEditor representing the document \a doc
- */
- TrackEditor(RosegardenDocument* doc,
- QWidget* rosegardenguiview,
- RulerScale *rulerScale,
- bool showTrackLabels,
- double initialUnitsPerPixel = 0,
- QWidget* parent = 0);
+ TrackEditor(RosegardenDocument *doc,
+ RosegardenMainViewWidget *mainViewWidget,
+ SimpleRulerScale *rulerScale,
+ bool showTrackLabels);
- ~TrackEditor();
+ // ??? These accessors are mostly for RosegardenMainViewWidget.
+ // Consider moving the code from RosegardenMainViewWidget into
+ // here and wrapping in functions at a higher level of
+ // abstraction instead of exposing internals. The ruler
+ // functions should be easy to start with. See updateRulers().
CompositionView *getCompositionView() { return m_compositionView; }
TempoRuler *getTempoRuler() { return m_tempoRuler; }
@@ -83,164 +86,175 @@ public:
StandardRuler *getTopStandardRuler() { return m_topStandardRuler; }
StandardRuler *getBottomStandardRuler() { return m_bottomStandardRuler; }
TrackButtons *getTrackButtons() { return m_trackButtons; }
- RulerScale *getRulerScale() { return m_rulerScale; }
+ //RulerScale *getRulerScale() { return m_rulerScale; }
- int getTrackCellHeight() const;
+ /// Calls update() on each of the rulers.
+ void updateRulers();
- /**
- * Add a new segment - DCOP interface
- */
- virtual void addSegment(int track, int start, unsigned int duration);
+ /// Are we scrolling as we play?
+ bool isTracking() const { return m_playTracking; }
+ /// Toggle playback scrolling.
+ void toggleTracking();
- /**
- * Manage command history
- */
- void addCommandToHistory(Command *command);
+ /// Adjust the canvas size to that required for the composition
+ void updateCanvasSize();
- void updateRulers();
+ void addTracks(unsigned int nbTracks, InstrumentId id, int position);
+ void deleteTracks(std::vector<TrackId> tracks);
+ void deleteSelectedSegments();
+ void turnRepeatingSegmentToRealCopies();
+ void turnLinkedSegmentsToRealCopies();
- bool isTracking() const { return m_playTracking; }
+ // Add a new segment - DCOP interface
+ //virtual void addSegment(int track, int start, unsigned int duration);
public slots:
+ /// Scroll the view such that the numbered track is on-screen
/**
- * Scroll the view such that the numbered track is on-screen
+ * RosegardenMainWindow::setDocument() connects this to
+ * RosegardenDocument::makeTrackVisible(int).
*/
void slotScrollToTrack(int trackPosition);
+signals:
/**
- * Set the position pointer during playback
+ * init() connects this to RosegardenMainViewWidget::stateChange().
+ *
+ * Used to modify have_segments and have_selection states.
*/
- void slotSetPointerPosition(timeT position);
+ void stateChange(QString name, bool state);
+ /// A URI to a Rosegarden document was dropped on the canvas.
/**
- * Update the pointer position as it is being dragged along
- * This changes how the segment canvas will scroll to follow the pointer
+ * RosegardenMainViewWidget's ctor connects this to
+ * RosegardenMainWindow::slotOpenDroppedURL().
*/
- void slotPointerDraggedToPosition(timeT position);
+ void droppedDocument(QString uri);
+ /// An audio file was dropped from the audio manager dialog.
/**
- * Update the loop end position as it is being dragged along
- * This changes how the segment canvas will scroll to follow the pointer
+ * RosegardenMainViewWidget's ctor connects this to
+ * RosegardenMainViewWidget::slotDroppedAudio().
*/
- void slotLoopDraggedToPosition(timeT position);
+ void droppedAudio(QString audioDesc);
+ /// An audio file was dropped from an external application.
/**
- * Act on a canvas scroll event
+ * Inserts the audio file into AudioManagerDialog before adding to the
+ * composition.
+ *
+ * RosegardenMainViewWidget's ctor connects this to
+ * RosegardenMainViewWidget::slotDroppedNewAudio().
*/
- void slotCanvasScrolled(int, int);
+ void droppedNewAudio(QString audioDesc);
- /**
- * Adjust the canvas size to that required for the composition
+ /*
+ * Emitted when the represented data changed and the CompositionView
+ * needs to update itself
+ *
+ * @see CompositionView::update()
*/
- void slotReadjustCanvasSize();
+ //void needUpdate();
+private slots:
+ /// Set the position pointer during playback
/**
- * Show the given loop on the ruler or wherever
+ * Scrolls as needed to keep the position pointer visible.
+ *
+ * init() connects this to
+ * RosegardenDocument::pointerPositionChanged(timeT).
*/
- void slotSetLoop(timeT start, timeT end);
+ void slotSetPointerPosition(timeT pointerTime);
+ /// Update the pointer position as it is being dragged along.
/**
- * Add given number of tracks
+ * Scroll to make sure the pointer is visible.
+ *
+ * init() connects this to the top and bottom rulers'
+ * dragPointerToPosition(timeT).
*/
- void slotAddTracks(unsigned int nbTracks, InstrumentId id, int position);
+ void slotPointerDraggedToPosition(timeT position);
- /*
- * Delete a given track
+ /// Scroll to make sure the loop end is visible.
+ /**
+ * init() connects this to the top and bottom rulers'
+ * dragLoopToPosition(timeT).
*/
- void slotDeleteTracks(std::vector<TrackId> tracks);
-
- void slotDeleteSelectedSegments();
- void slotTurnRepeatingSegmentToRealCopies();
- void slotTurnLinkedSegmentsToRealCopies();
-
- void slotToggleTracking();
-
-protected slots:
- // Dead Code.
-// void slotSegmentOrderChanged(int section, int fromIdx, int toIdx);
+ void slotLoopDraggedToPosition(timeT position);
- //void slotTrackButtonsWidthChanged();
+ /// Show the given loop on the rulers
+ /**
+ * init() connects this to RosegardenDocument::loopChanged().
+ */
+ void slotSetLoop(timeT start, timeT end);
/// Scroll the track buttons along with the segment canvas
void slotVerticalScrollTrackButtons(int y);
-signals:
- /**
- * Emitted when the represented data changed and the CompositionView
- * needs to update itself
- *
- * @see CompositionView::update()
- */
- // Dead Code.
-// void needUpdate();
+ /// Triggers a refresh if the composition has changed.
+ void slotCommandExecuted();
+ /// Adjust the size of the TrackButtons to match the CompositionView.
/**
- * sent back to RosegardenGUI
+ * Connected to RosegardenScrollView::viewportResize().
*/
- void stateChange(QString, bool);
+ void slotViewportResize();
- /**
- * A URI to a Rosegarden document was dropped on the canvas
- *
- * @see RosegardenGUI#slotOpenURL()
- */
- void droppedDocument(QString uri);
+ // Act on a canvas scroll event
+ //void slotCanvasScrolled(int, int);
+ //void slotSegmentOrderChanged(int section, int fromIdx, int toIdx);
+ //void slotTrackButtonsWidthChanged();
- /**
- * An audio file was dropped from the audio manager dialog
- */
- void droppedAudio(QString audioDesc);
+private:
+ /// Initialization routine called by ctor.
+ void init(RosegardenMainViewWidget *);
+
+ // QWidget overrides.
+ virtual void dragEnterEvent(QDragEnterEvent *);
+ virtual void dropEvent(QDropEvent *);
+ virtual void dragMoveEvent(QDragMoveEvent *);
+
+ /// Scroll when dragging the pointer or loop end.
/**
- * And audio file was dropped from konqi say and needs to be
- * inserted into AudioManagerDialog before adding to the
- * composition.
+ * Returns true if an actual move occurred between currentPosition and
+ * newTimePosition. Output parameter newPosition contains the horizontal
+ * position corresponding to newTimePosition.
*/
- void droppedNewAudio(QString audioDesc);
+ bool handleAutoScroll(
+ int currentPosition, timeT newTimePosition, double &newPosition);
-protected:
+ /// Wrapper around CommandHistory::addCommand().
+ void addCommandToHistory(Command *command);
- // QWidget overrides.
- virtual void dragEnterEvent(QDragEnterEvent *event);
- virtual void dropEvent(QDropEvent*);
- virtual void dragMoveEvent(QDragMoveEvent *);
- virtual void paintEvent(QPaintEvent* e);
-
- void init(QWidget *);
-
- bool isCompositionModified();
- void setCompositionModified(bool);
-
- /// return true if an actual move occurred between current and new position, newPosition contains the horiz. pos corresponding to newTimePosition
- bool handleAutoScroll(int currentPosition, timeT newTimePosition, double& newPosition);
-
//--------------- Data members ---------------------------------
RosegardenDocument *m_doc;
-
- RulerScale *m_rulerScale;
- TempoRuler *m_tempoRuler;
- ChordNameRuler *m_chordNameRuler;
- StandardRuler *m_topStandardRuler;
- StandardRuler *m_bottomStandardRuler;
- TrackButtons *m_trackButtons;
+ unsigned int m_compositionRefreshStatusId;
+
+ // Segment Canvas
CompositionView *m_compositionView;
CompositionModelImpl *m_compositionModel;
- QScrollArea *m_trackButtonScroll;
-
- bool m_showTrackLabels;
- unsigned int m_canvasWidth;
- unsigned int m_compositionRefreshStatusId;
bool m_playTracking;
+ int m_trackCellHeight;
- typedef std::map<Segment *, unsigned int>
- SegmentRefreshStatusIdMap;
- SegmentRefreshStatusIdMap m_segmentsRefreshStatusIds;
+ // Track Buttons to the left of the Segment Canvas
+ TrackButtons *m_trackButtons;
+ // Scrollable parent for the TrackButtons.
+ DeferScrollArea *m_trackButtonScroll;
+ bool m_showTrackLabels;
- double m_initialUnitsPerPixel;
+ // Rulers
+ SimpleRulerScale *m_rulerScale;
+ TempoRuler *m_tempoRuler;
+ ChordNameRuler *m_chordNameRuler;
+ StandardRuler *m_topStandardRuler;
+ StandardRuler *m_bottomStandardRuler;
-private:
+ //unsigned int m_canvasWidth;
+ //typedef std::map<Segment *, unsigned int> SegmentRefreshStatusIdMap;
+ //SegmentRefreshStatusIdMap m_segmentsRefreshStatusIds;
};
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index e9666d1..6ced54d 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/TrackLabel.h b/src/gui/editors/segment/TrackLabel.h
index e0d297f..1ea81cf 100644
--- a/src/gui/editors/segment/TrackLabel.h
+++ b/src/gui/editors/segment/TrackLabel.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/TrackVUMeter.cpp b/src/gui/editors/segment/TrackVUMeter.cpp
index 06b6701..daad6ef 100644
--- a/src/gui/editors/segment/TrackVUMeter.cpp
+++ b/src/gui/editors/segment/TrackVUMeter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/TrackVUMeter.h b/src/gui/editors/segment/TrackVUMeter.h
index 14bb05d..4189666 100644
--- a/src/gui/editors/segment/TrackVUMeter.h
+++ b/src/gui/editors/segment/TrackVUMeter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/TriggerManagerItem.cpp b/src/gui/editors/segment/TriggerManagerItem.cpp
index bd5855e..ec63e4e 100644
--- a/src/gui/editors/segment/TriggerManagerItem.cpp
+++ b/src/gui/editors/segment/TriggerManagerItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/TriggerManagerItem.h b/src/gui/editors/segment/TriggerManagerItem.h
index ce8141b..2a9af3b 100644
--- a/src/gui/editors/segment/TriggerManagerItem.h
+++ b/src/gui/editors/segment/TriggerManagerItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index f1c375f..e29aa85 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/TriggerSegmentManager.h b/src/gui/editors/segment/TriggerSegmentManager.h
index 03d454a..e02c907 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.h
+++ b/src/gui/editors/segment/TriggerSegmentManager.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/compositionview/AudioPreviewUpdater.cpp b/src/gui/editors/segment/compositionview/AudioPeaksGenerator.cpp
similarity index 55%
rename from src/gui/editors/segment/compositionview/AudioPreviewUpdater.cpp
rename to src/gui/editors/segment/compositionview/AudioPeaksGenerator.cpp
index d4655cf..1fb705f 100644
--- a/src/gui/editors/segment/compositionview/AudioPreviewUpdater.cpp
+++ b/src/gui/editors/segment/compositionview/AudioPeaksGenerator.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -15,11 +15,11 @@
COPYING included with this distribution for more information.
*/
-#define RG_MODULE_STRING "[AudioPreviewUpdater]"
+#define RG_MODULE_STRING "[AudioPeaksGenerator]"
-#include "AudioPreviewUpdater.h"
-#include "AudioPreviewThread.h"
-#include "AudioPreviewReadyEvent.h"
+#include "AudioPeaksGenerator.h"
+#include "AudioPeaksThread.h"
+#include "AudioPeaksReadyEvent.h"
#include "CompositionModelImpl.h"
#include "misc/Debug.h"
@@ -37,7 +37,7 @@ namespace Rosegarden
static int apuExtantCount = 0;
-AudioPreviewUpdater::AudioPreviewUpdater(AudioPreviewThread &thread,
+AudioPeaksGenerator::AudioPeaksGenerator(AudioPeaksThread &thread,
const Composition& c, const Segment* s,
const QRect& r,
CompositionModelImpl* parent)
@@ -48,21 +48,21 @@ AudioPreviewUpdater::AudioPreviewUpdater(AudioPreviewThread &thread,
m_rect(r),
m_showMinima(false),
m_channels(0),
- m_previewToken( -1)
+ m_token( -1)
{
++apuExtantCount;
- RG_DEBUG << "AudioPreviewUpdater::AudioPreviewUpdater " << this << " (now " << apuExtantCount << " extant)" << endl;
+ RG_DEBUG << "ctor " << this << " (now " << apuExtantCount << " extant)" << endl;
}
-AudioPreviewUpdater::~AudioPreviewUpdater()
+AudioPeaksGenerator::~AudioPeaksGenerator()
{
--apuExtantCount;
- RG_DEBUG << "AudioPreviewUpdater::~AudioPreviewUpdater on " << this << " ( token " << m_previewToken << ") (now " << apuExtantCount << " extant)" << endl;
- if (m_previewToken >= 0)
- m_thread.cancelPreview(m_previewToken);
+ RG_DEBUG << "dtor on " << this << " ( token " << m_token << ") (now " << apuExtantCount << " extant)" << endl;
+ if (m_token >= 0)
+ m_thread.cancelPeaks(m_token);
}
-void AudioPreviewUpdater::update()
+void AudioPeaksGenerator::update()
{
// Get sample start and end times and work out duration
//
@@ -71,11 +71,11 @@ void AudioPreviewUpdater::update()
m_composition.getElapsedRealTime(m_segment->getEndMarkerTime()) -
m_composition.getElapsedRealTime(m_segment->getStartTime()) ;
- RG_DEBUG << "AudioPreviewUpdater(" << this << ")::update() - for file id "
+ RG_DEBUG << "AudioPeaksGenerator(" << this << ")::update() - for file id "
<< m_segment->getAudioFileId() << " requesting values - thread running : "
<< m_thread.isRunning() << " - thread finished : " << m_thread.isFinished() << endl;
- AudioPreviewThread::Request request;
+ AudioPeaksThread::Request request;
request.audioFileId = m_segment->getAudioFileId();
request.audioStartTime = audioStartTime;
request.audioEndTime = audioEndTime;
@@ -83,54 +83,54 @@ void AudioPreviewUpdater::update()
request.showMinima = m_showMinima;
request.notify = this;
- if (m_previewToken >= 0) m_thread.cancelPreview(m_previewToken);
- m_previewToken = m_thread.requestPreview(request);
+ if (m_token >= 0) m_thread.cancelPeaks(m_token);
+ m_token = m_thread.requestPeaks(request);
if (!m_thread.isRunning()) m_thread.start();
}
-void AudioPreviewUpdater::cancel()
+void AudioPeaksGenerator::cancel()
{
- if (m_previewToken >= 0) m_thread.cancelPreview(m_previewToken);
- m_previewToken = -1;
+ if (m_token >= 0) m_thread.cancelPeaks(m_token);
+ m_token = -1;
}
-bool AudioPreviewUpdater::event(QEvent *e)
+bool AudioPeaksGenerator::event(QEvent *e)
{
- RG_DEBUG << "AudioPreviewUpdater(" << this << ")::event (" << e << ")" << endl;
+ RG_DEBUG << "AudioPeaksGenerator(" << this << ")::event (" << e << ")" << endl;
- if (e->type() == AudioPreviewThread::AudioPreviewReady) {
- AudioPreviewReadyEvent *ev = dynamic_cast<AudioPreviewReadyEvent *>(e);
+ if (e->type() == AudioPeaksThread::AudioPeaksReady) {
+ AudioPeaksReadyEvent *ev = dynamic_cast<AudioPeaksReadyEvent *>(e);
if (ev) {
int token = (int)ev->data();
- m_channels = 0; // to be filled as getPreview return value
+ m_channels = 0; // to be filled as getComputedValues() return value
- RG_DEBUG << "AudioPreviewUpdater::token " << token << ", my token " << m_previewToken << endl;
+ RG_DEBUG << "AudioPeaksGenerator::token " << token << ", my token " << m_token << endl;
- if (m_previewToken >= 0 && token >= m_previewToken) {
+ if (m_token >= 0 && token >= m_token) {
- m_previewToken = -1;
- m_thread.getPreview(token, m_channels, m_values);
+ m_token = -1;
+ m_thread.getPeaks(token, m_channels, m_values);
if (m_channels == 0) {
- RG_DEBUG << "AudioPreviewUpdater: failed to find preview!\n";
+ RG_DEBUG << "failed to find peaks!\n";
} else {
- RG_DEBUG << "AudioPreviewUpdater: got correct preview (" << m_channels
+ RG_DEBUG << "got correct peaks (" << m_channels
<< " channels, " << m_values.size() << " samples)\n";
}
- emit audioPreviewComplete(this);
+ emit audioPeaksComplete(this);
} else {
// this one is out of date already
std::vector<float> tmp;
unsigned int tmpChannels;
- m_thread.getPreview(token, tmpChannels, tmp);
+ m_thread.getPeaks(token, tmpChannels, tmp);
- RG_DEBUG << "AudioPreviewUpdater: got obsolete preview (" << tmpChannels
+ RG_DEBUG << "got obsolete peaks (" << tmpChannels
<< " channels, " << tmp.size() << " samples)\n";
}
@@ -143,4 +143,4 @@ bool AudioPreviewUpdater::event(QEvent *e)
}
}
-#include "AudioPreviewUpdater.moc"
+#include "AudioPeaksGenerator.moc"
diff --git a/src/gui/editors/segment/compositionview/AudioPreviewUpdater.h b/src/gui/editors/segment/compositionview/AudioPeaksGenerator.h
similarity index 75%
rename from src/gui/editors/segment/compositionview/AudioPreviewUpdater.h
rename to src/gui/editors/segment/compositionview/AudioPeaksGenerator.h
index 633a71b..71e6d97 100644
--- a/src/gui/editors/segment/compositionview/AudioPreviewUpdater.h
+++ b/src/gui/editors/segment/compositionview/AudioPeaksGenerator.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -16,8 +16,8 @@
COPYING included with this distribution for more information.
*/
-#ifndef RG_AUDIOPREVIEWUPDATER_H
-#define RG_AUDIOPREVIEWUPDATER_H
+#ifndef RG_AUDIOPEAKSGENERATOR_H
+#define RG_AUDIOPEAKSGENERATOR_H
#include <QObject>
#include <QRect>
@@ -33,21 +33,23 @@ namespace Rosegarden
class Segment;
class CompositionModelImpl;
class Composition;
-class AudioPreviewThread;
+class AudioPeaksThread;
-class AudioPreviewUpdater : public QObject
+/// Sends a request to the AudioPeaksThread to generate audio peaks (m_values).
+class AudioPeaksGenerator : public QObject
{
Q_OBJECT
public:
- AudioPreviewUpdater(AudioPreviewThread &thread,
+ AudioPeaksGenerator(AudioPeaksThread &thread,
const Composition &composition,
const Segment *segment,
const QRect &displayExtent,
CompositionModelImpl *parent);
- ~AudioPreviewUpdater();
+ ~AudioPeaksGenerator();
+ // ??? rename: generateAsync()
void update();
void cancel();
@@ -56,25 +58,27 @@ public:
const Segment *getSegment() const { return m_segment; }
+ // ??? rename: getPeaks()
const std::vector<float> &getComputedValues(unsigned int &channels) const
{ channels = m_channels; return m_values; }
signals:
- void audioPreviewComplete(AudioPreviewUpdater*);
+ void audioPeaksComplete(AudioPeaksGenerator *);
protected:
virtual bool event(QEvent*);
- AudioPreviewThread& m_thread;
+ AudioPeaksThread &m_thread;
const Composition& m_composition;
const Segment* m_segment;
QRect m_rect;
bool m_showMinima;
unsigned int m_channels;
+ // ??? rename: m_peaks
std::vector<float> m_values;
- intptr_t m_previewToken;
+ intptr_t m_token;
};
diff --git a/src/gui/editors/segment/compositionview/AudioPreviewReadyEvent.cpp b/src/gui/editors/segment/compositionview/AudioPeaksReadyEvent.cpp
similarity index 62%
rename from src/gui/editors/segment/compositionview/AudioPreviewReadyEvent.cpp
rename to src/gui/editors/segment/compositionview/AudioPeaksReadyEvent.cpp
index ad1e395..d9b10cf 100644
--- a/src/gui/editors/segment/compositionview/AudioPreviewReadyEvent.cpp
+++ b/src/gui/editors/segment/compositionview/AudioPeaksReadyEvent.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -16,7 +16,7 @@
*/
-#include "AudioPreviewReadyEvent.h"
+#include "AudioPeaksReadyEvent.h"
#include <QEvent>
@@ -24,18 +24,18 @@ namespace Rosegarden
{
-const QEvent::Type AudioPreviewReadyEvent::AudioPreviewReady = QEvent::Type(QEvent::User + 1);
-const QEvent::Type AudioPreviewReadyEvent::AudioPreviewQueueEmpty = QEvent::Type(QEvent::User + 2);
+const QEvent::Type AudioPeaksReadyEvent::AudioPeaksReady = QEvent::Type(QEvent::User + 1);
+const QEvent::Type AudioPeaksReadyEvent::AudioPeaksQueueEmpty = QEvent::Type(QEvent::User + 2);
-AudioPreviewReadyEvent::AudioPreviewReadyEvent(int data) :
- QEvent(AudioPreviewReadyEvent::AudioPreviewReady),
+AudioPeaksReadyEvent::AudioPeaksReadyEvent(int data) :
+ QEvent(AudioPeaksReadyEvent::AudioPeaksReady),
m_data(data)
{
// nothing
}
int
-AudioPreviewReadyEvent::data()
+AudioPeaksReadyEvent::data()
{
return m_data;
}
diff --git a/src/gui/editors/segment/compositionview/AudioPreviewReadyEvent.h b/src/gui/editors/segment/compositionview/AudioPeaksReadyEvent.h
similarity index 73%
rename from src/gui/editors/segment/compositionview/AudioPreviewReadyEvent.h
rename to src/gui/editors/segment/compositionview/AudioPeaksReadyEvent.h
index e1fc819..92df75b 100644
--- a/src/gui/editors/segment/compositionview/AudioPreviewReadyEvent.h
+++ b/src/gui/editors/segment/compositionview/AudioPeaksReadyEvent.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -15,8 +15,8 @@
COPYING included with this distribution for more information.
*/
-#ifndef RG_AUDIOPREVIEWREADYEVENT_H
-#define RG_AUDIOPREVIEWREADYEVENT_H
+#ifndef RG_AUDIOPEAKSREADYEVENT_H
+#define RG_AUDIOPEAKSREADYEVENT_H
#include <QEvent>
@@ -29,15 +29,15 @@ namespace Rosegarden
// This mechanism used to use QCustomEvent. We need a custom QEvent subclass to
// pass an int token amongst objects.
-class AudioPreviewReadyEvent : public QEvent
+class AudioPeaksReadyEvent : public QEvent
{
public:
- AudioPreviewReadyEvent(int data);
+ AudioPeaksReadyEvent(int data);
int data();
- static const QEvent::Type AudioPreviewReady;
- static const QEvent::Type AudioPreviewQueueEmpty;
+ static const QEvent::Type AudioPeaksReady;
+ static const QEvent::Type AudioPeaksQueueEmpty;
protected:
int m_data;
diff --git a/src/gui/editors/segment/compositionview/AudioPreviewThread.cpp b/src/gui/editors/segment/compositionview/AudioPeaksThread.cpp
similarity index 62%
rename from src/gui/editors/segment/compositionview/AudioPreviewThread.cpp
rename to src/gui/editors/segment/compositionview/AudioPeaksThread.cpp
index f6e0009..03432cb 100644
--- a/src/gui/editors/segment/compositionview/AudioPreviewThread.cpp
+++ b/src/gui/editors/segment/compositionview/AudioPeaksThread.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -16,8 +16,8 @@
*/
-#include "AudioPreviewThread.h"
-#include "AudioPreviewReadyEvent.h"
+#include "AudioPeaksThread.h"
+#include "AudioPeaksReadyEvent.h"
#include "base/RealTime.h"
#include "sound/AudioFileManager.h"
@@ -28,16 +28,16 @@
#include <QObject>
#include <QThread>
-#define DEBUG_AUDIO_PREVIEW_THREAD 1
+#define DEBUG_AUDIO_PEAKS_THREAD 1
namespace Rosegarden
{
-const QEvent::Type AudioPreviewThread::AudioPreviewReady = QEvent::Type(QEvent::User + 1);
-const QEvent::Type AudioPreviewThread::AudioPreviewQueueEmpty = QEvent::Type(QEvent::User + 2);
+const QEvent::Type AudioPeaksThread::AudioPeaksReady = QEvent::Type(QEvent::User + 1);
+const QEvent::Type AudioPeaksThread::AudioPeaksQueueEmpty = QEvent::Type(QEvent::User + 2);
-AudioPreviewThread::AudioPreviewThread(AudioFileManager *manager) :
+AudioPeaksThread::AudioPeaksThread(AudioFileManager *manager) :
m_manager(manager),
m_nextToken(0),
m_exiting(false),
@@ -45,13 +45,13 @@ AudioPreviewThread::AudioPreviewThread(AudioFileManager *manager) :
{}
void
-AudioPreviewThread::run()
+AudioPeaksThread::run()
{
bool emptyQueueSignalled = false;
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
- std::cerr << "AudioPreviewThread::run entering\n";
+ std::cerr << "AudioPeaksThread::run entering\n";
#endif
while (!m_exiting) {
@@ -59,7 +59,7 @@ AudioPreviewThread::run()
if (m_queue.empty()) {
if (m_emptyQueueListener && !emptyQueueSignalled) {
QApplication::postEvent(m_emptyQueueListener,
- new QEvent(AudioPreviewQueueEmpty));
+ new QEvent(AudioPeaksQueueEmpty));
emptyQueueSignalled = true;
}
@@ -69,24 +69,31 @@ AudioPreviewThread::run()
}
}
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
- std::cerr << "AudioPreviewThread::run exiting\n";
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
+ std::cerr << "AudioPeaksThread::run exiting\n";
#endif
}
void
-AudioPreviewThread::finish()
+AudioPeaksThread::finish()
{
m_exiting = true;
}
bool
-AudioPreviewThread::process()
+AudioPeaksThread::process()
{
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
- std::cerr << "AudioPreviewThread::process()\n";
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
+ std::cerr << "AudioPeaksThread::process()\n";
#endif
+ // ??? There appears to be a bug that causes this to run one extra time
+ // at the beginning of a set of updates. It's really easy to see
+ // if you enable the sleep(5) below. The first result takes 10
+ // seconds to appear. Then the subsequent results take 5 seconds
+ // each. It's as if a garbage entry is always at the head of the
+ // queue.
+
if (!m_queue.empty()) {
int failed = 0;
@@ -100,21 +107,25 @@ AudioPreviewThread::process()
RequestQueue::iterator i = m_queue.begin();
// i->first is width, which we use only to provide an ordering to
- // ensure we do smaller previews first. We don't use it here.
+ // ensure we do smaller files first. We don't use it here.
RequestRec &rec = i->second;
int token = rec.first;
Request req = rec.second;
m_mutex.unlock();
+ // DEBUG. Slow things down for testing.
+ //sleep(5);
+
std::vector<float> results;
try {
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
- std::cerr << "AudioPreviewThread::process() file id " << req.audioFileId << std::endl;
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
+ std::cerr << "AudioPeaksThread::process() file id " << req.audioFileId << std::endl;
#endif
// Requires thread-safe AudioFileManager::getPreview
+ // ??? rename: getPeaks()
results = m_manager->getPreview(req.audioFileId,
req.audioStartTime,
req.audioEndTime,
@@ -122,8 +133,8 @@ AudioPreviewThread::process()
req.showMinima);
} catch (AudioFileManager::BadAudioPathException e) {
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
- std::cerr << "AudioPreviewThread::process: failed to update preview for audio file " << req.audioFileId << ": bad audio path: " << e.getMessage() << std::endl;
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
+ std::cerr << "AudioPeaksThread::process: failed to get peaks for audio file " << req.audioFileId << ": bad audio path: " << e.getMessage() << std::endl;
#endif
// OK, we hope this just means we're still recording -- so
@@ -132,8 +143,8 @@ AudioPreviewThread::process()
} catch (PeakFileManager::BadPeakFileException e) {
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
- std::cerr << "AudioPreviewThread::process: failed to update preview for audio file " << req.audioFileId << ": bad peak file: " << e.getMessage() << std::endl;
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
+ std::cerr << "AudioPeaksThread::process: failed to get peaks for audio file " << req.audioFileId << ": bad peak file: " << e.getMessage() << std::endl;
#endif
// As above
@@ -161,36 +172,36 @@ AudioPreviewThread::process()
unsigned int channels = audioFile->getChannels();
m_results[token] = ResultsPair(channels, results);
QObject *notify = req.notify;
- QApplication::postEvent(notify, new AudioPreviewReadyEvent(token));
+ QApplication::postEvent(notify, new AudioPeaksReadyEvent(token));
}
}
m_mutex.unlock();
if (failed > 0 && failed == inQueue) {
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
- std::cerr << "AudioPreviewThread::process() - return true\n";
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
+ std::cerr << "AudioPeaksThread::process() - return true\n";
#endif
return true; // delay and try again
}
}
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
- std::cerr << "AudioPreviewThread::process() - return false\n";
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
+ std::cerr << "AudioPeaksThread::process() - return false\n";
#endif
return false;
}
int
-AudioPreviewThread::requestPreview(const Request &request)
+AudioPeaksThread::requestPeaks(const Request &request)
{
m_mutex.lock();
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
- std::cerr << "AudioPreviewThread::requestPreview for file id " << request.audioFileId << ", start " << request.audioStartTime << ", end " << request.audioEndTime << ", width " << request.width << ", notify " << request.notify << std::endl;
+ std::cerr << "AudioPeaksThread::requestPeaks() for file id " << request.audioFileId << ", start " << request.audioStartTime << ", end " << request.audioEndTime << ", width " << request.width << ", notify " << request.notify << std::endl;
#endif
/*!!!
for (RequestQueue::iterator i = m_queue.begin(); i != m_queue.end(); ++i) {
@@ -208,21 +219,21 @@ AudioPreviewThread::requestPreview(const Request &request)
// if (!running()) start();
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
- std::cerr << "AudioPreviewThread::requestPreview - token = " << token << std::endl;
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
+ std::cerr << "AudioPeaksThread::requestPeaks() - token = " << token << std::endl;
#endif
return token;
}
void
-AudioPreviewThread::cancelPreview(int token)
+AudioPeaksThread::cancelPeaks(int token)
{
m_mutex.lock();
-#ifdef DEBUG_AUDIO_PREVIEW_THREAD
+#ifdef DEBUG_AUDIO_PEAKS_THREAD
- std::cerr << "AudioPreviewThread::cancelPreview for token " << token << std::endl;
+ std::cerr << "AudioPeaksThread::cancelPeaks() for token " << token << std::endl;
#endif
for (RequestQueue::iterator i = m_queue.begin(); i != m_queue.end(); ++i) {
@@ -236,7 +247,7 @@ AudioPreviewThread::cancelPreview(int token)
}
void
-AudioPreviewThread::getPreview(int token, unsigned int &channels,
+AudioPeaksThread::getPeaks(int token, unsigned int &channels,
std::vector<float> &values)
{
m_mutex.lock();
diff --git a/src/gui/editors/segment/compositionview/AudioPreviewThread.h b/src/gui/editors/segment/compositionview/AudioPeaksThread.h
similarity index 77%
rename from src/gui/editors/segment/compositionview/AudioPreviewThread.h
rename to src/gui/editors/segment/compositionview/AudioPeaksThread.h
index e97def2..e9c9213 100644
--- a/src/gui/editors/segment/compositionview/AudioPreviewThread.h
+++ b/src/gui/editors/segment/compositionview/AudioPeaksThread.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -16,8 +16,8 @@
COPYING included with this distribution for more information.
*/
-#ifndef RG_AUDIOPREVIEWTHREAD_H
-#define RG_AUDIOPREVIEWTHREAD_H
+#ifndef RG_AUDIOPEAKSTHREAD_H
+#define RG_AUDIOPEAKSTHREAD_H
#include "base/RealTime.h"
#include <map>
@@ -38,10 +38,11 @@ namespace Rosegarden
class AudioFileManager;
-class AudioPreviewThread : public QThread
+/// Generate audio peaks asynchronously.
+class AudioPeaksThread : public QThread
{
public:
- AudioPreviewThread(AudioFileManager *manager);
+ AudioPeaksThread(AudioFileManager *manager);
virtual void run();
virtual void finish();
@@ -55,15 +56,15 @@ public:
QObject *notify;
};
- virtual int requestPreview(const Request &request);
- virtual void cancelPreview(int token);
- virtual void getPreview(int token, unsigned int &channels,
+ virtual int requestPeaks(const Request &request);
+ virtual void cancelPeaks(int token);
+ virtual void getPeaks(int token, unsigned int &channels,
std::vector<float> &values);
void setEmptyQueueListener(QObject* o) { m_emptyQueueListener = o; }
- static const QEvent::Type AudioPreviewReady;
- static const QEvent::Type AudioPreviewQueueEmpty;
+ static const QEvent::Type AudioPeaksReady;
+ static const QEvent::Type AudioPeaksQueueEmpty;
protected:
diff --git a/src/gui/editors/segment/compositionview/AudioPreviewPainter.cpp b/src/gui/editors/segment/compositionview/AudioPreviewPainter.cpp
index 382ca54..52c83dc 100644
--- a/src/gui/editors/segment/compositionview/AudioPreviewPainter.cpp
+++ b/src/gui/editors/segment/compositionview/AudioPreviewPainter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -36,24 +36,26 @@
namespace Rosegarden {
AudioPreviewPainter::AudioPreviewPainter(CompositionModelImpl& model,
- CompositionModelImpl::AudioPreviewData* apData,
+ CompositionModelImpl::AudioPeaks* apData,
const Composition &composition,
const Segment* segment)
: m_model(model),
m_apData(apData),
m_composition(composition),
m_segment(segment),
- m_rect(model.computeSegmentRect(*(segment))),
+ m_rect(),
m_defaultCol(CompositionColourCache::getInstance()->SegmentAudioPreview),
m_height(model.grid().getYSnap()/2)
{
- int pixWidth = std::min(m_rect.getBaseWidth(), tileWidth());
+ model.getSegmentRect(*m_segment, m_rect);
+
+ int pixWidth = std::min(m_rect.baseWidth, tileWidth());
//NB. m_image used to be created as an 8-bit image with 4 bits per pixel.
// QImage::Format_Indexed8 seems to be close enough, since we manipulate the
// pixels directly by index, rather than employ drawing tools.
- m_image = QImage(pixWidth, m_rect.height(), QImage::Format_Indexed8);
- m_penWidth = (std::max(1U, (unsigned int)m_rect.getPen().width()) * 2);
+ m_image = QImage(pixWidth, m_rect.rect.height(), QImage::Format_Indexed8);
+ m_penWidth = (std::max(1U, (unsigned int)m_rect.pen.width()) * 2);
m_halfRectHeight = m_model.grid().getYSnap()/2 - m_penWidth / 2 - 2;
}
@@ -66,7 +68,7 @@ int AudioPreviewPainter::tileWidth()
void AudioPreviewPainter::paintPreviewImage()
{
- const CompositionModelImpl::AudioPreviewData::Values &values =
+ const CompositionModelImpl::AudioPeaks::Values &values =
m_apData->values;
if (values.empty())
@@ -99,14 +101,14 @@ void AudioPreviewPainter::paintPreviewImage()
int samplePoints = int(values.size()) / (channels * (showMinima ? 2 : 1));
float h1, h2, l1 = 0, l2 = 0;
- double sampleScaleFactor = samplePoints / double(m_rect.getBaseWidth());
+ double sampleScaleFactor = samplePoints / double(m_rect.baseWidth);
m_sliceNb = 0;
initializeNewSlice();
int centre = m_image.height() / 2;
- RG_DEBUG << "AudioPreviewPainter::paintPreviewImage width = " << m_rect.getBaseWidth() << ", height = " << m_rect.height() << ", halfRectHeight = " << m_halfRectHeight << endl;
+ RG_DEBUG << "AudioPreviewPainter::paintPreviewImage width = " << m_rect.baseWidth << ", height = " << m_rect.rect.height() << ", halfRectHeight = " << m_halfRectHeight << endl;
RG_DEBUG << "AudioPreviewPainter::paintPreviewImage: channels = " << channels << ", gain left = " << gain[0] << ", right = " << gain[1] << endl;
@@ -149,7 +151,7 @@ void AudioPreviewPainter::paintPreviewImage()
bool meterLevels = (settings.value("audiopreviewstyle", 1).toUInt()
== 1);
- for (int i = 0; i < m_rect.getBaseWidth(); ++i) {
+ for (int i = 0; i < m_rect.baseWidth; ++i) {
// i is the x coordinate within the rectangle. We need to
// calculate the position within the audio preview from which
@@ -163,7 +165,7 @@ void AudioPreviewPainter::paintPreviewImage()
// First find the time corresponding to this i.
timeT musicalTime =
- m_model.grid().getRulerScale()->getTimeForX(m_rect.x() + i);
+ m_model.grid().getRulerScale()->getTimeForX(m_rect.rect.x() + i);
RealTime realTime =
m_model.getComposition().getElapsedRealTime(musicalTime);
@@ -172,7 +174,7 @@ void AudioPreviewPainter::paintPreviewImage()
double offset = time - startTime;
if (endTime > startTime) {
- position = offset * m_rect.getBaseWidth() / (endTime - startTime);
+ position = offset * m_rect.baseWidth / (endTime - startTime);
position = int(channels * position);
}
@@ -255,7 +257,7 @@ void AudioPreviewPainter::paintPreviewImage()
m_image.setPixel(rectX, centre + py, pixel);
}
- if (((i+1) % tileWidth()) == 0 || i == (m_rect.getBaseWidth() - 1)) {
+ if (((i+1) % tileWidth()) == 0 || i == (m_rect.baseWidth - 1)) {
finalizeCurrentSlice();
initializeNewSlice();
}
@@ -309,7 +311,7 @@ void AudioPreviewPainter::finalizeCurrentSlice()
++m_sliceNb;
}
-PixmapArray AudioPreviewPainter::getPreviewImage()
+CompositionModelImpl::QImageVector AudioPreviewPainter::getPreviewImage()
{
return m_previewPixmaps;
}
diff --git a/src/gui/editors/segment/compositionview/AudioPreviewPainter.h b/src/gui/editors/segment/compositionview/AudioPreviewPainter.h
index 4af43e1..7fe2fdb 100644
--- a/src/gui/editors/segment/compositionview/AudioPreviewPainter.h
+++ b/src/gui/editors/segment/compositionview/AudioPreviewPainter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -28,18 +28,25 @@ namespace Rosegarden {
class CompositionModelImpl;
class Composition;
class Segment;
-class CompositionRect;
+class SegmentRect;
+/**
+ * ??? If audio previews are ever split off from CompositionModelImpl,
+ * might want to move all of this into that new audio preview class.
+ */
class AudioPreviewPainter {
public:
AudioPreviewPainter(CompositionModelImpl& model,
- CompositionModelImpl::AudioPreviewData* apData,
+ CompositionModelImpl::AudioPeaks* apData,
const Composition &composition,
const Segment* segment);
+ // ??? This is the only function. It could be called by the ctor and
+ // made private. Then construction would generate the preview image.
void paintPreviewImage();
- PixmapArray getPreviewImage();
- const CompositionRect& getSegmentRect() { return m_rect; }
+
+ CompositionModelImpl::QImageVector getPreviewImage();
+ const SegmentRect& getSegmentRect() { return m_rect; }
static int tileWidth();
@@ -49,13 +56,13 @@ protected:
//--------------- Data members ---------------------------------
CompositionModelImpl& m_model;
- CompositionModelImpl::AudioPreviewData* m_apData;
+ CompositionModelImpl::AudioPeaks* m_apData;
const Composition &m_composition;
const Segment* m_segment;
- CompositionRect m_rect;
+ SegmentRect m_rect;
QImage m_image;
- PixmapArray m_previewPixmaps;
+ CompositionModelImpl::QImageVector m_previewPixmaps;
QPainter m_p;
QPainter m_pb;
diff --git a/src/gui/editors/segment/compositionview/ChangingSegment.cpp b/src/gui/editors/segment/compositionview/ChangingSegment.cpp
new file mode 100644
index 0000000..7a84635
--- /dev/null
+++ b/src/gui/editors/segment/compositionview/ChangingSegment.cpp
@@ -0,0 +1,115 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
+
+/*
+ Rosegarden
+ A MIDI and audio sequencer and musical notation editor.
+ Copyright 2000-2015 the Rosegarden development team.
+
+ Other copyrights also apply to some parts of this work. Please
+ see the AUTHORS file and individual file headers for details.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version. See the file
+ COPYING included with this distribution for more information.
+*/
+
+
+#include "ChangingSegment.h"
+
+#include "SegmentRect.h"
+#include "base/SnapGrid.h"
+
+#include <QRect>
+
+#include <math.h>
+
+
+namespace Rosegarden
+{
+
+
+ChangingSegment::ChangingSegment(Segment &s, const SegmentRect &rect)
+ : m_segment(s),
+ m_rect(rect),
+ m_z(0)
+{}
+
+QRect ChangingSegment::rect() const
+{
+ QRect res = m_rect.rect;
+
+ // For repeating segments, use the base width
+ if (m_rect.isRepeating()) {
+ res.setWidth(m_rect.baseWidth);
+ }
+
+ return res;
+}
+
+timeT ChangingSegment::getRepeatTimeAt(const SnapGrid &grid, const QPoint &pos)
+{
+ timeT startTime = m_segment.getStartTime();
+ timeT repeatInterval = m_segment.getEndMarkerTime() - startTime;
+
+ int repeatWidth = int(nearbyint(grid.getRulerScale()->getXForTime(repeatInterval)));
+
+ int count = (pos.x() - rect().x()) / repeatWidth;
+
+ // Let the caller know that the position was not within a repeat.
+ if (count == 0)
+ return 0;
+
+ return startTime + count * repeatInterval;
+}
+
+void ChangingSegment::setStartTime(timeT time, const SnapGrid &grid)
+{
+ int x = int(nearbyint(grid.getRulerScale()->getXForTime(time)));
+
+ int curX = rect().x();
+ m_rect.rect.setX(x);
+ if (m_rect.isRepeating()) {
+ int deltaX = curX - x;
+ int curW = m_rect.baseWidth;
+ m_rect.baseWidth = curW + deltaX;
+ }
+}
+
+timeT ChangingSegment::getStartTime(const SnapGrid &grid)
+{
+ //return std::max(grid.snapX(item->rect().x()), 0L); - wrong, we can have negative start times,
+ // and if we do this we 'crop' segments when they are moved before the start of the composition
+
+ return grid.snapX(m_rect.rect.x());
+}
+
+void ChangingSegment::setEndTime(timeT time, const SnapGrid &grid)
+{
+ int x = int(nearbyint(grid.getRulerScale()->getXForTime(time)));
+ QRect r = rect();
+ QPoint topRight = r.topRight();
+ topRight.setX(x);
+ r.setTopRight(topRight);
+ m_rect.rect.setWidth(r.width());
+
+ if (m_rect.isRepeating()) {
+ m_rect.baseWidth = r.width();
+ }
+}
+
+timeT ChangingSegment::getEndTime(const SnapGrid &grid)
+{
+ QRect itemRect = rect();
+
+ return std::max(grid.snapX(itemRect.x() + itemRect.width()), 0L);
+}
+
+int ChangingSegment::getTrackPos(const SnapGrid &grid)
+{
+ return grid.getYBin(rect().y());
+}
+
+
+}
diff --git a/src/gui/editors/segment/compositionview/CompositionItem.h b/src/gui/editors/segment/compositionview/ChangingSegment.h
similarity index 56%
rename from src/gui/editors/segment/compositionview/CompositionItem.h
rename to src/gui/editors/segment/compositionview/ChangingSegment.h
index 0d7518a..8d8753b 100644
--- a/src/gui/editors/segment/compositionview/CompositionItem.h
+++ b/src/gui/editors/segment/compositionview/ChangingSegment.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -16,10 +16,11 @@
COPYING included with this distribution for more information.
*/
-#ifndef RG_COMPOSITIONITEM_H
-#define RG_COMPOSITIONITEM_H
+#ifndef RG_CHANGINGSEGMENT_H
+#define RG_CHANGINGSEGMENT_H
-#include "CompositionRect.h"
+#include "SegmentRect.h"
+#include "base/TimeT.h" // timeT
#include <QObject>
#include <QRect>
@@ -30,11 +31,16 @@ namespace Rosegarden
class Segment;
+class SnapGrid;
-/// Representation of segments that are changing.
+
+/// A changing (moving/resizing/recording) Segment.
/**
+ * This class combines a Segment pointer with a SegmentRect and a saved
+ * QRect (m_savedRect) which has the original position of the Segment.
+ *
* When segments are being selected, moved, or resized, CompositionModelImpl
- * creates CompositionItem objects to represent those changing segments
+ * creates ChangingSegment objects to represent those changing segments
* as they change.
*
* All these accessors and mutators strike me as being rather unsavory.
@@ -43,27 +49,33 @@ class Segment;
* be kept private since its mutator is interesting.
* It would be a lot easier to understand.
*/
-class CompositionItem : public QObject {
+class ChangingSegment {
public:
- CompositionItem(Segment &s, const CompositionRect &r);
+ ChangingSegment(Segment &s, const SegmentRect &r);
// Rect Mutators
- void setX(int x) { m_rect.setX(x); }
- void setY(int y) { m_rect.setY(y); }
- void moveTo(int x, int y) { m_rect.moveTo(x, y); }
- void setWidth(int w) { m_rect.setWidth(w); }
+ void setX(int x) { m_rect.rect.setX(x); }
+ void setY(int y) { m_rect.rect.setY(y); }
+ void moveTo(int x, int y) { m_rect.rect.moveTo(x, y); }
+ void setWidth(int w) { m_rect.rect.setWidth(w); }
void setZ(unsigned int z) { m_z = z; }
// Rect Accessors
// rename: baseRect()? Since it has only the baseWidth().
QRect rect() const;
- int x() const { return m_rect.x(); }
- int y() const { return m_rect.y(); }
+ int x() const { return m_rect.rect.x(); }
+ int y() const { return m_rect.rect.y(); }
unsigned int z() const { return m_z; }
bool isRepeating() const { return m_rect.isRepeating(); }
- CompositionRect& getCompRect() { return m_rect; }
+ SegmentRect& getCompRect() { return m_rect; }
+
+ /// Get the start time of the repeat nearest the point.
+ /**
+ * Used by CompositionView to determine the time at which to edit a repeat.
+ */
+ timeT getRepeatTimeAt(const SnapGrid &, const QPoint &);
// Access to the contained segment
Segment *getSegment() { return &m_segment; }
@@ -73,18 +85,24 @@ public:
void saveRect() { m_savedRect = rect(); }
QRect savedRect() const { return m_savedRect; }
+ void setStartTime(timeT, const SnapGrid &);
+ timeT getStartTime(const SnapGrid &);
+
+ void setEndTime(timeT, const SnapGrid &);
+ timeT getEndTime(const SnapGrid &);
+
+ int getTrackPos(const SnapGrid &);
+
private:
Segment &m_segment;
- CompositionRect m_rect;
+ SegmentRect m_rect;
unsigned int m_z;
QRect m_savedRect;
};
-// ??? It might be educational to investigate whether QPointer is actually
-// needed for this.
-typedef QPointer<CompositionItem> CompositionItemPtr;
+typedef QSharedPointer<ChangingSegment> ChangingSegmentPtr;
}
diff --git a/src/gui/editors/segment/compositionview/CompositionColourCache.cpp b/src/gui/editors/segment/compositionview/CompositionColourCache.cpp
index 2dad028..3dd4ccd 100644
--- a/src/gui/editors/segment/compositionview/CompositionColourCache.cpp
+++ b/src/gui/editors/segment/compositionview/CompositionColourCache.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/compositionview/CompositionColourCache.h b/src/gui/editors/segment/compositionview/CompositionColourCache.h
index 075f49a..b110de4 100644
--- a/src/gui/editors/segment/compositionview/CompositionColourCache.h
+++ b/src/gui/editors/segment/compositionview/CompositionColourCache.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/compositionview/CompositionItem.cpp b/src/gui/editors/segment/compositionview/CompositionItem.cpp
deleted file mode 100644
index 711493d..0000000
--- a/src/gui/editors/segment/compositionview/CompositionItem.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
-/*
- Rosegarden
- A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
-
- Other copyrights also apply to some parts of this work. Please
- see the AUTHORS file and individual file headers for details.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
-*/
-
-
-#include "CompositionItem.h"
-
-#include "CompositionRect.h"
-
-#include <QRect>
-
-
-namespace Rosegarden
-{
-
-
-CompositionItem::CompositionItem(Segment &s, const CompositionRect &rect)
- : m_segment(s),
- m_rect(rect),
- m_z(0)
-{}
-
-QRect CompositionItem::rect() const
-{
- QRect res = m_rect;
-
- // For repeating segments, use the base width
- if (m_rect.isRepeating()) {
- res.setWidth(m_rect.getBaseWidth());
- }
-
- return res;
-}
-
-
-}
diff --git a/src/gui/editors/segment/compositionview/CompositionItemHelper.cpp b/src/gui/editors/segment/compositionview/CompositionItemHelper.cpp
deleted file mode 100644
index b115f63..0000000
--- a/src/gui/editors/segment/compositionview/CompositionItemHelper.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
-/*
- Rosegarden
- A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
-
- Other copyrights also apply to some parts of this work. Please
- see the AUTHORS file and individual file headers for details.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
-*/
-
-#define RG_MODULE_STRING "[CompositionItemHelper]"
-
-#include <cmath>
-
-#include "CompositionItemHelper.h"
-
-#include "base/Segment.h"
-#include "base/SnapGrid.h"
-#include "misc/Debug.h"
-#include "CompositionItem.h"
-#include <QColor>
-#include <QPoint>
-#include <QRect>
-
-namespace Rosegarden
-{
-
-timeT CompositionItemHelper::getStartTime(CompositionItemPtr item, const Rosegarden::SnapGrid& grid)
-{
- timeT t = 0;
-
- if (item) {
- // t = std::max(grid.snapX(item->rect().x()), 0L); - wrong, we can have negative start times,
- // and if we do this we 'crop' segments when they are moved before the start of the composition
- t = grid.snapX(item->rect().x());
-
-// RG_DEBUG << "CompositionItemHelper::getStartTime(): item is repeating : " << item->isRepeating()
-// << " - startTime = " << t
-// << endl;
- }
-
- return t;
-}
-
-timeT CompositionItemHelper::getEndTime(CompositionItemPtr item, const Rosegarden::SnapGrid& grid)
-{
- timeT t = 0;
-
- if (item) {
- QRect itemRect = item->rect();
-
- t = std::max(grid.snapX(itemRect.x() + itemRect.width()), 0L);
-
-// RG_DEBUG << "CompositionItemHelper::getEndTime() : rect width = "
-// << itemRect.width()
-// << " - item is repeating : " << item->isRepeating()
-// << " - endTime = " << t
-// << endl;
-
- }
-
- return t;
-}
-
-void CompositionItemHelper::setStartTime(CompositionItemPtr item, timeT time,
- const Rosegarden::SnapGrid& grid)
-{
- if (item) {
- int x = int(nearbyint(grid.getRulerScale()->getXForTime(time)));
-
- RG_DEBUG << "CompositionItemHelper::setStartTime() time = " << time
- << " -> x = " << x << endl;
-
- int curX = item->rect().x();
- item->setX(x);
- if (item->isRepeating()) {
- int deltaX = curX - x;
- CompositionRect& sr = item->getCompRect();
- int curW = sr.getBaseWidth();
- sr.setBaseWidth(curW + deltaX);
- }
-
- }
-
-}
-
-void CompositionItemHelper::setEndTime(CompositionItemPtr item, timeT time,
- const Rosegarden::SnapGrid& grid)
-{
- if (item) {
- int x = int(nearbyint(grid.getRulerScale()->getXForTime(time)));
- QRect r = item->rect();
- QPoint topRight = r.topRight();
- topRight.setX(x);
- r.setTopRight(topRight);
- item->setWidth(r.width());
-
- if (item->isRepeating()) {
- CompositionRect& sr = item->getCompRect();
- sr.setBaseWidth(r.width());
- }
- }
-}
-
-int CompositionItemHelper::getTrackPos(CompositionItemPtr item, const Rosegarden::SnapGrid& grid)
-{
- return grid.getYBin(item->rect().y());
-}
-
-Rosegarden::Segment* CompositionItemHelper::getSegment(CompositionItemPtr item)
-{
- return item->getSegment();
-}
-
-CompositionItemPtr CompositionItemHelper::makeCompositionItem(Rosegarden::Segment* segment)
-{
- return CompositionItemPtr(new CompositionItem(*segment, QRect()));
-}
-
-CompositionItemPtr CompositionItemHelper::findSiblingCompositionItem(const CompositionModelImpl::ItemContainer& items,
- CompositionItemPtr referenceItem)
-{
- CompositionModelImpl::ItemContainer::const_iterator it;
- Rosegarden::Segment* currentSegment = CompositionItemHelper::getSegment(referenceItem);
-
- for (it = items.begin(); it != items.end(); ++it) {
- CompositionItemPtr item = *it;
- Rosegarden::Segment* segment = CompositionItemHelper::getSegment(item);
- if (segment == currentSegment) {
- return item;
- }
- }
-
- return referenceItem;
-}
-
-}
diff --git a/src/gui/editors/segment/compositionview/CompositionItemHelper.h b/src/gui/editors/segment/compositionview/CompositionItemHelper.h
deleted file mode 100644
index 835e80d..0000000
--- a/src/gui/editors/segment/compositionview/CompositionItemHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
-/*
- Rosegarden
- A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
-
- Other copyrights also apply to some parts of this work. Please
- see the AUTHORS file and individual file headers for details.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
-*/
-
-#ifndef RG_COMPOSITIONITEMHELPER_H
-#define RG_COMPOSITIONITEMHELPER_H
-
-#include "CompositionModelImpl.h"
-#include "base/Event.h"
-
-namespace Rosegarden
-{
-
-
-class SnapGrid;
-class Segment;
-
-class CompositionItemHelper {
-public:
- static timeT getStartTime(CompositionItemPtr, const SnapGrid&);
- static timeT getEndTime(CompositionItemPtr, const SnapGrid&);
- static int getTrackPos(CompositionItemPtr, const SnapGrid&);
- static void setStartTime(CompositionItemPtr, timeT, const SnapGrid&);
- static void setEndTime(CompositionItemPtr, timeT, const SnapGrid&);
- static Segment* getSegment(CompositionItemPtr);
- static CompositionItemPtr makeCompositionItem(Segment*);
- /**
- * return the CompositionItemPtr in the model which references the same segment as referenceItem
- */
- static CompositionItemPtr findSiblingCompositionItem(const CompositionModelImpl::ItemContainer& items, CompositionItemPtr referenceItem);
-
-};
-
-
-}
-
-#endif
diff --git a/src/gui/editors/segment/compositionview/CompositionModelImpl.cpp b/src/gui/editors/segment/compositionview/CompositionModelImpl.cpp
index 1467f85..f63fe43 100644
--- a/src/gui/editors/segment/compositionview/CompositionModelImpl.cpp
+++ b/src/gui/editors/segment/compositionview/CompositionModelImpl.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -19,21 +19,20 @@
#include "CompositionModelImpl.h"
#include "SegmentOrderer.h"
-#include "AudioPreviewThread.h"
-#include "AudioPreviewUpdater.h"
+#include "AudioPeaksThread.h"
+#include "AudioPeaksGenerator.h"
#include "AudioPreviewPainter.h"
-#include "CompositionItemHelper.h"
-#include "CompositionItem.h"
-#include "CompositionRect.h"
+#include "ChangingSegment.h"
+#include "SegmentRect.h"
#include "CompositionColourCache.h"
#include "base/BaseProperties.h"
#include "misc/Debug.h"
-#include "misc/Strings.h"
+#include "misc/Strings.h" // strtoqstr()
#include "base/Composition.h"
#include "base/Event.h"
-#include "base/MidiProgram.h"
-#include "base/NotationTypes.h"
+#include "base/Instrument.h"
+#include "base/InstrumentStaticSignals.h"
#include "base/Profiler.h"
#include "base/RulerScale.h"
#include "base/Segment.h"
@@ -45,1355 +44,1276 @@
#include <QBrush>
#include <QColor>
-#include <QPen>
#include <QPoint>
#include <QRect>
#include <QRegExp>
#include <QSize>
#include <QString>
-#include <cmath>
-#include <algorithm>
+#include <math.h>
+#include <algorithm> // std::lower_bound() and std::min()
namespace Rosegarden
{
-CompositionModelImpl::CompositionModelImpl(Composition& compo,
- Studio& studio,
+CompositionModelImpl::CompositionModelImpl(
+ QObject *parent,
+ Composition &composition,
+ Studio &studio,
RulerScale *rulerScale,
- int vStep)
- : m_composition(compo),
- m_studio(studio),
- m_grid(rulerScale, vStep),
- m_pointerTimePos(0),
- m_audioPreviewThread(0)
+ int trackCellHeight) :
+ QObject(parent),
+ m_composition(composition),
+ m_studio(studio),
+ m_grid(rulerScale, trackCellHeight),
+ m_instrumentStaticSignals(),
+ m_notationPreviewCache(),
+ m_audioPeaksThread(0),
+ m_audioPeaksGeneratorMap(),
+ m_audioPeaksCache(),
+ m_audioPreviewImageCache(),
+ m_selectedSegments(),
+ m_tmpSelectedSegments(),
+ m_previousTmpSelectedSegments(),
+ m_selectionRect(),
+ m_previousSelectionUpdateRect(),
+ m_recordingSegments(),
+ m_pointerTime(0),
+ m_changeType(ChangeMove),
+ m_changingSegments()
{
m_composition.addObserver(this);
- setTrackHeights();
+ updateAllTrackHeights();
- segmentcontainer& segments = m_composition.getSegments();
- segmentcontainer::iterator segEnd = segments.end();
+ SegmentMultiSet &segments = m_composition.getSegments();
- for (segmentcontainer::iterator i = segments.begin();
- i != segEnd; ++i) {
+ // For each segment in the Composition
+ for (SegmentMultiSet::iterator i = segments.begin();
+ i != segments.end();
+ ++i) {
+ // Subscribe
(*i)->addObserver(this);
}
+
+ // Hold on to this to make sure it stays around as long as we do.
+ m_instrumentStaticSignals = Instrument::getStaticSignals();
+
+ connect(m_instrumentStaticSignals.data(),
+ SIGNAL(changed(Instrument *)),
+ this,
+ SLOT(slotInstrumentChanged(Instrument *)));
}
CompositionModelImpl::~CompositionModelImpl()
{
- RG_DEBUG << "CompositionModelImpl::~CompositionModelImpl()";
-
if (!isCompositionDeleted()) {
m_composition.removeObserver(this);
- segmentcontainer& segments = m_composition.getSegments();
- segmentcontainer::iterator segEnd = segments.end();
+ SegmentMultiSet &segments = m_composition.getSegments();
- for (segmentcontainer::iterator i = segments.begin();
- i != segEnd; ++i) {
+ // For each segment in the Composition
+ for (SegmentMultiSet::iterator i = segments.begin();
+ i != segments.end(); ++i) {
+ // Unsubscribe
(*i)->removeObserver(this);
}
}
- RG_DEBUG << "CompositionModelImpl::~CompositionModelImpl(): removal from Segment & Composition observers OK";
-
- if (m_audioPreviewThread) {
- while (!m_audioPreviewUpdaterMap.empty()) {
+ if (m_audioPeaksThread) {
+ // For each audio peaks updater
+ // ??? This is similar to setAudioPeaksThread().
+ while (!m_audioPeaksGeneratorMap.empty()) {
// Cause any running previews to be cancelled
- delete m_audioPreviewUpdaterMap.begin()->second;
- m_audioPreviewUpdaterMap.erase(m_audioPreviewUpdaterMap.begin());
+ delete m_audioPeaksGeneratorMap.begin()->second;
+ m_audioPeaksGeneratorMap.erase(m_audioPeaksGeneratorMap.begin());
}
}
- for (NotationPreviewDataCache::iterator i = m_notationPreviewDataCache.begin();
- i != m_notationPreviewDataCache.end(); ++i) {
+ // ??? The following code is similar to deleteCachedPreviews().
+
+ // Delete the notation previews
+ for (NotationPreviewCache::iterator i = m_notationPreviewCache.begin();
+ i != m_notationPreviewCache.end(); ++i) {
delete i->second;
}
- for (AudioPreviewDataCache::iterator i = m_audioPreviewDataCache.begin();
- i != m_audioPreviewDataCache.end(); ++i) {
+
+ // Delete the audio peaks
+ for (AudioPeaksCache::iterator i = m_audioPeaksCache.begin();
+ i != m_audioPeaksCache.end(); ++i) {
delete i->second;
}
}
-struct RectCompare {
- bool operator()(const QRect &r1, const QRect &r2) const {
- return r1.left() < r2.left();
- }
-};
+// --- Segments -----------------------------------------------------
-void CompositionModelImpl::makeNotationPreviewRects(QPoint basePoint,
- const Segment* segment, const QRect& clipRect, RectRanges* npRects)
+void CompositionModelImpl::getSegmentRects(
+ const QRect &clipRect,
+ SegmentRects *segmentRects,
+ NotationPreviewRanges *notationPreviewRanges,
+ AudioPreviews *audioPreviews)
{
- Profiler profiler("CompositionModelImpl::makeNotationPreviewRects");
-
- RectList* cachedNPData = getNotationPreviewData(segment);
+ Profiler profiler("CompositionModelImpl::getSegmentRects()");
- if (cachedNPData->empty())
- return ;
+ // Start with a clean slate.
+ segmentRects->clear();
- RectList::iterator npEnd = cachedNPData->end();
+ // For readability
+ CompositionColourCache *colourCache =
+ CompositionColourCache::getInstance();
- // Find the first preview rect that *starts within* the clipRect.
- // Probably not the right thing to do as this means any event that starts
- // prior to the clipRect but stretches through the clipRect will be
- // dropped. And this explains why long notes disappear from the segment
- // previews.
- // Note that RectList is a std::vector, so this call will take increasing
- // amounts of time as the number of events to the left of the clipRect
- // increases. This is probably at least a small part of the "CPU usage
- // increasing over time" issue.
- // If cachedNPData is sorted by start time, we could at least do a binary
- // search.
- RectList::iterator npi = std::lower_bound(cachedNPData->begin(), npEnd, clipRect, RectCompare());
+ const SegmentMultiSet &segments = m_composition.getSegments();
- // If no preview rects were within the clipRect, bail.
- if (npi == npEnd)
- return ;
-
- // ??? Go back one event if we aren't already at the beginning. Why?
- // Hilariously, this partially "fixes" the "missing event in preview"
- // problem. However, it only "fixes" the problem for a single event.
- // Is that why this is here?
- // When testing, to get around the fact that the segments are drawn on a
- // segment layer in CompositionView, just disable then re-enable segment
- // previews in the menu and the "missing event in preview" problem is easy
- // to see.
- if (npi != cachedNPData->begin())
- --npi;
-
- // Compute the interval within the Notation Preview for this segment.
-
- RectRange interval;
- interval.range.first = npi;
-
- // Compute the rightmost x coord (xLim)
- int segEndX = int(nearbyint(m_grid.getRulerScale()->getXForTime(segment->getEndMarkerTime())));
- int xLim = std::min(clipRect.right(), segEndX);
-
- //RG_DEBUG << "CompositionModelImpl::makeNotationPreviewRects : basePoint.x : "
- // << basePoint.x();
-
- // Search sequentially for the last preview rect in the segment.
- while (npi != npEnd && npi->x() < xLim)
- ++npi;
-
- interval.range.second = npi;
- interval.basePoint.setX(0);
- interval.basePoint.setY(basePoint.y());
- interval.color = segment->getPreviewColour();
-
- // Add the interval to the caller's interval list.
- npRects->push_back(interval);
-}
+ // For each segment in the composition
+ for (SegmentMultiSet::const_iterator i = segments.begin();
+ i != segments.end();
+ ++i) {
-void CompositionModelImpl::makeNotationPreviewRectsMovingSegment(QPoint basePoint,
- const Segment* segment, const QRect& currentSR, RectRanges* npRects)
-{
- CompositionRect unmovedSR = computeSegmentRect(*segment);
+ const Segment *segment = *i;
- RectList* cachedNPData = getNotationPreviewData(segment);
+ // Changing segments are handled in the next for loop.
+ if (isChanging(segment))
+ continue;
- if (cachedNPData->empty())
- return ;
+ SegmentRect segmentRect;
+ getSegmentRect(*segment, segmentRect);
- RectList::iterator npBegin = cachedNPData->begin();
- RectList::iterator npEnd = cachedNPData->end();
+ // If this segment isn't in the clip rect, try the next.
+ if (!segmentRect.rect.intersects(clipRect))
+ continue;
- RectList::iterator npi;
+ // Update the SegmentRect's selected state.
+
+ segmentRect.selected = (
+ isSelected(segment) ||
+ isTmpSelected(segment) ||
+ segmentRect.rect.intersects(m_selectionRect));
+
+ // Update the SegmentRect's pen and brush.
+
+ if (!isRecording(segment)) {
+ // Pen
+ segmentRect.pen = colourCache->SegmentBorder;
+
+ // Brush
+ QColor brushColor = GUIPalette::convertColour(
+ m_composition.getSegmentColourMap().getColourByIndex(
+ segment->getColourIndex()));
+ Qt::BrushStyle brushPattern =
+ segment->isTrulyLinked() ?
+ Qt::Dense2Pattern : Qt::SolidPattern;
+ segmentRect.brush = QBrush(brushColor, brushPattern);
+ } else { // Recording
+ // Pen
+ segmentRect.pen = colourCache->RecordingSegmentBorder;
+
+ // Brush
+ if (segment->isMIDI())
+ segmentRect.brush = colourCache->RecordingInternalSegmentBlock;
+ else // Audio Segment
+ segmentRect.brush = colourCache->RecordingAudioSegmentBlock;
+ }
- if (m_changeType == ChangeResizeFromStart)
- npi = std::lower_bound(npBegin, npEnd, currentSR, RectCompare());
- else
- npi = std::lower_bound(npBegin, npEnd, unmovedSR, RectCompare());
+ // Generate the requested previews.
- if (npi == npEnd)
- return ;
+ if (segment->isMIDI()) {
+ makeNotationPreviewRange(
+ QPoint(0, segmentRect.rect.y()), segment, clipRect,
+ notationPreviewRanges);
+ } else { // Audio Segment
+ makeAudioPreview(segment, segmentRect, audioPreviews);
+ }
- // ??? Bump iterator back one to try and pick up the previous event
- // rectangle which might be needed.
- if (npi != npBegin && m_changeType != ChangeResizeFromStart) {
- --npi;
+ segmentRects->push_back(segmentRect);
}
- // Compute the interval within the Notation Preview for this segment.
+ // Changing Segments (Moving/Resizing)
- RectRange interval;
- interval.range.first = npi;
+ // For each changing segment
+ for (ChangingSegmentSet::iterator i = m_changingSegments.begin();
+ i != m_changingSegments.end();
+ ++i) {
- // Compute the rightmost x coord (xLim)
- int xLim = m_changeType == ChangeMove ? unmovedSR.right() : currentSR.right();
+ SegmentRect segmentRect((*i)->rect());
- //RG_DEBUG << "CompositionModelImpl::makeNotationPreviewRectsMovingSegment : basePoint.x : "
- // << basePoint.x();
-
- // Search sequentially for the last preview rect in the segment.
- while (npi != npEnd && npi->x() < xLim)
- ++npi;
+ // If it doesn't intersect, try the next one.
+ if (!segmentRect.rect.intersects(clipRect))
+ continue;
- interval.range.second = npi;
- interval.basePoint.setY(basePoint.y());
+ // Set up the SegmentRect
- if (m_changeType == ChangeMove)
- interval.basePoint.setX(basePoint.x() - unmovedSR.x());
- else
- interval.basePoint.setX(0);
+ // Selected
+ segmentRect.selected = true;
- interval.color = segment->getPreviewColour();
+ // Brush
+ Segment *segment = (*i)->getSegment();
+ Colour segmentColour =
+ m_composition.getSegmentColourMap().getColourByIndex(
+ segment->getColourIndex());
+ segmentRect.brush = GUIPalette::convertColour(segmentColour);
- npRects->push_back(interval);
-}
-
-void CompositionModelImpl::makeAudioPreviewRects(AudioPreviewDrawData* apRects, const Segment* segment,
- const CompositionRect& segRect, const QRect& /*clipRect*/)
-{
- Profiler profiler("CompositionModelImpl::makeAudioPreviewRects");
+ // Pen
+ segmentRect.pen = colourCache->SegmentBorder;
- RG_DEBUG << "CompositionModelImpl::makeAudioPreviewRects - segRect = " << segRect;
+ // Generate the preview
- PixmapArray previewImage = getAudioPreviewPixmap(segment);
-
- QPoint basePoint = segRect.topLeft();
-
- AudioPreviewDrawDataItem previewItem(previewImage, basePoint, segRect);
+ if (segment->isMIDI()) {
+ makeNotationPreviewRangeCS(
+ segmentRect.rect.topLeft(), segment, segmentRect.rect,
+ clipRect, notationPreviewRanges);
+ } else { // Audio Segment
+ makeAudioPreview(segment, segmentRect, audioPreviews);
+ }
- if (m_changeType == ChangeResizeFromStart) {
- CompositionRect originalRect = computeSegmentRect(*segment);
- previewItem.resizeOffset = segRect.x() - originalRect.x();
+ segmentRects->push_back(segmentRect);
}
-
- apRects->push_back(previewItem);
-}
-
-#if 0
-void CompositionModelImpl::computeRepeatMarks(CompositionItemPtr item)
-{
- Segment* s = CompositionItemHelper::getSegment(item);
- CompositionRect& sr = item->getCompRect();
- computeRepeatMarks(sr, s);
}
-#endif
-void CompositionModelImpl::computeRepeatMarks(CompositionRect& sr, const Segment* s)
+ChangingSegmentPtr CompositionModelImpl::getSegmentAt(const QPoint &pos)
{
- if (s->isRepeating()) {
-
- timeT startTime = s->getStartTime();
- timeT endTime = s->getEndMarkerTime();
- timeT repeatInterval = endTime - startTime;
-
- if (repeatInterval <= 0) {
- //RG_DEBUG << "WARNING: CompositionModelImpl::computeRepeatMarks: Segment at " << startTime << " has repeatInterval " << repeatInterval;
- //RG_DEBUG << kdBacktrace();
- return ;
- }
+ const SegmentMultiSet &segments = m_composition.getSegments();
- timeT repeatStart = endTime;
- timeT repeatEnd = s->getRepeatEndTime();
- sr.setWidth(int(nearbyint(m_grid.getRulerScale()->getWidthForDuration(startTime,
- repeatEnd - startTime))));
+ // For each segment in the composition
+ for (SegmentMultiSet::iterator i = segments.begin();
+ i != segments.end();
+ ++i) {
- CompositionRect::repeatmarks repeatMarks;
+ Segment &segment = **i;
- //RG_DEBUG << "CompositionModelImpl::computeRepeatMarks : repeatStart = "
- // << repeatStart << " - repeatEnd = " << repeatEnd;
+ SegmentRect segmentRect;
+ getSegmentRect(segment, segmentRect);
- for (timeT repeatMark = repeatStart; repeatMark < repeatEnd; repeatMark += repeatInterval) {
- int mark = int(nearbyint(m_grid.getRulerScale()->getXForTime(repeatMark)));
- //RG_DEBUG << "CompositionModelImpl::computeRepeatMarks : mark at " << mark;
- repeatMarks.push_back(mark);
- }
- sr.setRepeatMarks(repeatMarks);
- if (repeatMarks.size() > 0)
- sr.setBaseWidth(repeatMarks[0] - sr.x());
- else {
- //RG_DEBUG << "CompositionModelImpl::computeRepeatMarks : no repeat marks";
- sr.setBaseWidth(sr.width());
+ if (segmentRect.rect.contains(pos)) {
+ return ChangingSegmentPtr(
+ new ChangingSegment(segment, segmentRect));
}
-
- //RG_DEBUG << "CompositionModelImpl::computeRepeatMarks : s = "
- // << s << " base width = " << sr.getBaseWidth()
- // << " - nb repeat marks = " << repeatMarks.size();
-
}
-}
-
-void CompositionModelImpl::setAudioPreviewThread(AudioPreviewThread *thread)
-{
- //RG_DEBUG << "\nCompositionModelImpl::setAudioPreviewThread()";
- // For each AudioPreviewUpdater
- while (!m_audioPreviewUpdaterMap.empty()) {
- // Cause any running previews to be cancelled
- delete m_audioPreviewUpdaterMap.begin()->second;
- m_audioPreviewUpdaterMap.erase(m_audioPreviewUpdaterMap.begin());
- }
-
- m_audioPreviewThread = thread;
+ // Not found.
+ return ChangingSegmentPtr();
}
-void CompositionModelImpl::clearPreviewCache()
+void CompositionModelImpl::getSegmentQRect(
+ const Segment &segment, QRect &rect) const
{
- //RG_DEBUG << "CompositionModelImpl::clearPreviewCache";
+ // This routine does no caching. Caching will be implemented later
+ // if performance measurements indicate a need and we can come up
+ // with an effective caching approach. Initial performance
+ // measurements show that this uses the same amount of CPU when
+ // recording as the previous approach.
- for (NotationPreviewDataCache::iterator i = m_notationPreviewDataCache.begin();
- i != m_notationPreviewDataCache.end(); ++i) {
- delete i->second;
- }
- for (AudioPreviewDataCache::iterator i = m_audioPreviewDataCache.begin();
- i != m_audioPreviewDataCache.end(); ++i) {
- delete i->second;
- }
+ const timeT startTime = segment.getStartTime();
- m_notationPreviewDataCache.clear();
- m_audioPreviewDataCache.clear();
+ // Compute X (left)
+ rect.setX(lround(m_grid.getRulerScale()->getXForTime(startTime)));
- m_audioSegmentPreviewMap.clear();
-
- for (AudioPreviewUpdaterMap::iterator i = m_audioPreviewUpdaterMap.begin();
- i != m_audioPreviewUpdaterMap.end(); ++i) {
- i->second->cancel();
- }
+ // Compute Y (top)
+ const int trackPosition =
+ m_composition.getTrackPositionById(segment.getTrack());
+ rect.setY(m_grid.getYBinCoordinate(trackPosition) +
+ m_composition.getSegmentVoiceIndex(&segment) *
+ m_grid.getYSnap() + 1);
- const segmentcontainer& segments = m_composition.getSegments();
- segmentcontainer::const_iterator segEnd = segments.end();
+ // Compute height
+ rect.setHeight(m_grid.getYSnap() - 2);
- for (segmentcontainer::const_iterator i = segments.begin();
- i != segEnd; ++i) {
-
- if ((*i)->getType() == Segment::Audio) {
- // This will create the audio preview updater. The
- // preview won't be calculated and cached until the
- // updater completes and calls back.
- updatePreviewCacheForAudioSegment((*i));
- }
+ // Compute width
+ int width;
+ if (segment.isRepeating()) {
+ width = lround(m_grid.getRulerScale()->getWidthForDuration(
+ startTime,
+ segment.getRepeatEndTime() - startTime));
+ } else {
+ const timeT endTime = isRecording(&segment) ?
+ m_pointerTime :
+ segment.getEndMarkerTime();
+ width = lround(m_grid.getRulerScale()->getWidthForDuration(
+ startTime, endTime - startTime));
}
+ rect.setWidth(width);
}
-void CompositionModelImpl::createEventRects(const Segment *segment, RectList *npData)
+void CompositionModelImpl::getSegmentRect(
+ const Segment &segment, SegmentRect &segmentRect) const
{
- npData->clear();
-
- int segStartX = static_cast<int>(nearbyint(
- m_grid.getRulerScale()->getXForTime(segment->getStartTime())));
+ getSegmentQRect(segment, segmentRect.rect);
- bool isPercussion = false;
- Track *track = m_composition.getTrackById(segment->getTrack());
- if (track) {
- InstrumentId iid = track->getInstrument();
- Instrument *instrument = m_studio.getInstrumentById(iid);
- if (instrument && instrument->isPercussion()) isPercussion = true;
+ QString label = strtoqstr(segment.getLabel());
+ if (segment.isAudio()) {
+ // Remove anything in parens and the filename suffix.
+ static QRegExp re1("( *\\([^)]*\\))*$"); // (inserted) (copied) (etc)
+ static QRegExp re2("\\.[^.]+$"); // filename suffix
+ label.replace(re1, "").replace(re2, "");
}
+ segmentRect.label = label;
- // For each event in the segment
- for (Segment::const_iterator i = segment->begin();
- i != segment->end(); ++i) {
-
- long pitch = 0;
- if (!(*i)->isa(Note::EventType) ||
- !(*i)->get<Int>(BaseProperties::PITCH, pitch)) {
- continue;
- }
-
- timeT eventStart = (*i)->getAbsoluteTime();
- timeT eventEnd = eventStart + (*i)->getDuration();
- // if (eventEnd > segment->getEndMarkerTime()) {
- // eventEnd = segment->getEndMarkerTime();
- // }
-
- int x = static_cast<int>(nearbyint(
- m_grid.getRulerScale()->getXForTime(eventStart)));
- int width = static_cast<int>(nearbyint(
- m_grid.getRulerScale()->getWidthForDuration(
- eventStart, eventEnd - eventStart)));
-
- //RG_DEBUG << "CompositionModelImpl::createEventRects: x = " << x << ", width = " << width << " (time = " << eventStart << ", duration = " << eventEnd - eventStart << ")";
-
- if (x <= segStartX) {
- ++x;
- if (width > 1) --width;
- }
- if (width > 1) --width;
- if (width < 1) ++width;
+ if (segment.isRepeating()) {
+ computeRepeatMarks(segment, segmentRect);
+ } else {
+ segmentRect.repeatMarks.clear();
+ segmentRect.baseWidth = segmentRect.rect.width();
+ }
- const double y0 = 0;
- const double y1 = m_grid.getYSnap();
- double y = y1 + ((y0 - y1) * (pitch - 16)) / 96;
+ // Reset remaining fields.
+ segmentRect.selected = false;
+ segmentRect.brush = SegmentRect::DefaultBrushColor;
+ segmentRect.pen = SegmentRect::DefaultPenColor;
+}
- int height = 1;
+void CompositionModelImpl::updateAllTrackHeights()
+{
+ // For each track in the composition
+ for (Composition::trackcontainer::const_iterator i =
+ m_composition.getTracks().begin();
+ i != m_composition.getTracks().end();
+ ++i) {
- if (isPercussion) {
- height = 2;
- if (width > 2) width = 2;
- }
+ const TrackId trackId = i->first;
+ const Track *track = i->second;
- if (y < y0) y = y0;
- if (y > y1 - height + 1) y = y1 - height + 1;
+ int heightMultiple =
+ m_composition.getMaxContemporaneousSegmentsOnTrack(trackId);
+ if (heightMultiple == 0)
+ heightMultiple = 1;
- // ??? static_cast<int>(nearbyint(y))?
- QRect r(x, static_cast<int>(y), width, height);
+ const int bin = track->getPosition();
- npData->push_back(r);
+ m_grid.setBinHeightMultiple(bin, heightMultiple);
}
}
-void CompositionModelImpl::updatePreviewCacheForAudioSegment(const Segment* segment)
+void CompositionModelImpl::computeRepeatMarks(
+ const Segment &segment, SegmentRect &segmentRect) const
{
- if (m_audioPreviewThread) {
- //RG_DEBUG << "CompositionModelImpl::updatePreviewCacheForAudioSegment() - new audio preview started";
+ if (!segment.isRepeating())
+ return;
- CompositionRect segRect = computeSegmentRect(*segment);
- segRect.setWidth(segRect.getBaseWidth()); // don't use repeating area
- segRect.moveTopLeft(QPoint(0, 0));
+ const timeT startTime = segment.getStartTime();
+ const timeT endTime = segment.getEndMarkerTime();
+ const timeT repeatInterval = endTime - startTime;
- if (m_audioPreviewUpdaterMap.find(segment) ==
- m_audioPreviewUpdaterMap.end()) {
+ if (repeatInterval <= 0)
+ return;
- AudioPreviewUpdater *updater = new AudioPreviewUpdater
- (*m_audioPreviewThread, m_composition, segment, segRect, this);
+ const timeT repeatStart = endTime;
+ const timeT repeatEnd = segment.getRepeatEndTime();
- connect(updater, SIGNAL(audioPreviewComplete(AudioPreviewUpdater*)),
- this, SLOT(slotAudioPreviewComplete(AudioPreviewUpdater*)));
+ segmentRect.rect.setWidth(
+ lround(m_grid.getRulerScale()->getWidthForDuration(
+ startTime, repeatEnd - startTime)));
- m_audioPreviewUpdaterMap[segment] = updater;
+ segmentRect.repeatMarks.clear();
- } else {
+ // For each repeat mark
+ for (timeT repeatMark = repeatStart;
+ repeatMark < repeatEnd;
+ repeatMark += repeatInterval) {
- m_audioPreviewUpdaterMap[segment]->setDisplayExtent(segRect);
- }
-
- m_audioPreviewUpdaterMap[segment]->update();
+ const int markX =
+ lround(m_grid.getRulerScale()->getXForTime(repeatMark));
+ segmentRect.repeatMarks.push_back(markX);
+ }
+ if (!segmentRect.repeatMarks.empty()) {
+ segmentRect.baseWidth =
+ segmentRect.repeatMarks[0] - segmentRect.rect.x();
} else {
- RG_DEBUG << "CompositionModelImpl::updatePreviewCacheForAudioSegment() - no audio preview thread set";
+ segmentRect.baseWidth = segmentRect.rect.width();
}
}
-void CompositionModelImpl::slotAudioPreviewComplete(AudioPreviewUpdater* apu)
+void CompositionModelImpl::segmentAdded(const Composition *, Segment *s)
{
- RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete()";
-
- AudioPreviewData *apData = getAudioPreviewData(apu->getSegment());
- QRect updateRect;
-
- if (apData) {
- RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete(" << apu << "): apData contains " << apData->values.size() << " values already";
- unsigned int channels = 0;
- const std::vector<float> &values = apu->getComputedValues(channels);
- if (channels > 0) {
- RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete: set "
- << values.size() << " samples on " << channels << " channels";
- apData->channels = channels;
- apData->values = values; // ??? COPY performance issue?
- updateRect = postProcessAudioPreview(apData, apu->getSegment());
- }
- }
+ // Keep tabs on it.
+ s->addObserver(this);
- if (!updateRect.isEmpty())
- emit needContentUpdate(updateRect);
+ // TrackEditor::commandExecuted() already updates us. However, it
+ // shouldn't. This is the right thing to do.
+ emit needUpdate();
}
-QRect CompositionModelImpl::postProcessAudioPreview(AudioPreviewData* apData, const Segment* segment)
+void CompositionModelImpl::segmentRemoved(const Composition *, Segment *s)
{
- //RG_DEBUG << "CompositionModelImpl::postProcessAudioPreview()";
-
- AudioPreviewPainter previewPainter(*this, apData, m_composition, segment);
- previewPainter.paintPreviewImage();
+ // Be tidy or else Segment's dtor will complain.
+ s->removeObserver(this);
- m_audioSegmentPreviewMap[segment] = previewPainter.getPreviewImage();
+ deleteCachedPreview(s);
+ m_selectedSegments.erase(s);
+ m_recordingSegments.erase(s);
- return previewPainter.getSegmentRect();
+ // TrackEditor::commandExecuted() already updates us. However, it
+ // shouldn't. This is the right thing to do.
+ emit needUpdate();
}
-void CompositionModelImpl::slotInstrumentParametersChanged(InstrumentId id)
+void CompositionModelImpl::segmentTrackChanged(
+ const Composition *, Segment *, TrackId /*tid*/)
{
- RG_DEBUG << "CompositionModelImpl::slotInstrumentParametersChanged()";
- const segmentcontainer& segments = m_composition.getSegments();
- segmentcontainer::const_iterator segEnd = segments.end();
-
- for (segmentcontainer::const_iterator i = segments.begin();
- i != segEnd; ++i) {
-
- const Segment* s = *i;
- TrackId trackId = s->getTrack();
- Track *track = getComposition().getTrackById(trackId);
-
- // We need to update the cache for audio segments, because the
- // instrument playback level is reflected in the audio
- // preview. And we need to update it for midi segments,
- // because the preview style differs depending on whether the
- // segment is on a percussion instrument or not
-
- if (track && track->getInstrument() == id) {
- removePreviewCache(s);
- emit needContentUpdate(computeSegmentRect(*s));
- }
- }
+ // TrackEditor::commandExecuted() already updates us. However, it
+ // shouldn't. This is the right thing to do.
+ emit needUpdate();
}
-void CompositionModelImpl::slotAudioFileFinalized(Segment* s)
+void CompositionModelImpl::segmentStartChanged(
+ const Composition *, Segment *, timeT)
{
- //RG_DEBUG << "CompositionModelImpl::slotAudioFileFinalized()";
- removePreviewCache(s);
+ // TrackEditor::commandExecuted() already updates us. However, it
+ // shouldn't. This is the right thing to do.
+ emit needUpdate();
}
-PixmapArray CompositionModelImpl::getAudioPreviewPixmap(const Segment* s)
+void CompositionModelImpl::segmentEndMarkerChanged(
+ const Composition *, Segment *, bool)
{
- getAudioPreviewData(s);
- return m_audioSegmentPreviewMap[s];
-}
+ Profiler profiler("CompositionModelImpl::segmentEndMarkerChanged()");
-void CompositionModelImpl::eventAdded(const Segment *s, Event *)
-{
- //RG_DEBUG << "CompositionModelImpl::eventAdded()";
- Profiler profiler("CompositionModelImpl::eventAdded()");
- removePreviewCache(s);
- emit needContentUpdate(computeSegmentRect(*s));
+ // ??? This routine gets hit really hard when recording.
+ // Just holding down a single note results in 50 calls
+ // per second.
+
+ // TrackEditor::commandExecuted() already updates us. However, it
+ // shouldn't. This is the right thing to do.
+ emit needUpdate();
}
-void CompositionModelImpl::eventRemoved(const Segment *s, Event *)
+void CompositionModelImpl::segmentRepeatChanged(
+ const Composition *, Segment *, bool)
{
- //RG_DEBUG << "CompositionModelImpl::eventRemoved";
- Profiler profiler("CompositionModelImpl::eventRemoved()");
- removePreviewCache(s);
- emit needContentUpdate(computeSegmentRect(*s));
+ // TrackEditor::commandExecuted() already updates us. However, it
+ // shouldn't. This is the right thing to do.
+ emit needUpdate();
}
-void CompositionModelImpl::AllEventsChanged(const Segment *s)
+void CompositionModelImpl::endMarkerTimeChanged(const Composition *, bool)
{
- Profiler profiler("CompositionModelImpl::AllEventsChanged()");
- removePreviewCache(s);
- emit needContentUpdate(computeSegmentRect(*s));
+ // The size of the composition has changed.
+
+ // TrackEditor::commandExecuted() already updates us. However, it
+ // shouldn't. This is the right thing to do.
+ emit needSizeUpdate();
}
-void CompositionModelImpl::appearanceChanged(const Segment *s)
+// --- Recording ----------------------------------------------------
+
+void CompositionModelImpl::addRecordingItem(ChangingSegmentPtr changingSegment)
{
- //RG_DEBUG << "CompositionModelImpl::appearanceChanged";
- clearInCache(s, true);
- emit needContentUpdate(computeSegmentRect(*s));
+ m_recordingSegments.insert(changingSegment->getSegment());
+
+ emit needUpdate();
}
-void CompositionModelImpl::endMarkerTimeChanged(const Segment *s, bool shorten)
+void CompositionModelImpl::pointerPosChanged(int x)
{
- Profiler profiler("CompositionModelImpl::endMarkerTimeChanged(Segment *, bool)");
- //RG_DEBUG << "CompositionModelImpl::endMarkerTimeChanged(" << shorten << ")";
- clearInCache(s, true);
- if (shorten) {
- emit needContentUpdate(); // no longer know former segment dimension
- } else {
- emit needContentUpdate(computeSegmentRect(*s));
+ // Update the end point for the recording segments.
+ m_pointerTime = m_grid.getRulerScale()->getTimeForX(x);
+
+ // For each recording segment
+ for (RecordingSegmentSet::iterator i = m_recordingSegments.begin();
+ i != m_recordingSegments.end();
+ ++i) {
+
+ QRect rect;
+ getSegmentQRect(**i, rect);
+ // Ask CompositionView to update.
+ emit needUpdate(rect);
}
}
-void CompositionModelImpl::makePreviewCache(const Segment *s)
+void CompositionModelImpl::clearRecordingItems()
{
- if (s->getType() == Segment::Internal) {
- makeNotationPreviewDataCache(s);
- } else {
- makeAudioPreviewDataCache(s);
- }
+ // For each recording segment
+ for (RecordingSegmentSet::iterator i = m_recordingSegments.begin();
+ i != m_recordingSegments.end();
+ ++i)
+ deleteCachedPreview(*i);
+
+ m_recordingSegments.clear();
+
+ emit needUpdate();
}
-void CompositionModelImpl::removePreviewCache(const Segment *s)
+bool CompositionModelImpl::isRecording(const Segment *s) const
{
- if (s->getType() == Segment::Internal) {
- RectList *rl = m_notationPreviewDataCache[s];
- delete rl;
- m_notationPreviewDataCache.erase(s);
- } else {
- AudioPreviewData *apd = m_audioPreviewDataCache[s];
- delete apd;
- m_audioPreviewDataCache.erase(s);
- m_audioSegmentPreviewMap.erase(s);
- }
+ return (m_recordingSegments.find(const_cast<Segment *>(s)) !=
+ m_recordingSegments.end());
+}
+void CompositionModelImpl::slotAudioFileFinalized(Segment *s)
+{
+ // Recording is finished, and the Audio preview is ready to display.
+ // Clear the old one out of the cache so the new one will appear.
+ // Works fine even without this line, but I suspect this is
+ // because of TrackEditor::commandExecuted(). If so, then this
+ // needs to be here.
+ deleteCachedPreview(s);
}
-void CompositionModelImpl::segmentAdded(const Composition *, Segment *s)
+// --- Changing -----------------------------------------------------
+
+void CompositionModelImpl::startChange(
+ ChangingSegmentPtr changingSegment, ChangeType changeType)
{
- RG_DEBUG << "CompositionModelImpl::segmentAdded: segment " << s << " on track " << s->getTrack() << ": calling setTrackHeights";
- setTrackHeights(s);
+ m_changeType = changeType;
- makePreviewCache(s);
- s->addObserver(this);
- emit needContentUpdate();
+ // If we weren't aware that this segment is changing
+ if (m_changingSegments.find(changingSegment) == m_changingSegments.end()) {
+ // Save the original rectangle for this segment
+ changingSegment->saveRect();
+
+ m_changingSegments.insert(changingSegment);
+ }
}
-void CompositionModelImpl::segmentRemoved(const Composition *, Segment *s)
+void CompositionModelImpl::startChangeSelection(ChangeType changeType)
{
- setTrackHeights();
+ // For each selected segment
+ for (SegmentSelection::iterator i = m_selectedSegments.begin();
+ i != m_selectedSegments.end();
+ ++i) {
- QRect r = computeSegmentRect(*s);
+ Segment &segment = **i;
- m_selectedSegments.erase(s);
+ // Make a ChangingSegment
+ SegmentRect segmentRect;
+ getSegmentRect(segment, segmentRect);
+ ChangingSegmentPtr changingSegment(
+ new ChangingSegment(segment, segmentRect));
- clearInCache(s, true);
- s->removeObserver(this);
- m_recordingSegments.erase(s); // this could be a recording segment
- emit needContentUpdate(r);
+ startChange(changingSegment, changeType);
+ }
}
-void CompositionModelImpl::segmentTrackChanged(const Composition *, Segment *s, TrackId tid)
+ChangingSegmentPtr CompositionModelImpl::findChangingSegment(
+ const Segment *segment)
{
- RG_DEBUG << "CompositionModelImpl::segmentTrackChanged: segment " << s << " on track " << tid << ", calling setTrackHeights";
-
- // we don't call setTrackHeights(s), because some of the tracks
- // above s may have changed height as well (if s was moved off one
- // of them)
- if (setTrackHeights()) {
- RG_DEBUG << "... changed, updating";
- emit needContentUpdate();
+ // For each changing segment
+ for (ChangingSegmentSet::const_iterator it = m_changingSegments.begin();
+ it != m_changingSegments.end();
+ ++it) {
+
+ ChangingSegmentPtr changingSegment = *it;
+
+ // If this one has the Segment we're looking for, return it.
+ if (changingSegment->getSegment() == segment)
+ return changingSegment;
}
+
+ // Not found.
+ return ChangingSegmentPtr();
}
-void CompositionModelImpl::segmentStartChanged(const Composition *, Segment *s, timeT)
+void CompositionModelImpl::endChange()
{
-// RG_DEBUG << "CompositionModelImpl::segmentStartChanged: segment " << s << " on track " << s->getTrack() << ": calling setTrackHeights";
- if (setTrackHeights(s)) emit needContentUpdate();
+ m_changingSegments.clear();
+
+ emit needUpdate();
}
-void CompositionModelImpl::segmentEndMarkerChanged(const Composition *, Segment *s, bool)
+bool CompositionModelImpl::isChanging(const Segment *s) const
{
- Profiler profiler("CompositionModelImpl::segmentEndMarkerChanged()");
-// RG_DEBUG << "CompositionModelImpl::segmentEndMarkerChanged: segment " << s << " on track " << s->getTrack() << ": calling setTrackHeights";
- if (setTrackHeights(s)) {
-// RG_DEBUG << "... changed, updating";
- emit needContentUpdate();
+ // For each ChangingSegment
+ for (ChangingSegmentSet::const_iterator i = m_changingSegments.begin();
+ i != m_changingSegments.end();
+ ++i) {
+
+ // If we've found it
+ if ((*i)->getSegment() == s)
+ return true;
}
-}
-void CompositionModelImpl::segmentRepeatChanged(const Composition *, Segment *s, bool)
-{
- clearInCache(s);
- setTrackHeights(s);
- emit needContentUpdate();
+ return false;
}
-void CompositionModelImpl::endMarkerTimeChanged(const Composition *, bool)
-{
- emit needSizeUpdate();
-}
+// --- Notation Previews --------------------------------------------
-void CompositionModelImpl::setSelectionRect(const QRect &rect)
+void CompositionModelImpl::eventAdded(const Segment *s, Event *)
{
- m_selectionRect = rect.normalized();
+ Profiler profiler("CompositionModelImpl::eventAdded()");
- //RG_DEBUG << "setSelectionRect: " << r << " -> " << m_selectionRect;
+ // ??? This routine gets hit really hard when recording.
+ // Just holding down a single note results in 50 calls
+ // per second.
- m_previousTmpSelectedSegments = m_tmpSelectedSegments;
- m_tmpSelectedSegments.clear();
+ deleteCachedPreview(s);
- const segmentcontainer& segments = m_composition.getSegments();
- segmentcontainer::iterator segEnd = segments.end();
+ QRect rect;
+ getSegmentQRect(*s, rect);
+ emit needUpdate(rect);
+}
- QRect updateRect = m_selectionRect;
+void CompositionModelImpl::eventRemoved(const Segment *s, Event *)
+{
+ Profiler profiler("CompositionModelImpl::eventRemoved()");
- // For each segment in the composition
- for (segmentcontainer::iterator i = segments.begin();
- i != segEnd; ++i) {
-
- CompositionRect segmentRect = computeSegmentRect(**i);
+ // ??? This routine gets hit really hard when recording.
+ // Just holding down a single note results in 50 calls
+ // per second.
- if (segmentRect.intersects(m_selectionRect)) {
- m_tmpSelectedSegments.insert(*i);
- updateRect |= segmentRect;
- }
- }
+ deleteCachedPreview(s);
- updateRect = updateRect.normalized();
+ QRect rect;
+ getSegmentQRect(*s, rect);
+ emit needUpdate(rect);
+}
- if (!updateRect.isNull() && !m_previousSelectionUpdateRect.isNull()) {
+void CompositionModelImpl::allEventsChanged(const Segment *s)
+{
+ // This is called by Segment::setStartTime(timeT t). And this
+ // is the only handler in the entire system.
- if (m_tmpSelectedSegments != m_previousTmpSelectedSegments)
- emit needContentUpdate(updateRect | m_previousSelectionUpdateRect);
+ deleteCachedPreview(s);
- emit needArtifactsUpdate();
- }
+ QRect rect;
+ getSegmentQRect(*s, rect);
+ emit needUpdate(rect);
+}
- m_previousSelectionUpdateRect = updateRect;
+void CompositionModelImpl::appearanceChanged(const Segment *s)
+{
+ // Called by Segment::setLabel() and Segment::setColourIndex().
+
+ // Preview gets regenerated anyway.
+ //deleteCachedPreview(s);
+
+ QRect rect;
+ getSegmentQRect(*s, rect);
+ emit needUpdate(rect);
}
-void CompositionModelImpl::finalizeSelectionRect()
+void CompositionModelImpl::endMarkerTimeChanged(const Segment *s, bool shorten)
{
- const segmentcontainer &segments = m_composition.getSegments();
- segmentcontainer::const_iterator segEnd = segments.end();
+ Profiler profiler("CompositionModelImpl::endMarkerTimeChanged(Segment *, bool)");
- // For each segment in the composition
- for (segmentcontainer::const_iterator i = segments.begin();
- i != segEnd; ++i) {
+ // ??? This routine gets hit really hard when recording.
+ // Just holding down a single note results in 50 calls
+ // per second.
- CompositionRect segmentRect = computeSegmentRect(**i);
+ // Preview gets regenerated anyway.
+ //deleteCachedPreview(s);
- if (segmentRect.intersects(m_selectionRect)) {
- setSelected(*i);
- }
+ if (shorten) {
+ emit needUpdate(); // no longer know former segment dimension
+ } else {
+ QRect rect;
+ getSegmentQRect(*s, rect);
+ emit needUpdate(rect);
}
-
- // Clear the selection rect state for the next time.
- m_previousSelectionUpdateRect = m_selectionRect = QRect();
- m_tmpSelectedSegments.clear();
}
-QRect CompositionModelImpl::getSelectionContentsRect()
+void CompositionModelImpl::makeNotationPreviewRange(
+ QPoint basePoint, const Segment *segment,
+ const QRect &clipRect, NotationPreviewRanges *ranges)
{
- QRect selectionRect;
+ Profiler profiler("CompositionModelImpl::makeNotationPreviewRange");
- // For each selected segment, accumulate the selection rect
- for (SegmentSelection::iterator i = m_selectedSegments.begin();
- i != m_selectedSegments.end(); ++i) {
+ if (!ranges)
+ return;
- CompositionRect sr = computeSegmentRect(**i);
- selectionRect |= sr;
- }
+ const NotationPreview *notationPreview = getNotationPreview(segment);
- return selectionRect;
-}
+ if (notationPreview->empty())
+ return;
-void CompositionModelImpl::addRecordingItem(CompositionItemPtr item)
-{
- m_recordingSegments.insert(item->getSegment());
+ NotationPreview::const_iterator npIter = notationPreview->begin();
- emit needContentUpdate();
+ // Search for the first event that is likely to be visible.
+ // ??? Performance: LINEAR SEARCH. While recording, this uses more
+ // and more CPU.
+ while (npIter != notationPreview->end() &&
+ npIter->right() < clipRect.left())
+ ++npIter;
- //RG_DEBUG << "CompositionModelImpl::addRecordingItem: now have "
- // << m_recordingSegments.size() << " recording items";
-}
+ // If no preview rects were within the clipRect, bail.
+ if (npIter == notationPreview->end())
+ return;
-#if 0
-void CompositionModelImpl::removeRecordingItem(CompositionItemPtr item)
-{
- Segment* s = CompositionItemHelper::getSegment(item);
+ NotationPreviewRange interval;
+ interval.begin = npIter;
- m_recordingSegments.erase(s);
- clearInCache(s, true);
+ // Compute the rightmost x coord
+ const int segmentEndX = lround(m_grid.getRulerScale()->getXForTime(
+ segment->getEndMarkerTime()));
+ const int right = std::min(clipRect.right(), segmentEndX);
+
+ // Search sequentially for the last visible preview rect.
+ while (npIter != notationPreview->end() && npIter->left() < right)
+ ++npIter;
+
+ interval.end = npIter;
- emit needContentUpdate();
+ interval.segmentTop = basePoint.y();
+ interval.moveXOffset = 0;
+ interval.color = segment->getPreviewColour();
- RG_DEBUG << "CompositionModelImpl::removeRecordingItem: now have "
- << m_recordingSegments.size() << " recording items";
+ // Add the interval to the caller's interval list.
+ ranges->push_back(interval);
}
-#endif
-void CompositionModelImpl::clearRecordingItems()
+void CompositionModelImpl::makeNotationPreviewRangeCS(
+ QPoint basePoint, const Segment *segment,
+ const QRect ¤tRect, const QRect &clipRect,
+ NotationPreviewRanges *ranges)
{
- //RG_DEBUG << "CompositionModelImpl::clearRecordingItem";
+ if (!ranges)
+ return;
- // For each recording segment, remove it from the caches.
- for (RecordingSegmentSet::iterator i = m_recordingSegments.begin();
- i != m_recordingSegments.end(); ++i)
- clearInCache(*i, true);
+ const NotationPreview *notationPreview = getNotationPreview(segment);
- m_recordingSegments.clear();
+ if (notationPreview->empty())
+ return;
- emit needContentUpdate();
-}
+ QRect originalRect;
+ getSegmentQRect(*segment, originalRect);
-bool CompositionModelImpl::isMoving(const Segment* sm) const
-{
- ItemContainer::const_iterator movEnd = m_changingItems.end();
+ int moveXOffset = 0;
+ if (m_changeType == ChangeMove)
+ moveXOffset = basePoint.x() - originalRect.x();
- for (ItemContainer::const_iterator i = m_changingItems.begin(); i != movEnd; ++i) {
- const CompositionItem* ci = *i;
- const Segment* s = ci->getSegment();
- if (sm == s)
- return true;
+ int left;
+
+ if (m_changeType == ChangeResizeFromStart) {
+ left = currentRect.left();
+ } else {
+ left = originalRect.left();
}
- return false;
-}
+ left = std::max(clipRect.left() - moveXOffset, left);
-bool CompositionModelImpl::isRecording(const Segment* s) const
-{
- return m_recordingSegments.find(const_cast<Segment*>(s)) != m_recordingSegments.end();
-}
+ NotationPreview::const_iterator npIter = notationPreview->begin();
-CompositionModelImpl::ItemContainer CompositionModelImpl::getItemsAt(const QPoint& point)
-{
- //RG_DEBUG << "CompositionModelImpl::getItemsAt()";
+ // Search for the first event that is likely to be visible.
+ while (npIter != notationPreview->end() &&
+ npIter->right() < left)
+ ++npIter;
- ItemContainer res;
+ // Nothing found, bail.
+ if (npIter == notationPreview->end())
+ return;
- const segmentcontainer& segments = m_composition.getSegments();
+ NotationPreviewRange interval;
+ interval.begin = npIter;
- for (segmentcontainer::const_iterator i = segments.begin();
- i != segments.end(); ++i) {
+ // Compute the rightmost x coord
+ int right = (m_changeType == ChangeMove) ?
+ originalRect.right() :
+ currentRect.right();
- const Segment* s = *i;
+ right = std::min(clipRect.right() - moveXOffset, right);
- CompositionRect sr = computeSegmentRect(*s);
- if (sr.contains(point)) {
- //RG_DEBUG << "CompositionModelImpl::getItemsAt() adding " << sr << " for segment " << s;
- CompositionItemPtr item(new CompositionItem(*const_cast<Segment *>(s),
- sr));
- unsigned int z = computeZForSegment(s);
- //RG_DEBUG << "CompositionModelImpl::getItemsAt() z = " << z;
- item->setZ(z);
- res.insert(item);
- } else {
- //RG_DEBUG << "CompositionModelImpl::getItemsAt() skiping " << sr;
- }
+ // Search sequentially for the last visible preview rect.
+ while (npIter != notationPreview->end() && npIter->left() < right)
+ ++npIter;
- }
-
- if (res.size() == 1) { // only one segment under click point
- Segment* s = CompositionItemHelper::getSegment(*(res.begin()));
- m_segmentOrderer.segmentClicked(s);
- }
+ interval.end = npIter;
+ interval.segmentTop = basePoint.y();
+ interval.moveXOffset = moveXOffset;
+ interval.color = segment->getPreviewColour();
- return res;
+ ranges->push_back(interval);
}
-void CompositionModelImpl::pointerPosChanged(int x)
+const CompositionModelImpl::NotationPreview *
+CompositionModelImpl::getNotationPreview(const Segment *segment)
{
- //RG_DEBUG << "CompositionModelImpl::pointerPosChanged() begin";
+ // Try the cache.
+ NotationPreviewCache::const_iterator previewIter =
+ m_notationPreviewCache.find(segment);
- // Update the end point for the recording segments.
- m_pointerTimePos = m_grid.getRulerScale()->getTimeForX(x);
+ // If it was in the cache, return it.
+ if (previewIter != m_notationPreviewCache.end())
+ return previewIter->second;
- // For each recording segment
- for (RecordingSegmentSet::iterator i = m_recordingSegments.begin();
- i != m_recordingSegments.end(); ++i) {
- // Ask CompositionView to update.
- emit needContentUpdate(computeSegmentRect(**i));
- }
+ NotationPreview *notationPreview = makeNotationPreview(segment);
- //RG_DEBUG << "CompositionModelImpl::pointerPosChanged() end";
-}
+ m_notationPreviewCache[segment] = notationPreview;
-void CompositionModelImpl::setSelected(CompositionItemPtr item, bool selected)
-{
- if (item) {
- // Delegate to the version that takes a segment
- setSelected(item->getSegment(), selected);
- }
+ return notationPreview;
}
-#if 0
-void CompositionModelImpl::setSelected(const ItemContainer &items)
+CompositionModelImpl::NotationPreview *
+CompositionModelImpl::makeNotationPreview(
+ const Segment *segment) const
{
- // For each CompositionItem
- for (ItemContainer::const_iterator i = items.begin(); i != items.end(); ++i) {
- setSelected(*i);
- }
-}
-#endif
+ Profiler profiler("CompositionModelImpl::makeNotationPreview()");
-void CompositionModelImpl::setSelected(Segment *segment, bool selected)
-{
- if (!segment) {
- RG_DEBUG << "WARNING : CompositionModelImpl::setSelected() - segment is NULL";
- return;
- }
+ // ??? This routine is called 50 times a second when recording and
+ // a single key is held down.
+ // ??? This routine is one possible source of the increasing CPU
+ // usage while recording. For the recording case, the obvious
+ // optimization would be to add the new notes to the existing
+ // cached preview rather than regenerating the preview.
- //RG_DEBUG << "CompositionModelImpl::setSelected " << segment << " - " << selected;
+ NotationPreview *notationPreview = new NotationPreview;
- // Update m_selectedSegments
- if (selected) {
- if (!isSelected(segment))
- m_selectedSegments.insert(segment);
- } else {
- SegmentSelection::iterator i = m_selectedSegments.find(segment);
- if (i != m_selectedSegments.end())
- m_selectedSegments.erase(i);
+ int segStartX = lround(
+ m_grid.getRulerScale()->getXForTime(segment->getStartTime()));
+
+ bool isPercussion = false;
+ Track *track = m_composition.getTrackById(segment->getTrack());
+ if (track) {
+ InstrumentId iid = track->getInstrument();
+ Instrument *instrument = m_studio.getInstrumentById(iid);
+ if (instrument && instrument->isPercussion())
+ isPercussion = true;
}
- emit needContentUpdate();
-}
+ // For each event in the segment
+ for (Segment::const_iterator i = segment->begin();
+ i != segment->end();
+ ++i) {
-void CompositionModelImpl::signalSelection()
-{
- //RG_DEBUG << "CompositionModelImpl::signalSelection()";
- emit selectedSegments(getSelectedSegments());
-}
+ Event *event = *i;
-void CompositionModelImpl::signalContentChange()
-{
- //RG_DEBUG << "CompositionModelImpl::signalContentChange";
- emit needContentUpdate();
-}
+ // If this isn't a note, try the next event.
+ if (!event->isa(Note::EventType))
+ continue;
-void CompositionModelImpl::clearSelected()
-{
- //RG_DEBUG << "CompositionModelImpl::clearSelected";
+ long pitch = 0;
+ // Get the pitch. If there is no pitch property, try the next event.
+ if (!event->get<Int>(BaseProperties::PITCH, pitch))
+ continue;
- m_selectedSegments.clear();
- emit needContentUpdate();
-}
+ const timeT eventStart = event->getAbsoluteTime();
+ const timeT eventEnd = eventStart + event->getDuration();
-bool CompositionModelImpl::isSelected(CompositionItemPtr item) const
-{
- return item ? isSelected(item->getSegment()) : false;
-}
+ int x = lround(
+ m_grid.getRulerScale()->getXForTime(eventStart));
+ int width = lround(
+ m_grid.getRulerScale()->getWidthForDuration(
+ eventStart, eventEnd - eventStart));
-bool CompositionModelImpl::isSelected(const Segment *s) const
-{
- return m_selectedSegments.find(const_cast<Segment *>(s)) != m_selectedSegments.end();
-}
+ // If the event starts on or before the segment border
+ if (x <= segStartX) {
+ // Move the left edge to the right by 1
+ ++x;
+ // But leave the right edge alone.
+ if (width > 1)
+ --width;
+ }
-bool CompositionModelImpl::isTmpSelected(const Segment *s) const
-{
- return m_tmpSelectedSegments.find(const_cast<Segment *>(s)) != m_tmpSelectedSegments.end();
-}
+ // Make sure we draw something.
+ if (width < 1)
+ width = 1;
-bool CompositionModelImpl::wasTmpSelected(const Segment *s) const
-{
- return m_previousTmpSelectedSegments.find(const_cast<Segment *>(s)) != m_previousTmpSelectedSegments.end();
-}
+ const int y0 = 0;
+ const int y1 = m_grid.getYSnap();
+ int y = lround(y1 + ((y0 - y1) * (pitch - 16)) / 96.0);
-void CompositionModelImpl::startChange(CompositionItemPtr item, ChangeType change)
-{
- m_changeType = change;
+ int height = 1;
- // If we already know this segment is changing
- if (m_changingItems.find(item) != m_changingItems.end()) {
- //RG_DEBUG << "CompositionModelImpl::startChange : item already in";
+ // On a percussion track...
+ if (isPercussion) {
+ height = 2;
+ // Make events appear as dots instead of lines.
+ if (width > 2)
+ width = 2;
+ }
- // Put this one on the garbage collection list for later cleanup
- // by endChange().
- m_itemGC.push_back(item);
- } else {
- // Save the original rectangle for this segment
- item->saveRect();
+ if (y < y0)
+ y = y0;
+ if (y > y1 - height + 1)
+ y = y1 - height + 1;
+
+ QRect r(x, y, width, height);
- m_changingItems.insert(item);
+ notationPreview->push_back(r);
}
+
+ return notationPreview;
}
-void CompositionModelImpl::startChangeSelection(ChangeType change)
+// --- Audio Previews -----------------------------------------------
+
+void CompositionModelImpl::setAudioPeaksThread(AudioPeaksThread *thread)
{
- // For each selected segment
- for (SegmentSelection::iterator i = m_selectedSegments.begin();
- i != m_selectedSegments.end(); ++i) {
- CompositionItemPtr item =
- new CompositionItem(**i, computeSegmentRect(**i));
- startChange(item, change);
+ // For each AudioPeaksGenerator
+ while (!m_audioPeaksGeneratorMap.empty()) {
+ // Delete it
+ delete m_audioPeaksGeneratorMap.begin()->second;
+ m_audioPeaksGeneratorMap.erase(m_audioPeaksGeneratorMap.begin());
}
+
+ m_audioPeaksThread = thread;
}
-void CompositionModelImpl::endChange()
+void CompositionModelImpl::makeAudioPreview(
+ const Segment *segment, const SegmentRect &segmentRect,
+ AudioPreviews *audioPreviews)
{
- //RG_DEBUG << "CompositionModelImpl::endChange";
+ Profiler profiler("CompositionModelImpl::makeAudioPreview");
- // For each segment that was changing
- for (ItemContainer::const_iterator i = m_changingItems.begin();
- i != m_changingItems.end(); ++i) {
- delete *i;
- }
+ if (!audioPreviews)
+ return;
- m_changingItems.clear();
+ // If needed, begin the asynchronous process of generating an
+ // audio preview.
+ updateAudioPeaksCache(segment);
- // For each segment in the garbage collection list
- for (ItemGC::iterator i = m_itemGC.begin();
- i != m_itemGC.end(); ++i) {
- delete *i;
- }
+ // ??? COPY. This copies a vector of QImage objects. That seems
+ // wasteful. Some sort of pointer approach should be better.
+ // Would it be ok for AudioPreview to just have a pointer
+ // into the m_audioPreviewImageCache? Perhaps a QSharedPointer
+ // for safety? Are the AudioPreview objects ephemeral enough?
+ AudioPreview audioPreview(
+ m_audioPreviewImageCache[segment], segmentRect.rect);
- m_itemGC.clear();
+ if (m_changeType == ChangeResizeFromStart) {
+ int originalRectX =
+ lround(m_grid.getRulerScale()->getXForTime(
+ segment->getStartTime()));
- emit needContentUpdate();
-}
+ audioPreview.resizeOffset = segmentRect.rect.x() - originalRectX;
+ }
-void CompositionModelImpl::setCompositionLength(int width)
-{
- m_composition.setEndMarker(m_grid.snapX(width));
+ audioPreviews->push_back(audioPreview);
}
-int CompositionModelImpl::getCompositionLength()
+void CompositionModelImpl::updateAudioPeaksCache(const Segment *segment)
{
- timeT endMarker = m_composition.getEndMarker();
- return static_cast<int>(nearbyint(
- m_grid.getRulerScale()->getWidthForDuration(0, endMarker)));
-}
+ Profiler profiler("CompositionModelImpl::updateAudioPeaksCache");
-unsigned int CompositionModelImpl::getCompositionHeight()
-{
- return static_cast<unsigned int>(
- m_grid.getYBinCoordinate(m_composition.getNbTracks()));
-}
+ // We must use find() because C++ makes no guarantee that a new
+ // map element is zeroed out. IOW, m_audioPeaksCache[segment] may be
+ // undefined.
+ AudioPeaksCache::const_iterator audioPeaksIter =
+ m_audioPeaksCache.find(segment);
-timeT CompositionModelImpl::getRepeatTimeAt(const QPoint& p, CompositionItemPtr cItem)
-{
- // timeT timeAtClick = m_grid.getRulerScale()->getTimeForX(p.x());
+ // If it's already in the cache, bail.
+ if (audioPeaksIter != m_audioPeaksCache.end())
+ return;
- CompositionItem* itemImpl = cItem;
+ // Create an empty one and put it in the cache.
+ AudioPeaks *audioPeaks = new AudioPeaks();
+ m_audioPeaksCache[segment] = audioPeaks;
- const Segment* s = itemImpl->getSegment();
+ if (!m_audioPeaksThread) {
+ RG_DEBUG << "updateAudioPeaksCache() - No audio preview thread set.";
+ return;
+ }
+
+ SegmentRect segmentRect;
+ // Use getSegmentRect() since we need the baseWidth.
+ getSegmentRect(*segment, segmentRect);
+ // Go with the baseWidth instead of the full repeating width.
+ segmentRect.rect.setWidth(segmentRect.baseWidth);
+ segmentRect.rect.moveTopLeft(QPoint(0, 0));
+
+ // If we don't already have an audio peaks generator for this segment
+ if (m_audioPeaksGeneratorMap.find(segment) ==
+ m_audioPeaksGeneratorMap.end()) {
- timeT startTime = s->getStartTime();
- timeT endTime = s->getEndMarkerTime();
- timeT repeatInterval = endTime - startTime;
+ AudioPeaksGenerator *generator =
+ new AudioPeaksGenerator(
+ *m_audioPeaksThread, m_composition,
+ segment, segmentRect.rect, this);
- int rWidth = int(nearbyint(m_grid.getRulerScale()->getXForTime(repeatInterval)));
+ connect(generator, SIGNAL(audioPeaksComplete(AudioPeaksGenerator*)),
+ this, SLOT(slotAudioPeaksComplete(AudioPeaksGenerator*)));
- int count = (p.x() - int(itemImpl->rect().x())) / rWidth;
- RG_DEBUG << "CompositionModelImpl::getRepeatTimeAt() : count = " << count;
+ m_audioPeaksGeneratorMap[segment] = generator;
+
+ } else { // We have a peaks gen for this segment.
+
+ // Adjust the size in case the segment was resized.
+ m_audioPeaksGeneratorMap[segment]->setDisplayExtent(segmentRect.rect);
+ }
- return count != 0 ? startTime + (count * (s->getEndMarkerTime() - s->getStartTime())) : 0;
+ // Queue a request for async generation of the peaks.
+ m_audioPeaksGeneratorMap[segment]->update();
}
-bool CompositionModelImpl::setTrackHeights(Segment *s)
+void CompositionModelImpl::slotAudioPeaksComplete(
+ AudioPeaksGenerator *generator)
{
- bool heightsChanged = false;
+ // Find the entry in the cache that we need to fill in with the results.
+ AudioPeaksCache::const_iterator audioPeaksIter =
+ m_audioPeaksCache.find(generator->getSegment());
-// RG_DEBUG << "CompositionModelImpl::setTrackHeights";
+ // If there's no place to put the results, bail.
+ if (audioPeaksIter == m_audioPeaksCache.end())
+ return;
- for (Composition::trackcontainer::const_iterator i =
- m_composition.getTracks().begin();
- i != m_composition.getTracks().end(); ++i) {
+ AudioPeaks *audioPeaks = audioPeaksIter->second;
+ if (!audioPeaks)
+ return;
- if (s && i->first != s->getTrack()) continue;
-
- int max = m_composition.getMaxContemporaneousSegmentsOnTrack(i->first);
- if (max == 0) max = 1;
+ unsigned channels = 0;
+ const std::vector<float> &values =
+ generator->getComputedValues(channels);
-// RG_DEBUG << "for track " << i->first << ": height = " << max << ", old height = " << m_trackHeights[i->first];
+ // If we didn't get any peaks, bail.
+ if (channels == 0)
+ return;
- if (max != m_trackHeights[i->first]) {
- heightsChanged = true;
- m_trackHeights[i->first] = max;
- }
+ audioPeaks->channels = channels;
+ // Copy the peaks to the cache.
+ audioPeaks->values = values;
- m_grid.setBinHeightMultiple(i->second->getPosition(), max);
- }
+ AudioPreviewPainter previewPainter(
+ *this, audioPeaks, m_composition, generator->getSegment());
+ // Convert audio peaks to an image.
+ previewPainter.paintPreviewImage();
- if (heightsChanged) {
-// RG_DEBUG << "CompositionModelImpl::setTrackHeights: heights have changed";
- for (segmentcontainer::iterator i = m_composition.begin();
- i != m_composition.end(); ++i) {
- computeSegmentRect(**i);
- }
- }
+ // Cache the image.
+ m_audioPreviewImageCache[generator->getSegment()] =
+ previewPainter.getPreviewImage();
- return heightsChanged;
+ if (!previewPainter.getSegmentRect().rect.isEmpty())
+ emit needUpdate(previewPainter.getSegmentRect().rect);
}
-QPoint CompositionModelImpl::computeSegmentOrigin(const Segment& s)
+// --- Previews -----------------------------------------------------
+
+void CompositionModelImpl::slotInstrumentChanged(Instrument *instrument)
{
- Profiler profiler("CompositionModelImpl::computeSegmentOrigin");
+ //RG_DEBUG << "slotInstrumentChanged()";
- int trackPosition = m_composition.getTrackPositionById(s.getTrack());
- timeT startTime = s.getStartTime();
+ const SegmentMultiSet &segments = m_composition.getSegments();
- QPoint res;
+ // For each Segment in the Composition
+ for (SegmentMultiSet::const_iterator i = segments.begin();
+ i != segments.end();
+ ++i) {
- res.setX(int(nearbyint(m_grid.getRulerScale()->getXForTime(startTime))));
+ const Segment *segment = *i;
- res.setY(m_grid.getYBinCoordinate(trackPosition) +
- m_composition.getSegmentVoiceIndex(&s) *
- m_grid.getYSnap() + 1);
+ const TrackId trackId = segment->getTrack();
+ const Track *track = getComposition().getTrackById(trackId);
- return res;
-}
+ // If this is the Instrument that changed
+ if (track && track->getInstrument() == instrument->getId()) {
+ // We need to update the cache for audio segments, because the
+ // instrument playback level is reflected in the audio
+ // preview. And we need to update it for midi segments,
+ // because the preview style differs depending on whether the
+ // segment is on a percussion instrument or not. (On a
+ // percussion Instrument, event duration is ignored and
+ // all notes appear short. Toggle the Percussion checkbox
+ // to test.)
+ deleteCachedPreview(segment);
-bool CompositionModelImpl::isCachedRectCurrent(const Segment& s, const CompositionRect& r, QPoint cachedSegmentOrigin, timeT cachedSegmentEndTime)
-{
- return s.isRepeating() == r.isRepeating() &&
- ((cachedSegmentOrigin.x() != r.x() && s.getEndMarkerTime() != cachedSegmentEndTime) ||
- (cachedSegmentOrigin.x() == r.x() && s.getEndMarkerTime() == cachedSegmentEndTime));
+ QRect rect;
+ getSegmentQRect(*segment, rect);
+ emit needUpdate(rect);
+ }
+ }
}
-void CompositionModelImpl::clearInCache(const Segment* s, bool clearPreview)
+void CompositionModelImpl::deleteCachedPreview(const Segment *segment)
{
- if (s) {
- m_segmentRectMap.erase(s);
- m_segmentEndTimeMap.erase(s);
- if (clearPreview)
- removePreviewCache(s);
- } else { // clear the whole cache
- m_segmentRectMap.clear();
- m_segmentEndTimeMap.clear();
- if (clearPreview)
- clearPreviewCache();
+ if (!segment)
+ return;
+
+ // MIDI
+ if (segment->getType() == Segment::Internal) {
+ NotationPreviewCache::iterator i = m_notationPreviewCache.find(segment);
+ if (i != m_notationPreviewCache.end()) {
+ delete i->second;
+ m_notationPreviewCache.erase(i);
+ }
+ } else { // Audio
+ AudioPeaksCache::iterator i = m_audioPeaksCache.find(segment);
+ if (i != m_audioPeaksCache.end()) {
+ delete i->second;
+ m_audioPeaksCache.erase(i);
+ }
+ m_audioPreviewImageCache.erase(segment);
}
}
-void CompositionModelImpl::putInCache(const Segment*s, const CompositionRect& cr)
+void CompositionModelImpl::deleteCachedPreviews()
{
- m_segmentRectMap[s] = cr;
- m_segmentEndTimeMap[s] = s->getEndMarkerTime();
-}
+ // Notation Previews
-CompositionRect CompositionModelImpl::computeSegmentRect(const Segment& s, bool /*computeZ*/)
-{
- Profiler profiler("CompositionModelImpl::computeSegmentRect");
-
- QPoint origin = computeSegmentOrigin(s);
-
- bool isRecordingSegment = isRecording(&s);
-
- if (!isRecordingSegment) {
- timeT endTime = 0;
-
- CompositionRect cachedCR = getFromCache(&s, endTime);
- // don't cache repeating segments - it's just hopeless, because the segment's rect may have to be recomputed
- // in other cases than just when the segment itself is moved,
- // for instance if another segment is moved over it
- if (!s.isRepeating() && cachedCR.isValid() && isCachedRectCurrent(s, cachedCR, origin, endTime)) {
- //RG_DEBUG << "CompositionModelImpl::computeSegmentRect() : using cache for seg "
- // << &s << " - cached rect repeating = " << cachedCR.isRepeating() << " - base width = "
- // << cachedCR.getBaseWidth();
-
- bool xChanged = origin.x() != cachedCR.x();
- bool yChanged = origin.y() != cachedCR.y();
-
- cachedCR.moveTopLeft(origin);
-
- if (s.isRepeating() && (xChanged || yChanged)) { // update repeat marks
-
- // this doesn't work in the general case (if there's another segment on the same track for instance),
- // it's better to simply recompute all the marks
- // CompositionRect::repeatmarks repeatMarks = cachedCR.getRepeatMarks();
- // for(size_t i = 0; i < repeatMarks.size(); ++i) {
- // repeatMarks[i] += deltaX;
- // }
- // cachedCR.setRepeatMarks(repeatMarks);
- computeRepeatMarks(cachedCR, &s);
- }
- putInCache(&s, cachedCR);
- return cachedCR;
- }
+ for (NotationPreviewCache::iterator i = m_notationPreviewCache.begin();
+ i != m_notationPreviewCache.end(); ++i) {
+ delete i->second;
}
+ m_notationPreviewCache.clear();
- timeT startTime = s.getStartTime();
- timeT endTime = isRecordingSegment ? m_pointerTimePos /*s.getEndTime()*/ : s.getEndMarkerTime();
+ // Stop Audio Peaks Generators
+ for (AudioPeaksGeneratorMap::iterator i = m_audioPeaksGeneratorMap.begin();
+ i != m_audioPeaksGeneratorMap.end(); ++i) {
+ i->second->cancel();
+ }
- int h = m_grid.getYSnap() - 2;
- int w;
+ // Audio Peaks and Previews
- if (s.isRepeating()) {
-// timeT repeatStart = endTime;
- timeT repeatEnd = s.getRepeatEndTime();
- w = int(nearbyint(m_grid.getRulerScale()->getWidthForDuration(startTime,
- repeatEnd - startTime)));
- //RG_DEBUG << "CompositionModelImpl::computeSegmentRect : s is repeating - repeatStart = "
- // << repeatStart << " - repeatEnd : " << repeatEnd
- // << " w = " << w;
- } else {
- w = int(nearbyint(m_grid.getRulerScale()->getWidthForDuration(startTime, endTime - startTime)));
- //RG_DEBUG << "CompositionModelImpl::computeSegmentRect : s is NOT repeating"
- // << " w = " << w << " (x for time at start is " << m_grid.getRulerScale()->getXForTime(startTime) << ", end is " << m_grid.getRulerScale()->getXForTime(endTime) << ")";
+ for (AudioPeaksCache::iterator i = m_audioPeaksCache.begin();
+ i != m_audioPeaksCache.end(); ++i) {
+ delete i->second;
}
+ m_audioPeaksCache.clear();
+ m_audioPreviewImageCache.clear();
+}
+// --- Selection ----------------------------------------------------
- //RG_DEBUG << "CompositionModelImpl::computeSegmentRect: x " << origin.x() << ", y " << origin.y() << " startTime " << startTime << ", endTime " << endTime << ", w " << w << ", h " << h;
-
- CompositionRect cr(origin, QSize(w, h));
- QString label = strtoqstr(s.getLabel());
- if (s.getType() == Segment::Audio) {
- static QRegExp re1("( *\\([^)]*\\))*$"); // (inserted) (copied) (etc)
- static QRegExp re2("\\.[^.]+$"); // filename suffix
- label.replace(re1, "").replace(re2, "");
+void CompositionModelImpl::setSelected(Segment *segment, bool selected)
+{
+ if (!segment) {
+ RG_DEBUG << "setSelected(): WARNING - segment is NULL";
+ return;
}
- cr.setLabel(label);
- if (s.isRepeating()) {
- computeRepeatMarks(cr, &s);
+ // Update m_selectedSegments
+
+ if (selected) {
+ if (!isSelected(segment))
+ m_selectedSegments.insert(segment);
} else {
- cr.setBaseWidth(cr.width());
+ SegmentSelection::iterator i = m_selectedSegments.find(segment);
+ if (i != m_selectedSegments.end())
+ m_selectedSegments.erase(i);
}
- putInCache(&s, cr);
-
- return cr;
+ emit needUpdate();
}
-unsigned int CompositionModelImpl::computeZForSegment(const Rosegarden::Segment* s)
+void CompositionModelImpl::selectSegments(const SegmentSelection &segments)
{
- return m_segmentOrderer.getZForSegment(s);
+ m_selectedSegments = segments;
+ emit needUpdate();
}
-const CompositionRect& CompositionModelImpl::getFromCache(const Rosegarden::Segment* s, timeT& endTime)
+void CompositionModelImpl::clearSelected()
{
- endTime = m_segmentEndTimeMap[s];
- return m_segmentRectMap[s];
+ m_selectedSegments.clear();
+ emit needUpdate();
}
-const CompositionModelImpl::RectContainer &
-CompositionModelImpl::getSegmentRects(
- const QRect &clipRect,
- RectRanges *notationPreview,
- AudioPreviewDrawData *audioPreview)
+void CompositionModelImpl::setSelectionRect(const QRect &rect)
{
- Profiler profiler("CompositionModelImpl::getSegmentRects()");
+ m_selectionRect = rect.normalized();
- // Clear the container we'll be returning.
- m_segmentRects.clear();
+ m_previousTmpSelectedSegments = m_tmpSelectedSegments;
+ m_tmpSelectedSegments.clear();
- //RG_DEBUG << "CompositionModelImpl::getSegmentRects(): ruler scale is "
- // << (dynamic_cast<SimpleRulerScale *>(m_grid.getRulerScale()))->getUnitsPerPixel();
+ const SegmentMultiSet &segments = m_composition.getSegments();
- const segmentcontainer &segments = m_composition.getSegments();
- segmentcontainer::const_iterator segmentsEnd = segments.end();
+ QRect updateRect = m_selectionRect;
// For each segment in the composition
- for (segmentcontainer::const_iterator i = segments.begin();
- i != segmentsEnd; ++i) {
+ for (SegmentMultiSet::iterator i = segments.begin();
+ i != segments.end();
+ ++i) {
- //RG_DEBUG << "CompositionModelImpl::getSegmentRects(): Composition contains segment " << *i << " (" << (*i)->getStartTime() << "->" << (*i)->getEndTime() << ")";
-
- const Segment *s = *i;
+ Segment *segment = *i;
- // Moving segments are handled in the next for loop.
- if (isMoving(s))
- continue;
+ QRect segmentRect;
+ getSegmentQRect(*segment, segmentRect);
- CompositionRect segmentRect = computeSegmentRect(*s);
- //RG_DEBUG << "CompositionModelImpl::getSegmentRects(): seg rect = " << sr;
-
- if (segmentRect.intersects(clipRect)) {
-// RG_DEBUG << "CompositionModelImpl::getSegmentRects(): segment " << s
-// << " selected : " << isSelected(s) << " - tmpSelected : " << isTmpSelected(s);
-
- if (isSelected(s) || isTmpSelected(s) || segmentRect.intersects(m_selectionRect)) {
- segmentRect.setSelected(true);
- }
-
- if (wasTmpSelected(s) != isTmpSelected(s))
- segmentRect.setNeedsFullUpdate(true);
-
- bool isAudio = (s && s->getType() == Segment::Audio);
-
- if (!isRecording(s)) {
- QColor brushColor = GUIPalette::convertColour(m_composition.
- getSegmentColourMap().getColourByIndex(s->getColourIndex()));
- Qt::BrushStyle brushPattern =
- s->isTrulyLinked() ? Qt::Dense2Pattern : Qt::SolidPattern;
- segmentRect.setBrush(QBrush(brushColor, brushPattern));
- segmentRect.setPen(CompositionColourCache::getInstance()->SegmentBorder);
- } else {
- // border is the same for both audio and MIDI
- segmentRect.setPen(CompositionColourCache::getInstance()->RecordingSegmentBorder);
- // audio color
- if (isAudio) {
- segmentRect.setBrush(CompositionColourCache::getInstance()->RecordingAudioSegmentBlock);
- // MIDI/default color
- } else {
- segmentRect.setBrush(CompositionColourCache::getInstance()->RecordingInternalSegmentBlock);
- }
- }
-
- // Notation preview data
- if (notationPreview && s->getType() == Segment::Internal) {
- makeNotationPreviewRects(QPoint(0, segmentRect.y()), s, clipRect, notationPreview);
- // Audio preview data
- } else if (audioPreview && s->getType() == Segment::Audio) {
- makeAudioPreviewRects(audioPreview, s, segmentRect, clipRect);
- }
-
- m_segmentRects.push_back(segmentRect);
- } else {
- //RG_DEBUG << "CompositionModelImpl::getSegmentRects(): - segment out of rect";
+ if (segmentRect.intersects(m_selectionRect)) {
+ m_tmpSelectedSegments.insert(segment);
+ updateRect |= segmentRect;
}
-
}
- // changing items (moving segments)
-
- ItemContainer::iterator movEnd = m_changingItems.end();
- for (ItemContainer::iterator i = m_changingItems.begin(); i != movEnd; ++i) {
- CompositionRect segmentRect((*i)->rect());
- if (segmentRect.intersects(clipRect)) {
- Segment *s = CompositionItemHelper::getSegment(*i);
- segmentRect.setSelected(true);
- QColor brushColor = GUIPalette::convertColour(m_composition.getSegmentColourMap().getColourByIndex(s->getColourIndex()));
- segmentRect.setBrush(brushColor);
-
- segmentRect.setPen(CompositionColourCache::getInstance()->SegmentBorder);
+ updateRect = updateRect.normalized();
- // Notation preview data
- if (notationPreview && s->getType() == Segment::Internal) {
- makeNotationPreviewRectsMovingSegment(segmentRect.topLeft(), s, segmentRect, notationPreview);
- // Audio preview data
- } else if (audioPreview && s->getType() == Segment::Audio) {
- makeAudioPreviewRects(audioPreview, s, segmentRect, clipRect);
- }
+ // If the selection has changed, update the segments.
+ if (m_tmpSelectedSegments != m_previousTmpSelectedSegments)
+ emit needUpdate(updateRect | m_previousSelectionUpdateRect);
- m_segmentRects.push_back(segmentRect);
- }
- }
+ // If the rubber band has size, update it.
+ if (!updateRect.isNull())
+ emit needArtifactsUpdate();
- return m_segmentRects;
+ m_previousSelectionUpdateRect = updateRect;
}
-CompositionModelImpl::YCoordList CompositionModelImpl::getTrackDividersIn(const QRect& rect)
+void CompositionModelImpl::finalizeSelectionRect()
{
- int top = m_grid.getYBin(rect.y());
- int bottom = m_grid.getYBin(rect.y() + rect.height());
+ const SegmentMultiSet &segments = m_composition.getSegments();
+
+ // For each segment in the composition
+ for (SegmentMultiSet::const_iterator i = segments.begin();
+ i != segments.end();
+ ++i) {
-// RG_DEBUG << "CompositionModelImpl::getTrackDividersIn: rect "
-// << rect.x() << ", " << rect.y() << ", "
-// << rect.width() << "x" << rect.height() << ", top = " << top
-// << ", bottom = " << bottom;
-
- setTrackHeights();
-
- CompositionModelImpl::YCoordList list;
+ Segment *segment = *i;
- for (int pos = top; pos <= bottom; ++pos) {
- int divider = m_grid.getYBinCoordinate(pos);
- list.push_back(divider);
-// RG_DEBUG << "divider at " << divider;
+ QRect segmentRect;
+ getSegmentQRect(*segment, segmentRect);
+
+ if (segmentRect.intersects(m_selectionRect)) {
+ // ??? This triggers an update for each selected segment.
+ // Wasteful.
+ setSelected(segment);
+ }
}
- return list;
+ // Clear the selection rect state for the next time.
+ m_previousSelectionUpdateRect = QRect();
+ m_selectionRect = QRect();
+ m_previousTmpSelectedSegments.clear();
+ m_tmpSelectedSegments.clear();
}
-CompositionModelImpl::RectList* CompositionModelImpl::getNotationPreviewData(const Segment* s)
+void CompositionModelImpl::selectionHasChanged()
{
- RectList* npData = m_notationPreviewDataCache[s];
-
- if (!npData) {
- npData = makeNotationPreviewDataCache(s);
- }
+ emit selectionChanged(getSelectedSegments());
+}
- return npData;
+bool CompositionModelImpl::isSelected(const Segment *s) const
+{
+ return m_selectedSegments.find(const_cast<Segment *>(s)) !=
+ m_selectedSegments.end();
}
-CompositionModelImpl::AudioPreviewData* CompositionModelImpl::getAudioPreviewData(const Segment* s)
+QRect CompositionModelImpl::getSelectedSegmentsRect() const
{
- Profiler profiler("CompositionModelImpl::getAudioPreviewData");
- RG_DEBUG << "CompositionModelImpl::getAudioPreviewData";
+ QRect selectionRect;
- AudioPreviewData* apData = m_audioPreviewDataCache[s];
+ // For each selected segment, accumulate the selection rect
+ for (SegmentSelection::iterator segIter = m_selectedSegments.begin();
+ segIter != m_selectedSegments.end();
+ ++segIter) {
- if (!apData) {
- apData = makeAudioPreviewDataCache(s);
+ QRect segmentRect;
+ getSegmentQRect(**segIter, segmentRect);
+
+ selectionRect |= segmentRect;
}
- RG_DEBUG << "CompositionModelImpl::getAudioPreviewData returning";
- return apData;
+ return selectionRect;
}
-CompositionModelImpl::RectList* CompositionModelImpl::makeNotationPreviewDataCache(const Segment *s)
+bool CompositionModelImpl::isTmpSelected(const Segment *s) const
{
- RectList* npData = new RectList();
-
- // Create the preview
- createEventRects(s, npData);
+ return m_tmpSelectedSegments.find(const_cast<Segment *>(s)) !=
+ m_tmpSelectedSegments.end();
+}
- // Store in the cache.
- // Callers guarantee that m_notationPreviewDataCache[s] is not currently
- // pointing to anything.
- m_notationPreviewDataCache[s] = npData;
+// --- Misc ---------------------------------------------------------
- return npData;
+int CompositionModelImpl::getCompositionHeight() const
+{
+ return m_grid.getYBinCoordinate(m_composition.getNbTracks());
}
-CompositionModelImpl::AudioPreviewData* CompositionModelImpl::makeAudioPreviewDataCache(const Segment *s)
+CompositionModelImpl::YCoordVector CompositionModelImpl::getTrackYCoords(
+ const QRect &rect)
{
- RG_DEBUG << "CompositionModelImpl::makeAudioPreviewDataCache(" << s << ")";
+ int top = m_grid.getYBin(rect.y());
+ int bottom = m_grid.getYBin(rect.y() + rect.height());
+
+ // Make sure we have the latest track heights.
+ updateAllTrackHeights();
+
+ CompositionModelImpl::YCoordVector yCoordVector;
+
+ for (int pos = top; pos <= bottom; ++pos) {
+ yCoordVector.push_back(m_grid.getYBinCoordinate(pos));
+ }
- AudioPreviewData* apData = new AudioPreviewData();
- updatePreviewCacheForAudioSegment(s);
- m_audioPreviewDataCache[s] = apData;
- return apData;
+ return yCoordVector;
}
}
diff --git a/src/gui/editors/segment/compositionview/CompositionModelImpl.h b/src/gui/editors/segment/compositionview/CompositionModelImpl.h
index 6b1f3c7..88aa5c9 100644
--- a/src/gui/editors/segment/compositionview/CompositionModelImpl.h
+++ b/src/gui/editors/segment/compositionview/CompositionModelImpl.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -19,13 +19,15 @@
#define RG_COMPOSITIONMODELIMPL_H
#include "base/SnapGrid.h"
-#include "CompositionRect.h"
-#include "CompositionItem.h"
+#include "SegmentRect.h"
+#include "ChangingSegment.h"
#include "SegmentOrderer.h"
+#include "base/TimeT.h" // timeT
#include <QColor>
#include <QPoint>
#include <QRect>
+#include <QSharedPointer>
#include <vector>
#include <map>
@@ -39,358 +41,461 @@ namespace Rosegarden
class Studio;
class Segment;
class RulerScale;
+class InstrumentStaticSignals;
+class Instrument;
class Event;
class Composition;
-class AudioPreviewUpdater;
-class AudioPreviewThread;
+class AudioPeaksGenerator;
+class AudioPeaksThread;
-/// For Audio Previews
-typedef std::vector<QImage> PixmapArray;
-
-/// Segment previews and selection functionality.
+/// Model layer between CompositionView and Composition.
/**
- * I assume that by Model we are referring to Smalltalk's
- * Model/View/Controller pattern. Qt has a modified Model/View version
- * of this. Maybe this is in some way related? MVC never made any
- * sense to me. Smalltalk doesn't make any sense to me.
- *
- * A skim of this indicates that it is mostly random functionality (e.g.
- * selection and previews) that is closely tied to CompositionView. This
- * could probably be combined with CompositionView into one gigantic
- * monster-class, then big coherent pieces (like selection and previews)
- * broken off into smaller, more sensible classes.
- *
* This class works together with CompositionView to provide the composition
* user interface (the segment canvas). TrackEditor creates and owns the
* only instance of this class.
+ *
+ * This class is a segment rectangle and preview manager. It augments
+ * segments and events with a sense of position on a view. The key member
+ * objects are:
+ *
+ * - m_notationPreviewCache
+ * - m_audioPeaksCache
+ * - m_audioPreviewImageCache
+ * - m_selectedSegments
+ *
+ * The Qt interpretation of the term "Model" is a layer of functionality
+ * that sits between the data (Composition) and the view (CompositionView).
+ * It's like Decorator Pattern. It adds functionality to an object without
+ * modifying that object. It maintains the focus on the object.
+ *
+ * To me, Decorator Pattern is a cop-out. It always results in a
+ * disorganized pile of ideas dumped into a class. Like this.
+ * A better way to organize this code would be to look for big coherent
+ * ideas. For CompositionView and CompositionModelImpl, those would
+ * be:
+ *
+ * - Segments
+ * - Notation Previews
+ * - Audio Previews
+ * - Selection
+ * - Artifacts
+ *
+ * Now organize the code around those:
+ *
+ * - CompositionView - thin layer over Qt to provide drawing help and
+ * coordinate the other objects
+ * - SegmentRenderer - takes a Composition and draws segments on
+ * the CompositionView
+ * - NotationPreviewRenderer - takes a Composition and draws previews
+ * on the CompositionView for the MIDI segments
+ * - AudioPreviewRenderer - takes a Composition and draws previews on the
+ * CompositionView for the Audio segments
+ * - SelectionManager - Handles the concept of selected segments.
+ * - ArtifactState - A data-only object that holds things like
+ * the position of the guides and whether they are
+ * visible. Modified by the tools and notifies
+ * ArtifactRenderer of changes.
+ * - ArtifactRenderer - Draws the Artifacts on the CompositionView. Uses
+ * the Composition and ArtifactState.
+ *
+ * The Renderers in the above design might work better as generators that
+ * generate some sort of intermediate representation (e.g. a
+ * std::vector<QRect>) that CompositionView can then render.
*/
-class CompositionModelImpl : public QObject, public CompositionObserver, public SegmentObserver
+class CompositionModelImpl :
+ public QObject,
+ public CompositionObserver,
+ public SegmentObserver
{
Q_OBJECT
public:
- CompositionModelImpl(Composition& compo,
- Studio& studio,
- RulerScale *rulerScale,
- int vStep);
+ CompositionModelImpl(QObject *parent,
+ Composition &,
+ Studio &,
+ RulerScale *,
+ int trackCellHeight);
virtual ~CompositionModelImpl();
- typedef std::vector<QRect> RectList;
+ Composition &getComposition() { return m_composition; }
+ Studio &getStudio() { return m_studio; }
+ SnapGrid &grid() { return m_grid; }
+
+ // --- Notation Previews ------------------------------
+
+ /// A vector of QRect's.
+ /**
+ * Each QRect represents a note/event in the preview.
+ *
+ * See NotationPreviewCache.
+ *
+ * QRectVector was also considered as a name for this, but since it
+ * is used in so many places, the more abstract name seemed more
+ * helpful to readers of the code.
+ */
+ typedef std::vector<QRect> NotationPreview;
+
+ /// The visible range of notation preview data for a segment.
+ struct NotationPreviewRange {
+ NotationPreview::const_iterator begin;
+ NotationPreview::const_iterator end;
+
+ // y coord in contents coords
+ int segmentTop;
+ // 0 when the segment isn't moving.
+ int moveXOffset;
- struct RectRange {
- std::pair<RectList::iterator, RectList::iterator> range;
- QPoint basePoint;
QColor color;
};
- typedef std::vector<RectRange> RectRanges;
+ /// A vector of NotationPreviewRange objects, one per segment.
+ typedef std::vector<NotationPreviewRange> NotationPreviewRanges;
- struct AudioPreviewDrawDataItem {
- AudioPreviewDrawDataItem(PixmapArray p, QPoint bp, QRect r) :
- pixmap(p), basePoint(bp), rect(r), resizeOffset(0) {};
- PixmapArray pixmap;
- QPoint basePoint;
- QRect rect;
+ /// Delete all cached notation and audio previews.
+ void deleteCachedPreviews();
- // when showing a segment that is being resized from the
- // beginning, this contains the offset between the current
- // rect of the segment and the resized one
- int resizeOffset;
- };
+ // --- Audio Previews ---------------------------------
+
+ /// Audio Preview Image (tiled)
+ typedef std::vector<QImage> QImageVector;
- typedef std::vector<AudioPreviewDrawDataItem> AudioPreviewDrawData;
+ struct AudioPreview {
+ AudioPreview(const QImageVector &i, QRect r) :
+ image(i), // ??? COPY
+ rect(r),
+ resizeOffset(0)
+ { }
- typedef std::vector<CompositionRect> RectContainer;
+ // Vector of QImage tiles containing the preview graphics.
+ // ??? COPY. This would be faster as a pointer.
+ QImageVector image;
- /// Get the segment rectangles and segment previews
- const RectContainer& getSegmentRects(const QRect &clipRect,
- RectRanges *notationPreview,
- AudioPreviewDrawData *audioPreview);
+ // Segment rect in contents coords.
+ QRect rect;
- typedef std::vector<int> YCoordList;
+ // While the user is resizing a segment from the beginning,
+ // this contains the offset between the current
+ // rect of the segment and the resized one.
+ int resizeOffset;
+ };
- /// Get the Y coords of each track within clipRect.
- /**
- * CompositionView::drawSegments() uses this to draw the track dividers.
- */
- YCoordList getTrackDividersIn(const QRect &clipRect);
+ typedef std::vector<AudioPreview> AudioPreviews;
- /// Compares Segment pointers in a CompositionItem.
/**
- * Is this really better than just comparing the CompositionItemPtr
- * addresses?
- *
- * // Compare the QPointer addresses
- * return c1.data() < c2.data();
- *
- * All this indexing with pointers gives me the willies. IDs are safer.
+ * Used by CompositionView's ctor to connect
+ * RosegardenDocument::m_audioPeaksThread.
*/
- struct CompositionItemCompare {
- bool operator()(CompositionItemPtr c1, CompositionItemPtr c2) const
- {
- // This strikes me as odd. I think the one below is better.
- //return CompositionItemHelper::getSegment(c1) < CompositionItemHelper::getSegment(c2);
+ void setAudioPeaksThread(AudioPeaksThread *thread);
- // operator< on Segment *'s? I guess order isn't too important.
- return c1->getSegment() < c2->getSegment();
- }
+ struct AudioPeaks {
+ AudioPeaks() :
+ channels(0)
+ { }
+
+ unsigned int channels;
+
+ // See AudioPeaksThread::getPeaks()
+ typedef std::vector<float> Values;
+ Values values;
};
- typedef std::set<CompositionItemPtr, CompositionItemCompare> ItemContainer;
+ // --- Segments ---------------------------------------
+
+ typedef std::vector<SegmentRect> SegmentRects;
- /// Used by CompositionView on mouse double-click.
- ItemContainer getItemsAt(const QPoint &);
- /// Get the start time of the repeat nearest the point.
+ /// Get the segment rectangles and segment previews
/**
- * Used by CompositionView to determine the time at which to edit a repeat.
- *
- * Looking closely at the implementation of this, we find that this is a
- * function that brings together CompositionItem and SnapGrid. It mainly
- * uses CompositionItem, so it likely belongs there. Perhaps more as a
- *
- * CompositionItem::getRepeatTimeAt(const SnapGrid &, const QPoint &)
+ * ??? Audio and Notation Previews too. Need an "ALL" category.
*/
- timeT getRepeatTimeAt(const QPoint &, CompositionItemPtr);
+ void getSegmentRects(
+ const QRect &clipRect,
+ SegmentRects *segmentRects,
+ NotationPreviewRanges *notationPreviewRanges,
+ AudioPreviews *audioPreviews);
+
+ /// Get the segment at the given position on the view.
+ ChangingSegmentPtr getSegmentAt(const QPoint &pos);
- /// Used in many places for various coordinate/time purposes.
- SnapGrid& grid() { return m_grid; }
+ void getSegmentQRect(const Segment &segment, QRect &rect) const;
+ void getSegmentRect(const Segment &segment, SegmentRect &segmentRect) const;
- // *** Selection
+ // --- Selection --------------------------------------
- void setSelected(CompositionItemPtr, bool selected = true);
void setSelected(Segment *, bool selected = true);
- //void setSelected(const ItemContainer&);
+ void selectSegments(const SegmentSelection &segments);
void clearSelected();
- bool isSelected(CompositionItemPtr) const;
- bool isSelected(const Segment *) const;
- bool haveSelection() const { return !m_selectedSegments.empty(); }
- bool haveMultipleSelection() const { return m_selectedSegments.size() > 1; }
- SegmentSelection getSelectedSegments() { return m_selectedSegments; }
- /// Bounding rect of the currently selected segments.
- QRect getSelectionContentsRect();
-
- /// Emit selectedSegments() signal
- /**
- * Used by SegmentSelector and others to signal a change in the selection.
- */
- void signalSelection();
- /// Click and drag selection rect.
+ /// Click and drag selection rect (rubber band).
void setSelectionRect(const QRect &);
- /// Click and drag selection complete.
+ /// Select segments based on the selection rect (rubber band).
void finalizeSelectionRect();
- /// Emit needContentUpdate() signal
+ /// Emit selectionChanged() signal
/**
- * rename: emitRefreshView()
+ * Used by SegmentSelector and others to signal a change in the selection.
+ * See RosegardenMainViewWidget::slotSelectedSegments()
*/
- void signalContentChange();
+ void selectionHasChanged();
+
+ bool isSelected(const Segment *) const;
+ bool haveSelection() const { return !m_selectedSegments.empty(); }
+ bool haveMultipleSelection() const { return m_selectedSegments.size() > 1; }
+ SegmentSelection getSelectedSegments() { return m_selectedSegments; }
+ /// Bounding rect of the currently selected segments.
+ QRect getSelectedSegmentsRect() const;
- // *** Recording
+ // --- Recording --------------------------------------
- /// Refresh the recording segments.
- void pointerPosChanged(int x);
+ // ??? This category might make more sense combined with Segments.
- void addRecordingItem(CompositionItemPtr);
- //void removeRecordingItem(CompositionItemPtr);
+ void addRecordingItem(ChangingSegmentPtr);
+ /// Update the recording segments on the display.
+ void pointerPosChanged(int x);
void clearRecordingItems();
- //bool haveRecordingItems() { return !m_recordingSegments.empty(); }
- // *** Changing (moving and resizing)
+ // --- Changing (moving and resizing) -----------------
+
+ // ??? This category might make more sense combined with Segments.
enum ChangeType { ChangeMove, ChangeResizeFromStart, ChangeResizeFromEnd };
/// Begin move/resize for a single segment.
- void startChange(CompositionItemPtr, ChangeType change);
+ void startChange(ChangingSegmentPtr, ChangeType change);
/// Begin move for all selected segments.
void startChangeSelection(ChangeType change);
- //ChangeType getChangeType() const { return m_changeType; }
- /// Get the segments that are moving or resizing.
- ItemContainer &getChangingItems() { return m_changingItems; }
- /// Cleanup after move/resize.
- void endChange();
- // *** Misc
-
- /// In pixels
- /**
- * Used to expand the composition when we go past the end.
- */
- void setCompositionLength(int width);
- /// In pixels
+ /// Compare Segment pointers in a ChangingSegment.
/**
- * Used to expand the composition when we go past the end.
+ * Used by ChangingSegmentSet to order the ChangingSegment objects.
+ *
+ * All this indexing with pointers gives me the willies. IDs are safer.
*/
- int getCompositionLength();
- /// Number of pixels needed vertically to render all tracks.
- unsigned int getCompositionHeight();
-
+ struct ChangingSegmentPtrCompare {
+ bool operator()(ChangingSegmentPtr c1, ChangingSegmentPtr c2) const
+ {
+ // operator< on Segment *'s? I guess order isn't too important.
+ return c1->getSegment() < c2->getSegment();
+
+ // ??? Is the above better than just comparing the
+ // ChangingSegmentPtr addresses?
+ // Compare the QPointer addresses
+ //return c1.data() < c2.data();
+ }
+ };
+
/**
- * Used by CompositionView's ctor to connect
- * RosegardenDocument::m_audioPreviewThread.
+ * startChange() is the reason this is a std::set. startChangeSelection()
+ * calls startChange() repeatedly with each selected segment.
+ * startChange() uses std::set::find() to determine whether that segment
+ * is already in m_changingSegments. With a std::vector, this would be an
+ * exponential search. In practice, what is the worst use-case?
*/
- void setAudioPreviewThread(AudioPreviewThread *thread);
- //AudioPreviewThread* getAudioPreviewThread() { return m_audioPreviewThread; }
+ typedef std::set<ChangingSegmentPtr, ChangingSegmentPtrCompare>
+ ChangingSegmentSet;
- /// See CompositionView::clearSegmentRectsCache()
- void clearSegmentRectsCache(bool clearPreviews = false)
- { clearInCache(0, clearPreviews); }
+ /// Get the segments that are moving or resizing.
+ ChangingSegmentSet &getChangingSegments() { return m_changingSegments; }
- CompositionRect computeSegmentRect(const Segment &, bool computeZ = false);
+ /// Find the ChangingSegment for the specified Segment.
+ ChangingSegmentPtr findChangingSegment(const Segment *);
- //void computeRepeatMarks(CompositionItemPtr);
+ /// Cleanup after move/resize.
+ void endChange();
- Composition &getComposition() { return m_composition; }
- Studio &getStudio() { return m_studio; }
+ // --- Misc -------------------------------------------
+
+ typedef std::vector<int> YCoordVector;
+ /// Get the Y coords of each track within clipRect.
/**
- * rename: AudioPreview
+ * CompositionView::drawSegments() uses this to draw the track dividers.
*/
- struct AudioPreviewData {
- AudioPreviewData() :
- channels(0)
- { }
+ YCoordVector getTrackYCoords(const QRect &clipRect);
- unsigned int channels;
-
- typedef std::vector<float> Values;
- Values values;
- };
+ /// Number of pixels needed vertically to render all tracks.
+ int getCompositionHeight() const;
signals:
- /// rename: refreshView
- void needContentUpdate();
- /// rename: refreshView
- void needContentUpdate(const QRect&);
+ /// Connected to CompositionView::slotUpdateAll()
+ void needUpdate();
+ /// Connected to CompositionView::slotAllNeedRefresh(rect)
+ void needUpdate(const QRect &);
+
+ /// Connected to CompositionView::slotUpdateArtifacts()
void needArtifactsUpdate();
- void selectedSegments(const SegmentSelection &);
+
+ /// Connected to CompositionView::slotUpdateSize()
void needSizeUpdate();
+ /// Connected to RosegardenMainViewWidget::slotSelectedSegments().
+ void selectionChanged(const SegmentSelection &);
+
public slots:
- void slotAudioFileFinalized(Segment*);
- void slotInstrumentParametersChanged(InstrumentId);
+ /// Connected to RosegardenDocument::audioFileFinalized()
+ /**
+ * Called when recording of an audio file is finished and the
+ * preview is ready to display.
+ */
+ void slotAudioFileFinalized(Segment *);
+
+ /// Connected to InstrumentStaticSignals::changed()
+ void slotInstrumentChanged(Instrument *);
private slots:
- void slotAudioPreviewComplete(AudioPreviewUpdater*);
+ /// Connected to AudioPeaksGenerator::audioPeaksComplete()
+ void slotAudioPeaksComplete(AudioPeaksGenerator *);
private:
+ // --- Misc -------------------------------------------
+
+ Composition &m_composition;
+ Studio &m_studio;
+ SnapGrid m_grid;
+
// CompositionObserver Interface
+ // ??? It's hard to pin these down to a category as they contribute
+ // to multiple categories.
virtual void segmentAdded(const Composition *, Segment *);
virtual void segmentRemoved(const Composition *, Segment *);
virtual void segmentRepeatChanged(const Composition *, Segment *, bool);
virtual void segmentStartChanged(const Composition *, Segment *, timeT);
virtual void segmentEndMarkerChanged(const Composition *, Segment *, bool);
virtual void segmentTrackChanged(const Composition *, Segment *, TrackId);
- virtual void endMarkerTimeChanged(const Composition *, bool /*shorten*/);
+ virtual void endMarkerTimeChanged(const Composition *, bool shorten);
+
+ QSharedPointer<InstrumentStaticSignals> m_instrumentStaticSignals;
+
+ // --- Notation Previews ------------------------------
// SegmentObserver Interface
+ // ??? These primarily affect the notation previews, however,
+ // endMarkerTimeChanged() feels more like a Segment thing.
virtual void eventAdded(const Segment *, Event *);
virtual void eventRemoved(const Segment *, Event *);
- virtual void AllEventsChanged(const Segment *s);
+ virtual void allEventsChanged(const Segment *);
virtual void appearanceChanged(const Segment *);
- virtual void endMarkerTimeChanged(const Segment *, bool /*shorten*/);
- virtual void segmentDeleted(const Segment*) { /* nothing to do - handled by CompositionObserver::segmentRemoved() */ };
-
- QPoint computeSegmentOrigin(const Segment &);
-
- bool setTrackHeights(Segment *changed = 0); // true if something changed
-
- bool isTmpSelected(const Segment*) const;
- bool wasTmpSelected(const Segment*) const;
- bool isMoving(const Segment*) const;
- bool isRecording(const Segment*) const;
-
- void computeRepeatMarks(CompositionRect& sr, const Segment* s);
- unsigned int computeZForSegment(const Segment* s);
-
- // Segment Previews
- /// Make and cache notation or audio preview for segment.
- void makePreviewCache(const Segment* s);
- /// Remove cached notation or audio preview for segment.
- void removePreviewCache(const Segment* s);
-
- // Notation Previews
- /// rename: getNotationPreviewStatic()?
- void makeNotationPreviewRects(QPoint basePoint, const Segment* segment,
- const QRect& clipRect, RectRanges* npData);
- /// rename: getNotationPreviewMoving()?
- void makeNotationPreviewRectsMovingSegment(
- QPoint basePoint, const Segment* segment,
- const QRect& currentSR, RectRanges* npData);
- /// rename: getNotationPreview()
- RectList* getNotationPreviewData(const Segment* s);
- /// rename: cacheNotationPreview()
- RectList* makeNotationPreviewDataCache(const Segment *s);
- /// For notation preview
- void createEventRects(const Segment* segment, RectList*);
-
- // Audio Previews
- void makeAudioPreviewRects(AudioPreviewDrawData* apRects, const Segment*,
- const CompositionRect& segRect, const QRect& clipRect);
- PixmapArray getAudioPreviewPixmap(const Segment* s);
- AudioPreviewData* getAudioPreviewData(const Segment* s);
- QRect postProcessAudioPreview(AudioPreviewData* apData, const Segment*);
- /// rename: cacheAudioPreview()
- AudioPreviewData* makeAudioPreviewDataCache(const Segment *s);
- /// rename: makeAudioPreview()
- void updatePreviewCacheForAudioSegment(const Segment* s);
-
- /// Clear notation and audio preview caches.
- void clearPreviewCache();
-
- // Segment Rects (m_segmentRectMap)
- void putInCache(const Segment*, const CompositionRect&);
- const CompositionRect& getFromCache(const Segment*, timeT& endTime);
- bool isCachedRectCurrent(const Segment& s, const CompositionRect& r,
- QPoint segmentOrigin, timeT segmentEndTime);
- void clearInCache(const Segment*, bool clearPreviewCache = false);
-
- //--------------- Data members ---------------------------------
- Composition& m_composition;
- Studio& m_studio;
- SnapGrid m_grid;
+ virtual void endMarkerTimeChanged(const Segment *, bool shorten);
+ virtual void segmentDeleted(const Segment *)
+ { /* nothing to do - handled by CompositionObserver::segmentRemoved() */ }
- SegmentSelection m_selectedSegments;
- SegmentSelection m_tmpSelectedSegments;
- SegmentSelection m_previousTmpSelectedSegments;
+ /// Make a NotationPreviewRange for a Segment.
+ /**
+ * Calls getNotationPreview() to get the preview for the segment.
+ * Scans the NotationPreview for the range within the clipRect.
+ * Assembles a NotationPreviewRange and adds it to ranges.
+ */
+ void makeNotationPreviewRange(
+ QPoint basePoint, const Segment *segment,
+ const QRect &clipRect, NotationPreviewRanges *ranges);
- timeT m_pointerTimePos;
+ /// Make a NotationPreviewRange for a Changing Segment.
+ /**
+ * Calls getNotationPreview() to get the preview for the segment.
+ * Scans the NotationPreview for the range within the clipRect.
+ * Assembles a NotationPreviewRange and adds it to ranges.
+ *
+ * Differs from makeNotationPreviewRange() in that it takes into
+ * account that the Segment is changing (moving, resizing, etc...).
+ * currentRect is the Segment's modified QRect at the moment.
+ */
+ void makeNotationPreviewRangeCS(
+ QPoint basePoint, const Segment *segment,
+ const QRect ¤tRect, const QRect &clipRect,
+ NotationPreviewRanges *ranges);
+
+ const NotationPreview *getNotationPreview(const Segment *);
+
+ NotationPreview *makeNotationPreview(const Segment *) const;
+
+ typedef std::map<const Segment *, NotationPreview *> NotationPreviewCache;
+ // We might make these caches mutable to allow more functions
+ // to be const. However, the public deleteCachedPreviews() leads
+ // one to believe that the state of the cache is indeed important to
+ // the outside world. Renaming it to something like "refreshNeeded()"
+ // might get around this.
+ NotationPreviewCache m_notationPreviewCache;
+
+ // --- Audio Previews ---------------------------------
+
+ // AudioPreview generation happens in three steps.
+ // 1. The AudioPeaks are generated asynchronously for a segment.
+ // See AudioPeaksGenerator.
+ // 2. The audio preview image is created from the AudioPeaks.
+ // See AudioPreviewPainter.
+ // 3. An AudioPreview object is created using the audio preview image.
+ // See makeAudioPreview().
+
+ /// Make an AudioPreview for a Segment and add it to audioPreviews.
+ void makeAudioPreview(const Segment *, const SegmentRect &,
+ AudioPreviews *audioPreviews);
+
+ /// Create audio peaks for a segment asynchronously.
+ /**
+ * Uses an AudioPeaksGenerator. When the AudioPeaksGenerator is done,
+ * slotAudioPeaksComplete() is called.
+ *
+ * Also generates the preview image asynchronously.
+ */
+ void updateAudioPeaksCache(const Segment *);
+
+ AudioPeaksThread *m_audioPeaksThread;
- typedef std::set<Segment *> RecordingSegmentSet;
- RecordingSegmentSet m_recordingSegments;
+ typedef std::map<const Segment *, AudioPeaksGenerator *>
+ AudioPeaksGeneratorMap;
+ AudioPeaksGeneratorMap m_audioPeaksGeneratorMap;
- AudioPreviewThread* m_audioPreviewThread;
+ typedef std::map<const Segment *, AudioPeaks *> AudioPeaksCache;
+ AudioPeaksCache m_audioPeaksCache;
- // Notation Preview
- typedef std::map<const Segment *, RectList *> NotationPreviewDataCache;
- NotationPreviewDataCache m_notationPreviewDataCache;
+ std::map<const Segment *, QImageVector> m_audioPreviewImageCache;
- // Audio Preview
- typedef std::map<const Segment *, AudioPreviewData *> AudioPreviewDataCache;
- AudioPreviewDataCache m_audioPreviewDataCache;
+ // --- Notation and Audio Previews --------------------
- /// Used by getSegmentRects() to return a reference for speed.
- RectContainer m_segmentRects;
+ void deleteCachedPreview(const Segment *);
- ChangeType m_changeType;
- ItemContainer m_changingItems;
- typedef std::vector<CompositionItemPtr> ItemGC;
- ItemGC m_itemGC;
+ // --- Segments ---------------------------------------
+ void updateAllTrackHeights();
+
+ /// Update SegmentRect::repeatMarks with the Segment's repeat marks.
+ /**
+ * This could be moved to SegmentRect as
+ * computeRepeatMarks(const Segment &, const SnapGrid &);
+ */
+ void computeRepeatMarks(const Segment &, SegmentRect &) const;
+
+ // --- Selection --------------------------------------
+
+ SegmentSelection m_selectedSegments;
+
+ /// Segments selected while the rubber-band is active.
+ SegmentSelection m_tmpSelectedSegments;
+ bool isTmpSelected(const Segment *) const;
+
+ /// Used to determine what needs updating as the rubber-band changes.
+ SegmentSelection m_previousTmpSelectedSegments;
+
+ /// Rubber-band selection rectangle
QRect m_selectionRect;
+
+ /// Used to compute the update rect as the rubber-band changes.
QRect m_previousSelectionUpdateRect;
- std::map<const Segment*, CompositionRect> m_segmentRectMap;
- std::map<const Segment*, timeT> m_segmentEndTimeMap;
- std::map<const Segment*, PixmapArray> m_audioSegmentPreviewMap;
- std::map<TrackId, int> m_trackHeights;
+ // --- Recording --------------------------------------
+
+ typedef std::set<Segment *> RecordingSegmentSet;
+ RecordingSegmentSet m_recordingSegments;
+ bool isRecording(const Segment *) const;
+
+ /// The end time of a recording Segment.
+ timeT m_pointerTime;
- typedef std::map<const Segment*, AudioPreviewUpdater *>
- AudioPreviewUpdaterMap;
- AudioPreviewUpdaterMap m_audioPreviewUpdaterMap;
+ // --- Changing (moving and resizing) -----------------
- SegmentOrderer m_segmentOrderer;
+ ChangeType m_changeType;
+ ChangingSegmentSet m_changingSegments;
+ bool isChanging(const Segment *) const;
};
diff --git a/src/gui/editors/segment/compositionview/CompositionRect.cpp b/src/gui/editors/segment/compositionview/CompositionRect.cpp
deleted file mode 100644
index e75a722..0000000
--- a/src/gui/editors/segment/compositionview/CompositionRect.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
-/*
- Rosegarden
- A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
-
- Other copyrights also apply to some parts of this work. Please
- see the AUTHORS file and individual file headers for details.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
-*/
-
-
-#include "CompositionRect.h"
-#include "base/ColourMap.h"
-
-#include <QBrush>
-#include <QColor>
-#include <QPen>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
-#include <QString>
-
-
-namespace Rosegarden
-{
- const QColor CompositionRect::DefaultPenColor = QColor(Qt::black);
- const QColor CompositionRect::DefaultBrushColor = QColor(COLOUR_DEF_R, COLOUR_DEF_G, COLOUR_DEF_B);
-}
diff --git a/src/gui/editors/segment/compositionview/CompositionRect.h b/src/gui/editors/segment/compositionview/CompositionRect.h
deleted file mode 100644
index cb2fdad..0000000
--- a/src/gui/editors/segment/compositionview/CompositionRect.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
-/*
- Rosegarden
- A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
-
- Other copyrights also apply to some parts of this work. Please
- see the AUTHORS file and individual file headers for details.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
-*/
-
-#ifndef RG_COMPOSITIONRECT_H
-#define RG_COMPOSITIONRECT_H
-
-#include <QBrush>
-#include <QColor>
-#include <QPen>
-#include <QRect>
-#include <QString>
-#include <QVector>
-
-
-class QSize;
-class QPoint;
-
-
-namespace Rosegarden
-{
-
-class CompositionRect : public QRect
-{
-public:
- typedef QVector<int> repeatmarks;
-
- friend bool operator<(const CompositionRect&, const CompositionRect&);
-
- CompositionRect() : QRect(), m_selected(false),
- m_needUpdate(false), m_brush(DefaultBrushColor), m_pen(DefaultPenColor) {};
- CompositionRect(const QRect& r) : QRect(r), m_resized(false), m_selected(false),
- m_needUpdate(false), m_brush(DefaultBrushColor), m_pen(DefaultPenColor), m_z(0) {};
- CompositionRect(const QPoint & topLeft, const QPoint & bottomRight)
- : QRect(topLeft, bottomRight), m_resized(false), m_selected(false),
- m_needUpdate(false), m_brush(DefaultBrushColor), m_pen(DefaultPenColor), m_z(0) {};
- CompositionRect(const QPoint & topLeft, const QSize & size)
- : QRect(topLeft, size), m_resized(false), m_selected(false),
- m_needUpdate(false), m_brush(DefaultBrushColor), m_pen(DefaultPenColor), m_z(0) {};
- CompositionRect(int left, int top, int width, int height)
- : QRect(left, top, width, height), m_resized(false), m_selected(false),
- m_needUpdate(false), m_brush(DefaultBrushColor), m_pen(DefaultPenColor), m_z(0) {};
-
- void setResized(bool s) { m_resized = s; }
- bool isResized() const { return m_resized; }
- void setSelected(bool s) { m_selected = s; }
- bool isSelected() const { return m_selected; }
- bool needsFullUpdate() const { return m_needUpdate; }
- void setNeedsFullUpdate(bool s) { m_needUpdate = s; }
-
- void setZ(int z) { m_z = z; }
- int z() const { return m_z; }
-
- // brush, pen draw info
- void setBrush(QBrush b) { m_brush = b; }
- QBrush getBrush() const { return m_brush; }
- void setPen(QPen b) { m_pen = b; }
- QPen getPen() const { return m_pen; }
-
- // repeating segments
- void setRepeatMarks(const repeatmarks& rm) { m_repeatMarks = rm; }
- const repeatmarks& getRepeatMarks() const { return m_repeatMarks; }
- bool isRepeating() const { return m_repeatMarks.size() > 0; }
- int getBaseWidth() const { return m_baseWidth; }
- void setBaseWidth(int bw) { m_baseWidth = bw; }
- QString getLabel() const { return m_label; }
- void setLabel(QString l) { m_label = l; }
-
- static const QColor DefaultPenColor;
- static const QColor DefaultBrushColor;
-
-protected:
- bool m_resized;
- bool m_selected;
- bool m_needUpdate;
- QBrush m_brush;
- QPen m_pen;
- repeatmarks m_repeatMarks;
- int m_baseWidth;
- QString m_label;
- int m_z;
-};
-
-
-}
-
-#endif
diff --git a/src/gui/editors/segment/compositionview/CompositionView.cpp b/src/gui/editors/segment/compositionview/CompositionView.cpp
index b56847e..e5eab25 100644
--- a/src/gui/editors/segment/compositionview/CompositionView.cpp
+++ b/src/gui/editors/segment/compositionview/CompositionView.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -20,165 +20,163 @@
#include "CompositionView.h"
#include "misc/Debug.h"
-#include "AudioPreviewThread.h"
+#include "AudioPeaksThread.h"
#include "base/RulerScale.h"
#include "base/Segment.h"
#include "base/SnapGrid.h"
#include "base/Profiler.h"
#include "CompositionColourCache.h"
-#include "CompositionItemHelper.h"
-#include "CompositionItem.h"
-#include "CompositionRect.h"
+#include "ChangingSegment.h"
+#include "SegmentRect.h"
#include "AudioPreviewPainter.h"
#include "document/RosegardenDocument.h"
#include "misc/ConfigGroups.h"
#include "gui/general/GUIPalette.h"
+#include "gui/general/IconLoader.h"
#include "gui/general/RosegardenScrollView.h"
#include "SegmentSelector.h"
#include "SegmentToolBox.h"
-#include <QMessageBox>
#include <QBrush>
#include <QColor>
#include <QEvent>
#include <QFont>
#include <QFontMetrics>
-#include <QVector>
+#include <QMessageBox>
+#include <QMouseEvent>
#include <QPainter>
#include <QPen>
#include <QPixmap>
#include <QPoint>
#include <QRect>
//#include <QScrollBar>
+#include <QSettings>
#include <QSize>
#include <QString>
+#include <QTimer>
+#include <QVector>
#include <QWidget>
-#include <QSettings>
-#include <QMouseEvent>
-#include <algorithm>
+#include <algorithm> // std::min, std::max, std::find
namespace Rosegarden
{
-CompositionView::CompositionView(RosegardenDocument* doc,
- CompositionModelImpl* model,
- QWidget * parent) :
+CompositionView::CompositionView(RosegardenDocument *doc,
+ CompositionModelImpl *model,
+ QWidget *parent) :
RosegardenScrollView(parent),
m_model(model),
- m_currentIndex(0),
- m_tool(0),
- m_toolBox(0),
- m_enableDrawing(true),
+ m_lastContentsX(0),
+ m_lastContentsY(0),
+ m_segmentsRefresh(0, 0, viewport()->width(), viewport()->height()),
+ //m_backgroundPixmap(),
+ m_trackDividerColor(GUIPalette::getColour(GUIPalette::TrackDivider)),
m_showPreviews(false),
m_showSegmentLabels(true),
- m_fineGrain(false),
- m_pencilOverExisting(false),
- //m_minWidth(m_model->getCompositionLength()),
- m_stepSize(0),
- m_rectFill(0xF0, 0xF0, 0xF0),
- m_selectedRectFill(0x00, 0x00, 0xF0),
+ m_segmentsLayer(viewport()->width(), viewport()->height()),
+ //m_audioPreview(),
+ //m_notationPreview(),
+ //m_updateTimer(),
+ m_updateNeeded(false),
+ //m_updateRect()
+ m_drawTextFloat(false),
+ //m_textFloatText(),
+ //m_textFloatPos(),
m_pointerPos(0),
- m_pointerColor(GUIPalette::getColour(GUIPalette::Pointer)),
- m_pointerWidth(4),
- m_pointerPen(QPen(m_pointerColor, m_pointerWidth)),
- m_tmpRect(QRect(QPoint(0, 0), QPoint( -1, -1))),
- m_tmpRectFill(CompositionRect::DefaultBrushColor),
- m_trackDividerColor(GUIPalette::getColour(GUIPalette::TrackDivider)),
+ m_pointerPen(GUIPalette::getColour(GUIPalette::Pointer), 4),
+ //m_newSegmentRect(),
+ //m_newSegmentColor(),
+ //m_splitLinePos(),
m_drawGuides(false),
m_guideColor(GUIPalette::getColour(GUIPalette::MovementGuide)),
- m_topGuidePos(0),
- m_foreGuidePos(0),
+ m_guideX(0),
+ m_guideY(0),
m_drawSelectionRect(false),
- m_drawTextFloat(false),
- m_segmentsLayer(visibleWidth(), visibleHeight()),
- m_doubleBuffer(visibleWidth(), visibleHeight()),
- m_segmentsRefresh(0, 0, visibleWidth(), visibleHeight()),
- m_artifactsRefresh(0, 0, visibleWidth(), visibleHeight()),
- m_lastBufferRefreshX(0),
- m_lastBufferRefreshY(0),
- m_lastPointerRefreshX(0),
+ //m_selectionRect(),
+ m_toolBox(new SegmentToolBox(this, doc)),
+ m_currentTool(0),
+ //m_toolContextHelp(),
m_contextHelpShown(false),
- m_updateTimer(new QTimer(static_cast<QObject *>(this))),
- m_updateNeeded(false)
-// m_updateRect()
+ m_enableDrawing(true)
{
- if (doc) {
- m_toolBox = new SegmentToolBox(this, doc);
+ if (!doc)
+ return;
+ if (!m_model)
+ return;
- connect(m_toolBox, SIGNAL(showContextHelp(const QString &)),
- this, SLOT(slotToolHelpChanged(const QString &)));
- }
-
- setDragAutoScroll(true);
+ // Causing slow refresh issues on RG Main Window -- 10-12-2011 - JAS
+ // ??? This appears to have no effect positive or negative now (2015).
+ //viewport()->setAttribute(Qt::WA_PaintOnScreen);
-// Causing slow refresh issues on RG Mian Window -- 10-12-2011 - JAS
-// viewport()->setAttribute(Qt::WA_PaintOnScreen);
-// viewport()->setAttribute(Qt::WA_OpaquePaintEvent);
+ // Disable background erasing. We redraw everything. This would
+ // just waste time. (It's hard to measure any improvement here.)
+ viewport()->setAttribute(Qt::WA_OpaquePaintEvent);
- QPalette pal;
- pal.setColor(viewport()->backgroundRole(), GUIPalette::getColour(GUIPalette::SegmentCanvas));
- viewport()->setPalette(pal);
+ QSettings settings;
- slotUpdateSize();
+ // If background textures are enabled, load the texture pixmap.
+ if (settings.value(
+ QString(GeneralOptionsConfigGroup) + "/backgroundtextures",
+ "true").toBool()) {
- // QScrollBar* hsb = horizontalScrollBar();
+ IconLoader il;
+ m_backgroundPixmap = il.loadPixmap("bg-segmentcanvas");
+ }
- // dynamically adjust content size when scrolling past current composition's end
- // connect(hsb, SIGNAL(nextLine()),
- // this, SLOT(scrollRight()));
- // connect(hsb, SIGNAL(prevLine()),
- // this, SLOT(scrollLeft()));
+ slotUpdateSize();
- // connect(this, SIGNAL(contentsMoving(int, int)),
- // this, SLOT(allNeedRefresh()));
+ // *** Connections
- // connect(this, SIGNAL(contentsMoving(int, int)),
- // this, SLOT(slotContentsMoving(int, int)));
+ connect(m_toolBox, SIGNAL(showContextHelp(const QString &)),
+ this, SLOT(slotToolHelpChanged(const QString &)));
- connect(model, SIGNAL(needContentUpdate()),
+ connect(m_model, SIGNAL(needUpdate()),
this, SLOT(slotUpdateAll()));
- connect(model, SIGNAL(needContentUpdate(const QRect&)),
- this, SLOT(slotUpdateAll(const QRect&)));
- connect(model, SIGNAL(needArtifactsUpdate()),
- this, SLOT(slotArtifactsNeedRefresh()));
- connect(model, SIGNAL(needSizeUpdate()),
+ connect(m_model, SIGNAL(needUpdate(const QRect&)),
+ this, SLOT(slotAllNeedRefresh(const QRect&)));
+ connect(m_model, SIGNAL(needArtifactsUpdate()),
+ this, SLOT(slotUpdateArtifacts()));
+ connect(m_model, SIGNAL(needSizeUpdate()),
this, SLOT(slotUpdateSize()));
- if (doc) {
- connect(doc, SIGNAL(docColoursChanged()),
- this, SLOT(slotRefreshColourCache()));
-
- // recording-related signals
- connect(doc, SIGNAL(newMIDIRecordingSegment(Segment*)),
- this, SLOT(slotNewMIDIRecordingSegment(Segment*)));
- connect(doc, SIGNAL(newAudioRecordingSegment(Segment*)),
- this, SLOT(slotNewAudioRecordingSegment(Segment*)));
- // connect(doc, SIGNAL(recordMIDISegmentUpdated(Segment*, timeT)),
- // this, SLOT(slotRecordMIDISegmentUpdated(Segment*, timeT)));
- connect(doc, SIGNAL(stoppedAudioRecording()),
- this, SLOT(slotStoppedRecording()));
- connect(doc, SIGNAL(stoppedMIDIRecording()),
- this, SLOT(slotStoppedRecording()));
- connect(doc, SIGNAL(audioFileFinalized(Segment*)),
- getModel(), SLOT(slotAudioFileFinalized(Segment*)));
- }
-
- if (model) {
- model->setAudioPreviewThread(&doc->getAudioPreviewThread());
- }
-
- if (doc) {
- doc->getAudioPreviewThread().setEmptyQueueListener(this);
- }
+ connect(doc, SIGNAL(docColoursChanged()),
+ this, SLOT(slotRefreshColourCache()));
+
+ // recording-related signals
+ connect(doc, SIGNAL(newMIDIRecordingSegment(Segment*)),
+ this, SLOT(slotNewMIDIRecordingSegment(Segment*)));
+ connect(doc, SIGNAL(newAudioRecordingSegment(Segment*)),
+ this, SLOT(slotNewAudioRecordingSegment(Segment*)));
+ connect(doc, SIGNAL(stoppedAudioRecording()),
+ this, SLOT(slotStoppedRecording()));
+ connect(doc, SIGNAL(stoppedMIDIRecording()),
+ this, SLOT(slotStoppedRecording()));
+ connect(doc, SIGNAL(audioFileFinalized(Segment*)),
+ m_model, SLOT(slotAudioFileFinalized(Segment*)));
+
+ // Audio Preview Thread
+ m_model->setAudioPeaksThread(&doc->getAudioPeaksThread());
+ doc->getAudioPeaksThread().setEmptyQueueListener(this);
// Update timer
- connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(slotUpdateTimer()));
- m_updateTimer->start(100);
+ connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(slotUpdateTimer()));
+ m_updateTimer.start(100);
+
+ // Init the halo offsets table.
+ m_haloOffsets.push_back(QPoint(-1,-1));
+ m_haloOffsets.push_back(QPoint(-1, 0));
+ m_haloOffsets.push_back(QPoint(-1,+1));
+ m_haloOffsets.push_back(QPoint( 0,-1));
+ m_haloOffsets.push_back(QPoint( 0,+1));
+ m_haloOffsets.push_back(QPoint(+1,-1));
+ m_haloOffsets.push_back(QPoint(+1, 0));
+ m_haloOffsets.push_back(QPoint(+1,+1));
+
+ // *** Debugging
- QSettings settings;
settings.beginGroup("Performance_Testing");
m_enableDrawing = (settings.value("CompositionView", 1).toInt() != 0);
@@ -192,106 +190,63 @@ CompositionView::CompositionView(RosegardenDocument* doc,
void CompositionView::endAudioPreviewGeneration()
{
if (m_model) {
- m_model->setAudioPreviewThread(0);
+ m_model->setAudioPeaksThread(0);
}
}
-void CompositionView::setBackgroundPixmap(const QPixmap &m)
-{
- m_backgroundPixmap = m;
- // viewport()->setErasePixmap(m_backgroundPixmap);
-}
-
-#if 0
-// Dead Code.
-void CompositionView::initStepSize()
-{
- QScrollBar* hsb = horizontalScrollBar();
- m_stepSize = hsb->singleStep();
-}
-#endif
-
void CompositionView::slotUpdateSize()
{
-// int vStep = getModel()->grid().getYSnap();
-// int height = std::max(getModel()->m_composition.getNbTracks() * vStep, (unsigned)visibleHeight());
- int height = std::max(getModel()->getCompositionHeight(), (unsigned) visibleHeight());
+ const int height =
+ std::max(m_model->getCompositionHeight(), viewport()->height());
- const RulerScale *ruler = grid().getRulerScale();
-
- int minWidth = sizeHint().width();
- int computedWidth = int(nearbyint(ruler->getTotalWidth()));
-
- int width = std::max(computedWidth, minWidth);
-
- if (contentsWidth() != width || contentsHeight() != height) {
-// RG_DEBUG << "CompositionView::slotUpdateSize: Resizing contents from "
-// << contentsWidth() << "x" << contentsHeight() << " to "
-// << width << "x" << height << endl;
+ const RulerScale *rulerScale = grid().getRulerScale();
+ const int compositionWidth = (int)ceil(rulerScale->getTotalWidth());
+ const int minWidth = sizeHint().width();
+ const int width = std::max(compositionWidth, minWidth);
+ // If the width or height need to change...
+ if (contentsWidth() != width || contentsHeight() != height)
resizeContents(width, height);
- }
}
-#if 0
-// Dead Code.
-void CompositionView::scrollRight()
+void CompositionView::drawSelectionRectPos1(const QPoint &pos)
{
- RG_DEBUG << "CompositionView::scrollRight()\n";
- if (m_stepSize == 0)
- initStepSize();
-
- if (horizontalScrollBar()->value() == horizontalScrollBar()->maximum()) {
-
- resizeContents(contentsWidth() + m_stepSize, contentsHeight());
- setContentsPos(contentsX() + m_stepSize, contentsY());
- getModel()->setLength(contentsWidth());
- }
+ m_drawSelectionRect = true;
+ // Update the selection rect used for drawing the rubber band.
+ m_selectionRect.setRect(pos.x(), pos.y(), 0, 0);
+ // Pass on to CompositionModelImpl which will adjust the selected
+ // segments and redraw them.
+ m_model->setSelectionRect(m_selectionRect);
}
-void CompositionView::scrollLeft()
+void CompositionView::drawSelectionRectPos2(const QPoint &pos)
{
- RG_DEBUG << "CompositionView::scrollLeft()\n";
- if (m_stepSize == 0)
- initStepSize();
-
- int cWidth = contentsWidth();
+ m_drawSelectionRect = true;
- if (horizontalScrollBar()->value() < cWidth && cWidth > m_minWidth) {
- resizeContents(cWidth - m_stepSize, contentsHeight());
- getModel()->setLength(contentsWidth());
- }
+ // Update the selection rect used for drawing the rubber band.
+ m_selectionRect.setBottomRight(pos);
+ // Pass on to CompositionModelImpl which will adjust the selected
+ // segments and redraw them.
+ m_model->setSelectionRect(m_selectionRect);
}
-#endif
-void CompositionView::setSelectionRectPos(const QPoint& pos)
+void CompositionView::hideSelectionRect()
{
- //RG_DEBUG << "setSelectionRectPos(" << pos << ")";
- m_selectionRect.setRect(pos.x(), pos.y(), 0, 0);
- getModel()->setSelectionRect(m_selectionRect);
-}
+ // If it's already hidden, bail.
+ if (!m_drawSelectionRect)
+ return;
-void CompositionView::setSelectionRectSize(int w, int h)
-{
- //RG_DEBUG << "setSelectionRectSize(" << w << "," << h << ")";
- m_selectionRect.setSize(QSize(w, h));
- getModel()->setSelectionRect(m_selectionRect);
-}
+ m_drawSelectionRect = false;
-void CompositionView::setDrawSelectionRect(bool d)
-{
- if (m_drawSelectionRect != d) {
- m_drawSelectionRect = d;
- slotArtifactsNeedRefresh();
- slotUpdateAll(m_selectionRect);
- }
+ // Redraw the selection rect.
+ slotUpdateArtifacts();
}
-void CompositionView::clearSegmentRectsCache(bool clearPreviews)
+void CompositionView::deleteCachedPreviews()
{
- getModel()->clearSegmentRectsCache(clearPreviews);
+ m_model->deleteCachedPreviews();
}
SegmentSelection
@@ -300,380 +255,241 @@ CompositionView::getSelectedSegments()
return m_model->getSelectedSegments();
}
-void CompositionView::updateSelectionContents()
+void CompositionView::updateSelectedSegments()
{
- if (!haveSelection())
- return ;
-
-
- QRect selectionRect = getModel()->getSelectionContentsRect();
- updateContents(selectionRect);
-// update(selectionRect);
-}
+ if (!m_model->haveSelection())
+ return;
-#if 0
-void CompositionView::slotContentsMoving(int /* x */, int /* y */)
-{
- // qDebug("contents moving : x=%d", x);
+ updateContents(m_model->getSelectedSegmentsRect());
}
-#endif
-void CompositionView::setTool(const QString& toolName)
+void CompositionView::setTool(const QString &toolName)
{
- RG_DEBUG << "CompositionView::setTool(" << toolName << ")"
- << this << "\n";
-
- if (m_tool)
- m_tool->stow();
+ if (m_currentTool)
+ m_currentTool->stow();
m_toolContextHelp = "";
- m_tool = m_toolBox->getTool(toolName);
+ m_currentTool = m_toolBox->getTool(toolName);
- if (m_tool)
- m_tool->ready();
- else {
+ if (!m_currentTool) {
QMessageBox::critical(0, tr("Rosegarden"), QString("CompositionView::setTool() : unknown tool name %1").arg(toolName));
+ return;
}
-}
-
-void CompositionView::selectSegments(const SegmentSelection &segments)
-{
- RG_DEBUG << "CompositionView::selectSegments\n";
-
- static QRect dummy;
-
- getModel()->clearSelected();
-
- for (SegmentSelection::iterator i = segments.begin(); i != segments.end(); ++i) {
- getModel()->setSelected(CompositionItemPtr(new CompositionItem(**i, dummy)));
- }
- slotUpdateAll();
-}
-
-SegmentSelector*
-CompositionView::getSegmentSelectorTool()
-{
- return dynamic_cast<SegmentSelector*>(getToolBox()->getTool(SegmentSelector::ToolName));
-}
-void CompositionView::setSelectAdd(bool value)
-{
- SegmentSelector* selTool = getSegmentSelectorTool();
-
- if (!selTool)
- return ;
-
- selTool->setSegmentAdd(value);
-}
-
-void CompositionView::setSelectCopy(bool value)
-{
- SegmentSelector* selTool = getSegmentSelectorTool();
-
- if (!selTool)
- return ;
-
- selTool->setSegmentCopy(value);
+ m_currentTool->ready();
}
-void CompositionView::setSelectCopyingAsLink(bool value)
+void CompositionView::selectSegments(const SegmentSelection &segments)
{
- SegmentSelector* selTool = getSegmentSelectorTool();
-
- if (!selTool)
- return ;
-
- selTool->setSegmentCopyingAsLink(value);
+ m_model->selectSegments(segments);
}
-void CompositionView::showSplitLine(int x, int y)
+void CompositionView::drawSplitLine(int x, int y)
{
m_splitLinePos.setX(x);
m_splitLinePos.setY(y);
+ viewport()->update();
}
void CompositionView::hideSplitLine()
{
m_splitLinePos.setX( -1);
m_splitLinePos.setY( -1);
+ viewport()->update();
}
-void CompositionView::slotExternalWheelEvent(QWheelEvent* e)
+void CompositionView::slotExternalWheelEvent(QWheelEvent *e)
{
- e->accept();
+ // Pass it up to RosegardenScrollView.
wheelEvent(e);
-}
-
-CompositionItemPtr CompositionView::getFirstItemAt(QPoint pos)
-{
- CompositionModelImpl::ItemContainer items = getModel()->getItemsAt(pos);
-
- if (items.size()) {
- // find topmost item
- CompositionItemPtr res = *(items.begin());
-
- unsigned int maxZ = res->z();
-
- CompositionModelImpl::ItemContainer::iterator maxZItemPos = items.begin();
-
- for (CompositionModelImpl::ItemContainer::iterator i = items.begin();
- i != items.end(); ++i) {
- CompositionItemPtr ic = *i;
- if (ic->z() > maxZ) {
- res = ic;
- maxZ = ic->z();
- maxZItemPos = i;
- }
- }
-
- // get rid of the rest;
- items.erase(maxZItemPos);
- for (CompositionModelImpl::ItemContainer::iterator i = items.begin();
- i != items.end(); ++i)
- delete *i;
-
- return res;
- }
-
-
- return CompositionItemPtr();
-}
-
-void CompositionView::setSnapGrain(bool fine)
-{
- if (m_fineGrain) {
- grid().setSnapTime(SnapGrid::NoSnap);
- } else {
- grid().setSnapTime(fine ? SnapGrid::SnapToBeat : SnapGrid::SnapToBar);
- }
+ // We've got this. No need to propagate.
+ e->accept();
}
void CompositionView::slotUpdateAll()
{
- // This one doesn't get called too often while recording.
Profiler profiler("CompositionView::slotUpdateAll()");
- //RG_DEBUG << "CompositionView::slotUpdateAll()";
- allNeedRefresh();
- updateContents();
-// update();
+ // ??? This routine gets hit really hard when recording.
+ // Just holding down a single note results in 50 calls
+ // per second.
+
+ // Redraw the segments and artifacts.
+
+#if 1
+ // Since we might be reacting to a user change (e.g. zoom), we
+ // need to react immediately.
+ updateAll();
+#else
+ QRect viewportContentsRect(
+ contentsX(), contentsY(),
+ viewport()->rect().width(), viewport()->rect().height());
+
+ // Redraw the segments and artifacts.
+ // Uses 55% less CPU than updateAll() when recording. But introduces a
+ // delay of up to 1/10 second for user interaction like zoom. We need to
+ // untangle user updates and automatic updates (like recording) so that we
+ // can treat them differently.
+ slotAllNeedRefresh(viewportContentsRect);
+#endif
}
void CompositionView::slotUpdateTimer()
{
- //RG_DEBUG << "CompositionView::slotUpdateTimer()";
-
- if (m_updateNeeded)
- {
- updateAll(m_updateRect);
-
- //m_updateRect.setRect(0,0,0,0); // Not needed.
+ if (m_updateNeeded) {
+ updateAll2(m_updateRect);
m_updateNeeded = false;
}
}
-void CompositionView::updateAll(const QRect& rect)
+void CompositionView::updateAll2(const QRect &rect)
{
- Profiler profiler("CompositionView::updateAll(const QRect& rect)");
-
- //RG_DEBUG << "CompositionView::updateAll() rect " << rect << " - valid : " << rect.isValid();
+ Profiler profiler("CompositionView::updateAll2(rect)");
- allNeedRefresh(rect);
+ //RG_DEBUG << "updateAll2() rect:" << rect << ", valid:" << rect.isValid();
- if (rect.isValid()) {
- updateContents(rect);
-// update(rect);
- } else {
- updateContents();
-// update();
+ // If the incoming rect is invalid, just do everything.
+ // ??? This is probably not necessary as an invalid rect
+ // cannot get in here. See slotAllNeedRefresh(rect).
+ if (!rect.isValid()) {
+ updateAll();
+ return;
}
+
+ segmentsNeedRefresh(rect);
+ updateArtifacts(rect);
}
-void CompositionView::slotUpdateAll(const QRect& rect)
+void CompositionView::slotAllNeedRefresh(const QRect &rect)
{
// Bail if drawing is turned off in the settings.
if (!m_enableDrawing)
return;
// This one gets hit pretty hard while recording.
- Profiler profiler("CompositionView::slotUpdateAll(const QRect& rect)");
-
-#if 0
-// Old way. Just do the work for every update. Very expensive.
- updateAll(rect);
-#else
-// Alternate approach with a timer to throttle updates
+ Profiler profiler("CompositionView::slotAllNeedRefresh(const QRect &rect)");
// Note: This new approach normalizes the incoming rect. This means
// that it will never trigger a full refresh given an invalid rect
- // like it used to. See updateAll(). Some rough
- // testing reveals that the following test cases trigger this
- // invalid rect situation:
- // 1. Move a segment.
- // 2. Click with the arrow tool where there is no segment.
- // Testing of these situations reveals no (or minor) refresh issues.
+ // like it used to. See updateAll2(rect).
+ if (!rect.isValid())
+ RG_DEBUG << "slotAllNeedRefresh(rect): Invalid rect";
// If an update is now needed, set m_updateRect, otherwise accumulate it.
- if (!m_updateNeeded)
- {
+ if (!m_updateNeeded) {
// Let slotUpdateTimer() know an update is needed next time.
m_updateNeeded = true;
m_updateRect = rect.normalized();
- }
- else
- {
+ } else {
// Accumulate the update rect
m_updateRect |= rect.normalized();
}
-#endif
}
void CompositionView::slotRefreshColourCache()
{
CompositionColourCache::getInstance()->init();
- clearSegmentRectsCache();
- slotUpdateAll();
+ updateAll();
}
-void CompositionView::slotNewMIDIRecordingSegment(Segment* s)
+void CompositionView::slotNewMIDIRecordingSegment(Segment *s)
{
- getModel()->addRecordingItem(CompositionItemHelper::makeCompositionItem(s));
+ m_model->addRecordingItem(ChangingSegmentPtr(
+ new ChangingSegment(*s, QRect())));
}
-void CompositionView::slotNewAudioRecordingSegment(Segment* s)
+void CompositionView::slotNewAudioRecordingSegment(Segment *s)
{
- getModel()->addRecordingItem(CompositionItemHelper::makeCompositionItem(s));
+ m_model->addRecordingItem(ChangingSegmentPtr(
+ new ChangingSegment(*s, QRect())));
}
void CompositionView::slotStoppedRecording()
{
- getModel()->clearRecordingItems();
+ m_model->clearRecordingItems();
}
-void CompositionView::resizeEvent(QResizeEvent* e)
+void CompositionView::resizeEvent(QResizeEvent *e)
{
- if (e->size() == e->oldSize()) return;
-
-// RG_DEBUG << "CompositionView::resizeEvent() : from " << e->oldSize() << " to " << e->size() << endl;
-
RosegardenScrollView::resizeEvent(e);
+
+ // Resize the contents if needed.
slotUpdateSize();
- int w = std::max(m_segmentsLayer.width(), visibleWidth());
- int h = std::max(m_segmentsLayer.height(), visibleHeight());
+ // If the viewport has grown larger than the segments layer
+ if (e->size().width() > m_segmentsLayer.width() ||
+ e->size().height() > m_segmentsLayer.height()) {
- m_segmentsLayer = QPixmap(w, h);
- m_doubleBuffer = QPixmap(w, h);
- allNeedRefresh();
+ // Reallocate the segments layer
+ m_segmentsLayer = QPixmap(e->size().width(), e->size().height());
+ }
- RG_DEBUG << "CompositionView::resizeEvent() : segments layer size = " << m_segmentsLayer.size() << endl;
+ updateAll();
}
-void CompositionView::viewportPaintEvent(QPaintEvent* e)
+void CompositionView::paintEvent(QPaintEvent *)
{
- Profiler profiler("CompositionView::viewportPaintEvent");
-
- QVector<QRect> rects = e->region().rects();
+ Profiler profiler("CompositionView::paintEvent()");
- for (int i = 0; i < rects.size(); ++i) {
- viewportPaintRect(rects[i]);
- }
+ // Just redraw the entire viewport. Turns out that for the most
+ // critical use case, recording, this is actually slightly faster
+ // than trying to be frugal about drawing small parts of the viewport.
+ // The code is certainly easier to read.
+ drawAll();
}
-void CompositionView::viewportPaintRect(QRect r)
+void CompositionView::drawAll()
{
- Profiler profiler("CompositionView::viewportPaintRect");
-
- QRect updateRect = r;
-
- // Limit the requested rect to the viewport.
- r &= viewport()->rect();
- // Convert from viewport coords to contents coords.
- r.translate(contentsX(), contentsY());
-
-// std::cerr << "CompositionView::viewportPaintRect updateRect = "
-// << updateRect.x() << "," << updateRect.y()
-// << " " << updateRect.width() << "x" << updateRect.height()
-// << std::endl;
-
- bool scroll = false;
+ Profiler profiler("CompositionView::drawAll()");
// Scroll and refresh the segments layer.
- bool changed = scrollSegmentsLayer(r, scroll);
-
- // r is now the combination of the requested refresh rect and the refresh
- // needed by any scrolling.
-
- if (changed || m_artifactsRefresh.isValid()) {
+ scrollSegmentsLayer();
- QRect copyRect(r | m_artifactsRefresh);
- copyRect.translate(-contentsX(), -contentsY());
+ // ??? Try putting the artifacts on their own layer pixmap. This might
+ // simplify the code a bit. Should also allow us to avoid
+ // redrawing the artifacts just because the segments need to
+ // be updated. This might help the recording use case a little.
+ // ??? There are two key use cases that need to be optimized.
+ // The first is recording. This is the most important as it uses
+ // a lot of CPU (and shouldn't). The second is auto-scrolling.
+ // It's not quite as important since it is relatively rare.
-// std::cerr << "changed = " << changed << ", artrefresh " << m_artifactsRefresh.x() << "," << m_artifactsRefresh.y() << " " << m_artifactsRefresh.width() << "x" << m_artifactsRefresh.height() << ": copying from segment to artifacts buffer: " << copyRect.width() << "x" << copyRect.height() << std::endl;
+ // Copy the entire segments layer to the viewport
- // Copy the segments to the double buffer.
- QPainter ap;
- ap.begin(&m_doubleBuffer);
- ap.drawPixmap(copyRect.x(), copyRect.y(),
- m_segmentsLayer,
- copyRect.x(), copyRect.y(),
- copyRect.width(), copyRect.height());
- ap.end();
+ QRect viewportRect = viewport()->rect();
+ // Copy the segments to the viewport.
+ QPainter viewportPainter(viewport());
+ viewportPainter.drawPixmap(
+ viewportRect, m_segmentsLayer, viewportRect);
+ viewportPainter.end();
- m_artifactsRefresh |= r;
- }
-
- if (m_artifactsRefresh.isValid()) {
- // Draw the artifacts over top of the segments on the double-buffer.
- refreshArtifacts(m_artifactsRefresh);
- m_artifactsRefresh = QRect();
- }
-
- // Display the double buffer on the viewport.
-
- QPainter p;
- p.begin(viewport());
- if (scroll) {
- // Redraw the entire double buffer.
- p.drawPixmap(0, 0,
- m_doubleBuffer,
- 0, 0,
- m_doubleBuffer.width(),
- m_doubleBuffer.height());
- } else {
- p.drawPixmap(updateRect.x(), updateRect.y(),
- m_doubleBuffer,
- updateRect.x(), updateRect.y(),
- updateRect.width(), updateRect.height());
- }
- p.end();
-
- // DEBUG
-
- // QPainter pdebug(viewport());
- // static QPen framePen(QColor(Qt::red), 1);
- // pdebug.setPen(framePen);
- // pdebug.drawRect(updateRect);
+ // Redraw all of the artifacts on the viewport.
+ drawArtifacts();
}
-bool CompositionView::scrollSegmentsLayer(QRect &rect, bool& scroll)
+void CompositionView::scrollSegmentsLayer()
{
- Profiler profiler("CompositionView::scrollSegmentsLayer");
+ Profiler profiler("CompositionView::scrollSegmentsLayer()");
- bool all = false;
+ // Portion of the segments layer that needs to be redrawn.
QRect refreshRect = m_segmentsRefresh;
- int w = visibleWidth(), h = visibleHeight();
- int cx = contentsX(), cy = contentsY();
+ const int w = viewport()->width();
+ const int h = viewport()->height();
+ const int cx = contentsX();
+ const int cy = contentsY();
+ // The entire viewport in contents coords.
+ const QRect viewportContentsRect(cx, cy, w, h);
- scroll = (cx != m_lastBufferRefreshX || cy != m_lastBufferRefreshY);
+ bool scroll = (cx != m_lastContentsX || cy != m_lastContentsY);
if (scroll) {
- //RG_DEBUG << "scrollSegmentsLayer: scrolling by ("
- // << cx - m_lastBufferRefreshX << "," << cy - m_lastBufferRefreshY << ")" << endl;
+ // ??? All this scroll optimization saves about 7% cpu on my
+ // machine when auto-scrolling the BWV1048 example. Doesn't
+ // seem worth the extra code.
if (refreshRect.isValid()) {
@@ -682,38 +498,24 @@ bool CompositionView::scrollSegmentsLayer(QRect &rect, bool& scroll)
// predated or postdated the internal update of scroll
// location. Cut our losses and refresh everything.
- refreshRect.setRect(cx, cy, w, h);
+ refreshRect = viewportContentsRect;
} else {
// No existing refresh rect: we only need to handle the
- // scroll. Formerly we dealt with this by copying part of
- // the pixmap to itself, but that only worked by accident,
- // and it fails with the raster renderer or on non-X11
- // platforms. Use a temporary pixmap instead
-
- static QPixmap map;
- if (map.size() != m_segmentsLayer.size()) {
- map = QPixmap(m_segmentsLayer.size());
- }
+ // scroll.
- // If we're scrolling sideways
- if (cx != m_lastBufferRefreshX) {
+ // Horizontal scroll distance
+ int dx = m_lastContentsX - cx;
- // compute the delta
- int dx = m_lastBufferRefreshX - cx;
+ // If we're scrolling horizontally
+ if (dx != 0) {
// If we're scrolling less than the entire viewport
- if (dx > -w && dx < w) {
+ if (abs(dx) < w) {
// Scroll the segments layer sideways
- QPainter cp;
- cp.begin(&map);
- cp.drawPixmap(0, 0, m_segmentsLayer);
- cp.end();
- cp.begin(&m_segmentsLayer);
- cp.drawPixmap(dx, 0, map);
- cp.end();
+ m_segmentsLayer.scroll(dx, 0, m_segmentsLayer.rect());
// Add the part that was exposed to the refreshRect
if (dx < 0) {
@@ -725,29 +527,22 @@ bool CompositionView::scrollSegmentsLayer(QRect &rect, bool& scroll)
} else { // We've scrolled more than the entire viewport
// Refresh everything
- refreshRect.setRect(cx, cy, w, h);
- all = true;
+ refreshRect = viewportContentsRect;
}
}
+ // Vertical scroll distance
+ int dy = m_lastContentsY - cy;
+
// If we're scrolling vertically and the sideways scroll didn't
// result in a need to refresh everything,
- if (cy != m_lastBufferRefreshY && !all) {
-
- // compute the delta
- int dy = m_lastBufferRefreshY - cy;
+ if (dy != 0 && refreshRect != viewportContentsRect) {
// If we're scrolling less than the entire viewport
- if (dy > -h && dy < h) {
+ if (abs(dy) < h) {
// Scroll the segments layer vertically
- QPainter cp;
- cp.begin(&map);
- cp.drawPixmap(0, 0, m_segmentsLayer);
- cp.end();
- cp.begin(&m_segmentsLayer);
- cp.drawPixmap(0, dy, map);
- cp.end();
+ m_segmentsLayer.scroll(0, dy, m_segmentsLayer.rect());
// Add the part that was exposed to the refreshRect
if (dy < 0) {
@@ -759,176 +554,56 @@ bool CompositionView::scrollSegmentsLayer(QRect &rect, bool& scroll)
} else { // We've scrolled more than the entire viewport
// Refresh everything
- refreshRect.setRect(cx, cy, w, h);
- all = true;
+ refreshRect = viewportContentsRect;
}
}
}
}
- // Refresh the segments layer for the exposed portion.
-
- bool needRefresh = false;
+ m_lastContentsX = cx;
+ m_lastContentsY = cy;
+ // If we need to redraw the segments layer, do so.
if (refreshRect.isValid()) {
- needRefresh = true;
+ // Refresh the segments layer
+ drawSegments(refreshRect);
+ m_segmentsRefresh = QRect();
}
-
- if (needRefresh)
- refreshSegments(refreshRect);
-
- // ??? Move these lines to the end of refreshSegments()?
- // Or do they still need to run even when needRefresh is false?
- m_segmentsRefresh = QRect();
- m_lastBufferRefreshX = cx;
- m_lastBufferRefreshY = cy;
-
- // Compute the final rect for the caller.
-
- rect |= refreshRect;
- if (scroll)
- rect.setRect(cx, cy, w, h); // everything
-
- return needRefresh;
}
-void CompositionView::refreshSegments(const QRect& rect)
+void CompositionView::drawSegments(const QRect &clipRect)
{
- Profiler profiler("CompositionView::refreshSegments");
-
- //RG_DEBUG << "CompositionView::refreshSegments() r = "
- // << rect << endl;
-
-//### This constructor used to mean "start painting on the segments layer, taking your default paint configuration from the viewport". I don't think it's supported any more -- I had to look it up (I'd never known it was possible to do this in the first place!)
-//@@@ QPainter p(&m_segmentsLayer, viewport());
-// Let's see how we get on with:
- QPainter p(&m_segmentsLayer);
+ Profiler profiler("CompositionView::drawSegments(clipRect)");
- p.setRenderHint(QPainter::Antialiasing, false);
+ QPainter segmentsLayerPainter(&m_segmentsLayer);
+ // Switch to contents coords.
+ segmentsLayerPainter.translate(-contentsX(), -contentsY());
- p.translate( -contentsX(), -contentsY());
+ // *** Draw the background
if (!m_backgroundPixmap.isNull()) {
- QPoint pp(rect.x() % m_backgroundPixmap.height(), rect.y() % m_backgroundPixmap.width());
- p.drawTiledPixmap(rect, m_backgroundPixmap, pp);
+ QPoint offset(
+ clipRect.x() % m_backgroundPixmap.height(),
+ clipRect.y() % m_backgroundPixmap.width());
+ segmentsLayerPainter.drawTiledPixmap(
+ clipRect, m_backgroundPixmap, offset);
} else {
- p.eraseRect(rect);
+ segmentsLayerPainter.eraseRect(clipRect);
}
- drawSegments(&p, rect);
-
- // DEBUG - show what's updated
- // QPen framePen(QColor(Qt::red), 1);
- // p.setPen(framePen);
- // p.drawRect(rect);
-
- // m_segmentsNeedRefresh = false;
-}
-
-void CompositionView::refreshArtifacts(const QRect& rect)
-{
- Profiler profiler("CompositionView::refreshArtifacts");
-
- //RG_DEBUG << "CompositionView::refreshArtifacts() r = "
- // << rect << endl;
-
- QPainter p;
-
-//@@@ see comment in refreshSegments p.begin(&m_doubleBuffer, viewport());
- p.begin(&m_doubleBuffer);
-
- p.translate( -contentsX(), -contentsY());
- // QRect r(contentsX(), contentsY(), m_doubleBuffer.width(), m_doubleBuffer.height());
- drawArtifacts(&p, rect);
- p.end();
-
- // m_artifactsNeedRefresh = false;
-}
-
-void CompositionView::drawSegments(QPainter *segmentLayerPainter, const QRect &clipRect)
-{
- Profiler profiler("CompositionView::drawSegments");
-
- //RG_DEBUG << "CompositionView::drawSegments() clipRect = " << clipRect;
-
- // *** Track Dividers
+ // *** Draw the track dividers
- // Fetch track Y coordinates within the clip rectangle. We expand the
- // clip rectangle slightly because we are drawing a rather wide track
- // divider, so we need enough divider coords to do the drawing even
- // though the center of the divider might be slightly outside of the
- // viewport.
- // This is not a height list.
- CompositionModelImpl::YCoordList trackYCoords =
- getModel()->getTrackDividersIn(clipRect.adjusted(0,-1,0,+1));
-
- if (!trackYCoords.empty()) {
-
- Profiler profiler("CompositionView::drawSegments: dividing lines");
-
- segmentLayerPainter->save();
-
- // Select the lighter (middle) divider color.
- QColor light = m_trackDividerColor.light();
- segmentLayerPainter->setPen(light);
-
- // For each track Y coordinate, draw the two light lines in the middle
- // of the track divider.
- for (CompositionModelImpl::YCoordList::const_iterator yi = trackYCoords.begin();
- yi != trackYCoords.end(); ++yi) {
- // Upper line.
- int y = *yi - 1;
- // If it's in the clipping area, draw it
- if (y >= clipRect.top() && y <= clipRect.bottom()) {
- segmentLayerPainter->drawLine(
- clipRect.left(), y,
- clipRect.right(), y);
- }
- // Lower line.
- ++y;
- if (y >= clipRect.top() && y <= clipRect.bottom()) {
- segmentLayerPainter->drawLine(
- clipRect.left(), y,
- clipRect.right(), y);
- }
- }
-
- // Switch to the darker divider color.
- segmentLayerPainter->setPen(m_trackDividerColor);
-
- // For each track Y coordinate, draw the two dark lines on the outside
- // of the track divider.
- for (CompositionModelImpl::YCoordList::const_iterator yi = trackYCoords.begin();
- yi != trackYCoords.end(); ++yi) {
- // Upper line
- int y = *yi - 2;
- if (y >= clipRect.top() && y <= clipRect.bottom()) {
- segmentLayerPainter->drawLine(
- clipRect.x(), y,
- clipRect.x() + clipRect.width() - 1, y);
- }
- // Lower line
- y += 3;
- if (y >= clipRect.top() && y <= clipRect.bottom()) {
- segmentLayerPainter->drawLine(
- clipRect.x(), y,
- clipRect.x() + clipRect.width() - 1, y);
- }
- }
-
- segmentLayerPainter->restore();
- }
+ drawTrackDividers(&segmentsLayerPainter, clipRect);
// *** Get Segment and Preview Rectangles
// Assume we aren't going to show previews.
- CompositionModelImpl::RectRanges *notationPreview = 0;
- CompositionModelImpl::AudioPreviewDrawData *audioPreview = 0;
+ CompositionModelImpl::NotationPreviewRanges *notationPreview = 0;
+ CompositionModelImpl::AudioPreviews *audioPreview = 0;
if (m_showPreviews) {
- // Clear the previews. Apparently getSegmentRects() will not.
- // Given that this is the only caller, this should be moved into
- // getSegmentRects().
+ // Clear the previews.
+ // ??? Move this clearing into CompositionModelImpl::getSegmentRects()?
m_notationPreview.clear();
m_audioPreview.clear();
@@ -937,907 +612,828 @@ void CompositionView::drawSegments(QPainter *segmentLayerPainter, const QRect &c
audioPreview = &m_audioPreview;
}
- // Fetch segment rectangles and (optionally) previews
- const CompositionModelImpl::RectContainer &segmentRects =
- getModel()->getSegmentRects(clipRect, notationPreview, audioPreview);
+ CompositionModelImpl::SegmentRects segmentRects;
- CompositionModelImpl::RectContainer::const_iterator end = segmentRects.end();
+ // Fetch segment rectangles and (optionally) previews
+ m_model->getSegmentRects(clipRect, &segmentRects, notationPreview, audioPreview);
// *** Draw Segment Rectangles
- {
- Profiler profiler("CompositionView::drawSegments(): segment rectangles");
-
- segmentLayerPainter->save();
-
- // For each segment rectangle, draw it
- for (CompositionModelImpl::RectContainer::const_iterator i = segmentRects.begin();
- i != end; ++i) {
- segmentLayerPainter->setBrush(i->getBrush());
- segmentLayerPainter->setPen(i->getPen());
+ // For each segment rectangle, draw it
+ for (CompositionModelImpl::SegmentRects::const_iterator i = segmentRects.begin();
+ i != segmentRects.end(); ++i) {
- //RG_DEBUG << "CompositionView::drawSegments : draw comp rect " << *i << endl;
- drawCompRect(*i, segmentLayerPainter, clipRect);
- }
-
- segmentLayerPainter->restore();
+ drawCompRect(&segmentsLayerPainter, clipRect, *i);
}
- {
- Profiler profiler("CompositionView::drawSegments(): intersections");
-
- if (segmentRects.size() > 1) {
- //RG_DEBUG << "CompositionView::drawSegments : drawing intersections\n";
- drawIntersections(segmentRects, segmentLayerPainter, clipRect);
- }
- }
+ drawIntersections(&segmentsLayerPainter, clipRect, segmentRects);
// *** Draw Segment Previews
if (m_showPreviews) {
- segmentLayerPainter->save();
+ // We'll be modifying the transform. save()/restore() to be safe.
+ segmentsLayerPainter.save();
// Audio Previews
- {
- Profiler profiler("CompositionView::drawSegments: audio previews");
-
- drawAudioPreviews(segmentLayerPainter, clipRect);
- }
+ drawAudioPreviews(&segmentsLayerPainter, clipRect);
// Notation Previews
- Profiler profiler("CompositionView::drawSegments: note previews");
-
- CompositionModelImpl::RectRanges::const_iterator npi = m_notationPreview.begin();
- CompositionModelImpl::RectRanges::const_iterator npEnd = m_notationPreview.end();
-
- // For each preview range
- // ??? I think there is never more than one range here. We should be
- // able to switch from RectRanges to RectRange.
- for (; npi != npEnd; ++npi) {
- CompositionModelImpl::RectRange interval = *npi;
- segmentLayerPainter->save();
- segmentLayerPainter->translate(
- interval.basePoint.x(), interval.basePoint.y());
- //RG_DEBUG << "CompositionView::drawSegments : translating to x = " << interval.basePoint.x() << endl;
-
- // For each event rectangle
- for (; interval.range.first != interval.range.second; ++interval.range.first) {
- const QRect &pr = *(interval.range.first);
- QColor defaultCol = CompositionColourCache::getInstance()->SegmentInternalPreview;
- QColor col = interval.color.isValid() ? interval.color : defaultCol;
- segmentLayerPainter->setBrush(col);
- segmentLayerPainter->setPen(QPen(col, 0));
- //RG_DEBUG << "CompositionView::drawSegments : drawing preview rect at x = " << pr.x() << endl;
- segmentLayerPainter->drawRect(pr);
+ QColor defaultColor = CompositionColourCache::getInstance()->SegmentInternalPreview;
+
+ // For each segment's preview range
+ for (CompositionModelImpl::NotationPreviewRanges::const_iterator notationPreviewIter =
+ m_notationPreview.begin();
+ notationPreviewIter != m_notationPreview.end();
+ ++notationPreviewIter) {
+
+ const CompositionModelImpl::NotationPreviewRange ¬ationPreviewRange =
+ *notationPreviewIter;
+
+ QColor color = notationPreviewRange.color.isValid() ?
+ notationPreviewRange.color : defaultColor;
+
+ // translate() calls are cumulative, so we need to be able to get
+ // back to where we were. Note that resetTransform() would be
+ // too extreme as it would reverse the contents translation that
+ // is present in segmentsLayerPainter at this point in time.
+ segmentsLayerPainter.save();
+ // Adjust the coordinate system to account for any segment
+ // move offset and the vertical position of the segment.
+ segmentsLayerPainter.translate(
+ notationPreviewRange.moveXOffset,
+ notationPreviewRange.segmentTop);
+
+ // For each event rectangle, draw it.
+ for (CompositionModelImpl::NotationPreview::const_iterator i =
+ notationPreviewRange.begin;
+ i != notationPreviewRange.end;
+ ++i) {
+
+ QRect eventRect = *i;
+ // Make the rect thicker vertically to match the old
+ // appearance. Without this, the rect is thin, which gives
+ // slightly more information.
+ // Also make the rect longer to close the gaps between the
+ // events. This is in keeping with the old appearance.
+ eventRect.adjust(0,0,1,1);
+
+ // Per the Qt docs, fillRect() should be faster than
+ // drawRect(). In practice, a small improvement was noted.
+ segmentsLayerPainter.fillRect(eventRect, color);
}
- segmentLayerPainter->restore();
+ // Restore the transformation.
+ segmentsLayerPainter.restore();
}
- segmentLayerPainter->restore();
+ segmentsLayerPainter.restore();
}
// *** Draw Segment Labels
- //
- // Draw segment labels (they must be drawn over the preview rects)
- //
if (m_showSegmentLabels) {
- Profiler profiler("CompositionView::drawSegments: labels");
- for (CompositionModelImpl::RectContainer::const_iterator i = segmentRects.begin();
- i != end; ++i) {
- drawCompRectLabel(*i, segmentLayerPainter, clipRect);
+ // For each segment rect, draw the label
+ for (CompositionModelImpl::SegmentRects::const_iterator i = segmentRects.begin();
+ i != segmentRects.end(); ++i) {
+
+ drawCompRectLabel(&segmentsLayerPainter, *i);
}
}
-
- // drawArtifacts(p, clipRect);
-
}
-void CompositionView::drawAudioPreviews(QPainter * p, const QRect& clipRect)
+void CompositionView::drawArtifacts()
{
- Profiler profiler("CompositionView::drawAudioPreviews");
-
- CompositionModelImpl::AudioPreviewDrawData::const_iterator api = m_audioPreview.begin();
- CompositionModelImpl::AudioPreviewDrawData::const_iterator apEnd = m_audioPreview.end();
- QRect rectToFill, // rect to fill on canvas
- localRect; // the rect of the tile to draw on the canvas
- QPoint basePoint, // origin of segment rect
- drawBasePoint; // origin of rect to fill on canvas
- QRect r;
- for (; api != apEnd; ++api) {
- rectToFill = api->rect;
- basePoint = api->basePoint;
- rectToFill.moveTopLeft(basePoint);
- rectToFill &= clipRect;
- r = rectToFill;
- drawBasePoint = rectToFill.topLeft();
- rectToFill.translate( -basePoint.x(), -basePoint.y());
- int firstPixmapIdx = (r.x() - basePoint.x()) / AudioPreviewPainter::tileWidth();
- if (firstPixmapIdx >= int(api->pixmap.size())) {
- //RG_DEBUG << "CompositionView::drawAudioPreviews : WARNING - miscomputed pixmap array : r.x = "
- // << r.x() << " - basePoint.x = " << basePoint.x() << " - firstPixmapIdx = " << firstPixmapIdx
- // << endl;
- continue;
- }
- int x = 0, idx = firstPixmapIdx;
- //RG_DEBUG << "CompositionView::drawAudioPreviews : clipRect = " << clipRect
- // << " - firstPixmapIdx = " << firstPixmapIdx << endl;
- while (x < clipRect.width()) {
- int pixmapRectXOffset = idx * AudioPreviewPainter::tileWidth();
- localRect.setRect(basePoint.x() + pixmapRectXOffset, basePoint.y(),
- AudioPreviewPainter::tileWidth(), api->rect.height());
- //RG_DEBUG << "CompositionView::drawAudioPreviews : initial localRect = "
- // << localRect << endl;
- localRect &= r;
- if (idx == firstPixmapIdx && api->resizeOffset != 0) {
- // this segment is being resized from start, clip beginning of preview
- localRect.translate(api->resizeOffset, 0);
- }
+ Profiler profiler("CompositionView::drawArtifacts()");
- //RG_DEBUG << "CompositionView::drawAudioPreviews : localRect & clipRect = "
- // << localRect << endl;
- if (localRect.isEmpty()) {
- //RG_DEBUG << "CompositionView::drawAudioPreviews : localRect & clipRect is empty\n";
- break;
- }
- localRect.translate( -(basePoint.x() + pixmapRectXOffset), -basePoint.y());
-
- //RG_DEBUG << "CompositionView::drawAudioPreviews : drawing pixmap "
- // << idx << " at " << drawBasePoint << " - localRect = " << localRect
- // << " - preResizeOrigin : " << api->preResizeOrigin << endl;
-
- p->drawImage(drawBasePoint, api->pixmap[idx], localRect,
- Qt::ColorOnly | Qt::ThresholdDither | Qt::AvoidDither);
+ // The entire viewport in contents coords.
+ QRect viewportContentsRect(
+ contentsX(), contentsY(),
+ viewport()->rect().width(), viewport()->rect().height());
- ++idx;
- if (idx >= int(api->pixmap.size()))
- break;
- drawBasePoint.setX(drawBasePoint.x() + localRect.width());
- x += localRect.width();
- }
- }
-}
+ QPainter viewportPainter(viewport());
+ // Switch to contents coords.
+ viewportPainter.translate(-contentsX(), -contentsY());
-void CompositionView::drawArtifacts(QPainter * p, const QRect& clipRect)
-{
//
// Playback Pointer
//
- drawPointer(p, clipRect);
+ viewportPainter.setPen(m_pointerPen);
+ viewportPainter.drawLine(m_pointerPos, 0, m_pointerPos, contentsHeight() - 1);
//
- // Tmp rect (rect displayed while drawing a new segment)
+ // New Segment (SegmentPencil)
//
- if (m_tmpRect.isValid() && m_tmpRect.intersects(clipRect)) {
- p->setBrush(m_tmpRectFill);
- p->setPen(CompositionColourCache::getInstance()->SegmentBorder);
- drawRect(m_tmpRect, p, clipRect);
+ if (m_newSegmentRect.isValid() &&
+ m_newSegmentRect.intersects(viewportContentsRect)) {
+
+ viewportPainter.setPen(CompositionColourCache::getInstance()->SegmentBorder);
+ viewportPainter.setBrush(m_newSegmentColor);
+ drawRect(&viewportPainter, viewportContentsRect, m_newSegmentRect);
}
//
// Tool guides (crosshairs)
//
- if (m_drawGuides)
- drawGuides(p, clipRect);
+ if (m_drawGuides) {
+ viewportPainter.setPen(m_guideColor);
+ // Vertical Guide
+ viewportPainter.drawLine(m_guideX, 0, m_guideX, contentsHeight() - 1);
+ // Horizontal Guide
+ viewportPainter.drawLine(0, m_guideY, contentsWidth() - 1, m_guideY);
+ }
//
- // Selection Rect
+ // Selection Rect (rubber band)
//
if (m_drawSelectionRect) {
- //RG_DEBUG << "about to draw selection rect" << endl;
- drawRect(m_selectionRect.normalized(), p, clipRect, false, 0, false);
+ viewportPainter.save();
+
+ viewportPainter.setPen(CompositionColourCache::getInstance()->SegmentBorder);
+ viewportPainter.setBrush(Qt::NoBrush);
+ viewportPainter.drawRect(m_selectionRect);
+
+ viewportPainter.restore();
}
//
// Floating Text
//
if (m_drawTextFloat)
- drawTextFloat(p, clipRect);
+ drawTextFloat(&viewportPainter);
//
// Split line
//
- if (m_splitLinePos.x() > 0 && clipRect.contains(m_splitLinePos)) {
- p->save();
- p->setPen(m_guideColor);
- p->drawLine(m_splitLinePos.x(), m_splitLinePos.y(),
- m_splitLinePos.x(), m_splitLinePos.y() + getModel()->grid().getYSnap());
- p->restore();
+ if (m_splitLinePos.x() > 0) {
+ viewportPainter.setPen(m_guideColor);
+ viewportPainter.drawLine(m_splitLinePos.x(), m_splitLinePos.y(),
+ m_splitLinePos.x(), m_splitLinePos.y() + m_model->grid().getYSnap());
}
}
-void CompositionView::drawGuides(QPainter * p, const QRect& /*clipRect*/)
+void CompositionView::drawTrackDividers(
+ QPainter *segmentsLayerPainter, const QRect &clipRect)
{
- // no need to check for clipping, these guides are meant to follow the mouse cursor
- QPoint guideOrig(m_topGuidePos, m_foreGuidePos);
-
- int contentsHeight = this->contentsHeight();
- int contentsWidth = this->contentsWidth();
-// int contentsHeight = this->widget()->height(); //@@@
-// int contentsWidth = this->widget()->width();
-
- p->save();
- p->setPen(m_guideColor);
- p->drawLine(guideOrig.x(), 0, guideOrig.x(), contentsHeight);
- p->drawLine(0, guideOrig.y(), contentsWidth, guideOrig.y());
- p->restore();
+ // Fetch track Y coordinates within the clip rectangle. We expand the
+ // clip rectangle slightly because we are drawing a rather wide track
+ // divider, so we need enough divider coords to do the drawing even
+ // though the center of the divider might be slightly outside of the
+ // viewport.
+ CompositionModelImpl::YCoordVector trackYCoords =
+ m_model->getTrackYCoords(clipRect.adjusted(0,-1,0,+1));
+
+ // Nothing to do? Bail.
+ if (trackYCoords.empty())
+ return;
+
+ const int left = clipRect.left();
+ const int right = clipRect.right();
+
+ segmentsLayerPainter->save();
+
+ // For each track Y coordinate
+ for (CompositionModelImpl::YCoordVector::const_iterator yi =
+ trackYCoords.begin();
+ yi != trackYCoords.end();
+ ++yi) {
+
+ int y = *yi - 2;
+ segmentsLayerPainter->setPen(m_trackDividerColor);
+ segmentsLayerPainter->drawLine(left, y, right, y);
+
+ ++y;
+ segmentsLayerPainter->setPen(m_trackDividerColor.light());
+ segmentsLayerPainter->drawLine(left, y, right, y);
+
+ ++y;
+ segmentsLayerPainter->setPen(m_trackDividerColor.light());
+ segmentsLayerPainter->drawLine(left, y, right, y);
+
+ ++y;
+ segmentsLayerPainter->setPen(m_trackDividerColor);
+ segmentsLayerPainter->drawLine(left, y, right, y);
+ }
+
+ segmentsLayerPainter->restore();
}
-void CompositionView::drawCompRect(const CompositionRect& r, QPainter *p, const QRect& clipRect,
- int intersectLvl, bool fill)
+void CompositionView::drawImage(
+ QPainter *painter,
+ QPoint dest, const CompositionModelImpl::QImageVector &tileVector,
+ QRect source)
{
- p->save();
+ // ??? This is an awful lot of complexity to accommodate the tiling
+ // of the audio previews. Why are they tiled? Can they be
+ // untiled so that all of this would reduce to a single drawImage()?
- QBrush brush = r.getBrush();
+ // No tiles? Bail.
+ if (tileVector.empty())
+ return;
- if (r.isRepeating()) {
- QColor brushColor = brush.color();
- brush.setColor(brushColor.light(150));
- }
+ int tileWidth = AudioPreviewPainter::tileWidth();
- p->setBrush(brush);
- p->setPen(r.getPen());
- drawRect(r, p, clipRect, r.isSelected(), intersectLvl, fill);
+ int firstTile = source.left() / tileWidth;
+ int firstTileStartX = source.left() % tileWidth;
+ int lastTile = source.right() / tileWidth;
+ int lastTileStopX = source.right() % tileWidth;
- if (r.isRepeating()) {
+ if (firstTile < 0 || lastTile < 0)
+ return;
- CompositionRect::repeatmarks repeatMarks = r.getRepeatMarks();
+ // Most likely, the source rect needs normalizing.
+ if (lastTile < firstTile)
+ return;
- //RG_DEBUG << "CompositionView::drawCompRect() : drawing repeating rect " << r
- // << " nb repeat marks = " << repeatMarks.size() << endl;
+ // If we are starting beyond the available tiles, bail.
+ if (firstTile >= (int)tileVector.size())
+ return;
- // draw 'start' rectangle with original brush
- //
- QRect startRect = r;
- startRect.setWidth(repeatMarks[0] - r.x());
- p->setBrush(r.getBrush());
- drawRect(startRect, p, clipRect, r.isSelected(), intersectLvl, fill);
+ // If we are ending beyond the available tiles
+ if (lastTile >= (int)tileVector.size()) {
+ // Stop at the last.
+ lastTile = (int)tileVector.size() - 1;
+ lastTileStopX = tileWidth - 1;
+ }
+ // Special case: Drawing from a single tile.
+ if (firstTile == lastTile) {
+ QRect tileSource = source; // get top, bottom, and width
+ tileSource.setLeft(source.left() - tileWidth * firstTile);
+ painter->drawImage(dest, tileVector[firstTile], tileSource);
+ return;
+ }
- // now draw the 'repeat' marks
- //
- p->setPen(CompositionColourCache::getInstance()->RepeatSegmentBorder);
- int penWidth = int(std::max((unsigned int)r.getPen().width(), 1u));
+ // *** First Tile
- for (int i = 0; i < repeatMarks.size(); ++i) {
- int pos = repeatMarks[i];
- if (pos > clipRect.right())
- break;
+ QRect firstTileSource = source; // get the top and bottom
+ firstTileSource.setLeft(firstTileStartX);
+ firstTileSource.setRight(tileWidth - 1);
+ painter->drawImage(dest, tileVector[firstTile], firstTileSource);
+ dest.setX(dest.x() + firstTileSource.width());
- if (pos >= clipRect.left()) {
- QPoint p1(pos, r.y() + penWidth),
- p2(pos, r.y() + r.height() - penWidth - 1);
+ // *** Middle Tile(s)
- //RG_DEBUG << "CompositionView::drawCompRect() : drawing repeat mark at "
- // << p1 << "-" << p2 << endl;
- p->drawLine(p1, p2);
- }
+ int firstMiddleTile = firstTile + 1;
+ int lastMiddleTile = lastTile - 1;
- }
+ // An entire tile
+ QRect tileRect(source.x(), source.y(), tileWidth, source.height());
+ // for each middle tile
+ for (int tile = firstMiddleTile; tile <= lastMiddleTile; ++tile) {
+ // draw the middle tile entirely
+ painter->drawImage(dest, tileVector[tile], tileRect);
+ dest.setX(dest.x() + tileRect.width());
}
- p->restore();
+ // *** Last Tile
+
+ QRect lastTileSource = source; // get the top and bottom
+ lastTileSource.setLeft(0);
+ lastTileSource.setRight(lastTileStopX);
+ painter->drawImage(dest, tileVector[lastTile], lastTileSource);
}
-void CompositionView::drawCompRectLabel(const CompositionRect& r, QPainter *p, const QRect& /* clipRect */)
+void CompositionView::drawAudioPreviews(
+ QPainter *segmentsLayerPainter, const QRect &clipRect)
{
- // draw segment label
- //
- if (!r.getLabel().isEmpty()) {
+ Profiler profiler("CompositionView::drawAudioPreviews");
+
+ // for each audio preview
+ for (CompositionModelImpl::AudioPreviews::const_iterator audioPreviewIter = m_audioPreview.begin();
+ audioPreviewIter != m_audioPreview.end();
+ ++audioPreviewIter) {
+
+ const CompositionModelImpl::AudioPreview &audioPreviewDrawDataItem = *audioPreviewIter;
+
+ // If this one isn't in the clip rect, try the next.
+ if (!audioPreviewDrawDataItem.rect.intersects(clipRect))
+ continue;
- p->save();
+ QPoint destPoint = audioPreviewDrawDataItem.rect.topLeft();
+ QRect sourceRect = audioPreviewDrawDataItem.rect;
+ // Translate contents coords to preview coords.
+ sourceRect.moveTo(0,0);
- QFont font;
- font.setPixelSize(r.height() / 2.2);
- font.setWeight(QFont::Bold);
- font.setItalic(false);
- p->setFont(font);
+ // If the beginning is being resized to the right, clip the preview
+ if (audioPreviewDrawDataItem.resizeOffset > 0)
+ sourceRect.setLeft(audioPreviewDrawDataItem.resizeOffset);
- QRect labelRect = QRect
- (r.x(),
- r.y() + ((r.height() - p->fontMetrics().height()) / 2) + 1,
- r.width(),
- p->fontMetrics().height());
+ // draw the preview
+ drawImage(segmentsLayerPainter,
+ destPoint,
+ audioPreviewDrawDataItem.image,
+ sourceRect);
+ }
+}
- int x = labelRect.x() + p->fontMetrics().width('x');
- int y = labelRect.y();
+void CompositionView::drawCompRect(
+ QPainter *painter,
+ const QRect &clipRect,
+ const SegmentRect &rect,
+ int intersectLvl)
+{
+ // Non repeating case, just draw the segment rect.
+ if (!rect.isRepeating()) {
+ painter->save();
- // get the segment color as the foundation for drawing the surrounding
- // "halo" to ensure contrast against any preview dashes that happen to
- // be present right under the label
- QBrush brush = r.getBrush();
+ painter->setBrush(rect.brush);
+ painter->setPen(rect.pen);
+ drawRect(painter, clipRect, rect.rect, rect.selected, intersectLvl);
- // figure out the intensity of this base color, Yves style
- QColor surroundColor = brush.color();
- int intensity = qGray(surroundColor.rgb());
+ painter->restore();
- bool lightSurround = false;
+ return;
+ }
- // straight black or white as originally rewritten was too stark, so we
- // go back to using lighter() against the base color, and this time we
- // use darker() against the base color too
- if (intensity < 127) {
- surroundColor = surroundColor.darker(100);
- } else {
- surroundColor = surroundColor.lighter(100);
- lightSurround = true;
- }
+ // Repeating case.
- // draw the "halo" effect
- p->setPen(surroundColor);
+ painter->save();
- for (int i = 0; i < 9; ++i) {
+ // *** Base Segment
- if (i == 4)
- continue;
+ QRect baseRect = rect.rect;
+ baseRect.setWidth(rect.baseWidth);
- int wx = x, wy = y;
+ painter->setPen(rect.pen);
+ painter->setBrush(rect.brush);
+ drawRect(painter, clipRect, baseRect, rect.selected, intersectLvl);
- if (i < 3)
- --wx;
- if (i > 5)
- ++wx;
- if (i % 3 == 0)
- --wy;
- if (i % 3 == 2)
- ++wy;
+ // *** Repeat Area
- labelRect.setX(wx);
- labelRect.setY(wy);
+ // ??? COPY.
+ SegmentRect::RepeatMarks repeatMarksX = rect.repeatMarks;
+ QRect repeatRect = rect.rect;
+ repeatRect.setLeft(repeatMarksX[0]);
- p->drawText(labelRect,
- Qt::AlignLeft | Qt::AlignTop,
- r.getLabel());
- }
+ // The repeat area is lighter.
+ QBrush repeatBrush(rect.brush.color().lighter(150));
- labelRect.setX(x);
- labelRect.setY(y);
+ painter->setBrush(repeatBrush);
+ drawRect(painter, clipRect, repeatRect, rect.selected, intersectLvl);
- // use black on light halo, white on dark halo for the text itself
- p->setPen((lightSurround ? Qt::black : Qt::white));
+ // *** Repeat Marks
- p->drawText(labelRect,
- Qt::AlignLeft | Qt::AlignVCenter, r.getLabel());
- p->restore();
+ painter->setPen(CompositionColourCache::getInstance()->RepeatSegmentBorder);
+
+ // For each repeat mark, draw it.
+ for (size_t i = 0; i < repeatMarksX.size(); ++i) {
+ int x = repeatMarksX[i];
+ painter->drawLine(x, rect.rect.top(), x, rect.rect.bottom());
}
+
+ painter->restore();
}
-void CompositionView::drawRect(const QRect& r, QPainter *p, const QRect& clipRect,
- bool isSelected, int intersectLvl, bool fill)
+void CompositionView::drawCompRectLabel(
+ QPainter *painter, const SegmentRect &rect)
{
- //RG_DEBUG << "CompositionView::drawRect : intersectLvl = " << intersectLvl
- // << " - brush col = " << p->brush().color() << endl;
+ // No label? Bail.
+ if (rect.label.isEmpty())
+ return;
- //RG_DEBUG << "CompositionView::drawRect " << r << " - xformed : " << p->xForm(r)
- // << " - contents x = " << contentsX() << ", contents y = " << contentsY() << endl;
+ painter->save();
- p->save();
+ // Pick a font that will fit nicely within a segment rect.
+ QFont font;
+ font.setPixelSize(rect.rect.height() / 2.2);
+ font.setWeight(QFont::Bold);
+ painter->setFont(font);
- QRect rect = r;
- rect.setSize(rect.size() - QSize(1, 1));
-
- //RG_DEBUG << "drawRect: rect is " << rect << endl;
-
- if (fill) {
- if (isSelected) {
- QColor fillColor = p->brush().color();
- fillColor = fillColor.dark(200);
- QBrush b = p->brush();
- b.setColor(fillColor);
- p->setBrush(b);
- //RG_DEBUG << "CompositionView::drawRect : selected color : " << fillColor << endl;
- }
+ QRect labelRect = rect.rect;
+ // Add a one character left margin. Add a one pixel top margin to
+ // make the text look a little more centered vertically.
+ labelRect.adjust(painter->fontMetrics().width('x'), 1, 0, 0);
- if (intersectLvl > 0) {
- QColor fillColor = p->brush().color();
- fillColor = fillColor.dark((intersectLvl) * 105);
- QBrush b = p->brush();
- b.setColor(fillColor);
- p->setBrush(b);
- //RG_DEBUG << "CompositionView::drawRect : intersected color : " << fillColor << " isSelected : " << isSelected << endl;
- }
- } else {
- p->setBrush(Qt::NoBrush);
+ QColor backgroundColor = rect.brush.color();
+
+ // *** Draw the halo
+
+ painter->setPen(backgroundColor);
+
+ // For each halo offset, draw the text
+ for (unsigned i = 0; i < m_haloOffsets.size(); ++i) {
+ painter->drawText(labelRect.translated(m_haloOffsets[i]),
+ Qt::AlignLeft | Qt::AlignVCenter,
+ rect.label);
}
- // Paint using the small coordinates...
- QRect intersection = rect.intersected(clipRect);
+ // *** Draw the text
- if (clipRect.contains(rect)) {
- //RG_DEBUG << "note: drawing whole rect" << endl;
- p->drawRect(rect);
- } else {
- // draw only what's necessary
- if (!intersection.isEmpty() && fill)
- p->fillRect(intersection, p->brush());
+ const bool lightBackground = (qGray(backgroundColor.rgb()) >= 127);
+ // Based on the background, pick a contrasting pen.
+ painter->setPen(lightBackground ? Qt::black : Qt::white);
+ painter->drawText(labelRect,
+ Qt::AlignLeft | Qt::AlignVCenter, rect.label);
- int rectTopY = rect.y();
+ painter->restore();
+}
- if (rectTopY >= clipRect.y() &&
- rectTopY <= (clipRect.y() + clipRect.height() - 1)) {
- // to prevent overflow, in case the original rect is too wide
- // the line would be drawn "backwards"
- p->drawLine(intersection.topLeft(), intersection.topRight());
- }
+void CompositionView::drawRect(QPainter *p, const QRect &clipRect,
+ const QRect &r, bool isSelected, int intersectLvl)
+{
+ // If the rect isn't in the clip rect, bail.
+ if (!r.intersects(clipRect))
+ return;
- int rectBottomY = rect.y() + rect.height();
- if (rectBottomY >= clipRect.y() &&
- rectBottomY < (clipRect.y() + clipRect.height() - 1))
- // to prevent overflow, in case the original rect is too wide
- // the line would be drawn "backwards"
- p->drawLine(intersection.bottomLeft() + QPoint(0, 1),
- intersection.bottomRight() + QPoint(0, 1));
+ p->save();
- int rectLeftX = rect.x();
- if (rectLeftX >= clipRect.x() &&
- rectLeftX <= (clipRect.x() + clipRect.width() - 1))
- p->drawLine(rect.topLeft(), rect.bottomLeft());
+ // Since we do partial updates when scrolling, make sure we don't
+ // obliterate the previews.
+ p->setClipRect(clipRect);
- int rectRightX = rect.x() + rect.width(); // make sure we don't overflow
- if (rectRightX >= clipRect.x() &&
- rectRightX < clipRect.x() + clipRect.width() - 1)
- p->drawLine(rect.topRight(), rect.bottomRight());
+ // For a selected segment, go with a darker fill.
+ if (isSelected) {
+ QColor fillColor = p->brush().color().darker(200);
+ p->setBrush(QBrush(fillColor));
+ }
+ // For intersecting segments, go with a darker fill.
+ if (intersectLvl > 0) {
+ QColor fillColor = p->brush().color().darker(intersectLvl * 105);
+ p->setBrush(QBrush(fillColor));
}
+ QRect rect = r;
+ // Shrink height by 1 to accommodate the dividers.
+ // Shrink width by 1 so that adjacent segment borders don't overlap.
+ // ??? Why isn't the SegmentRect already adjusted like this?
+ rect.adjust(0, 0, -1, -1);
+
+ p->drawRect(rect);
+
p->restore();
}
-QColor CompositionView::mixBrushes(QBrush a, QBrush b)
+// Functor to just compare the SegmentRect's QRect's.
+class CompareSegmentRects
{
- QColor ac = a.color(), bc = b.color();
-
- int aR = ac.red(), aG = ac.green(), aB = ac.blue(),
- bR = bc.red(), bG = bc.green(), bB = ac.blue();
+public:
+ CompareSegmentRects(const SegmentRect &sr) : r(sr.rect) { }
+ bool operator()(const SegmentRect &sr)
+ { return (sr.rect == r); }
+private:
+ QRect r;
+};
- ac.setRgb((aR + bR) / 2, (aG + bG) / 2, (aB + bB) / 2);
+void CompositionView::drawIntersections(
+ QPainter *painter, const QRect &clipRect,
+ const CompositionModelImpl::SegmentRects &rects)
+{
+ // Intersections are most noticeable when recording over existing
+ // segments. They also play a part when moving a segment over top
+ // of existing segments.
- return ac;
-}
+ // If there aren't enough rects for there to be an intersection, bail.
+ if (rects.size() <= 1)
+ return;
-void CompositionView::drawIntersections(const CompositionModelImpl::RectContainer& rects,
- QPainter * p, const QRect& clipRect)
-{
- if (! (rects.size() > 1))
- return ;
+ CompositionModelImpl::SegmentRects intersections;
- CompositionModelImpl::RectContainer intersections;
+ // For each rect
+ for (CompositionModelImpl::SegmentRects::const_iterator i = rects.begin();
+ i != rects.end();
+ ++i) {
- CompositionModelImpl::RectContainer::const_iterator i = rects.begin(),
- j = rects.begin();
+ // For each rect after i
+ for (CompositionModelImpl::SegmentRects::const_iterator j = i + 1;
+ j != rects.end();
+ ++j) {
- for (; j != rects.end(); ++j) {
+ SegmentRect intersectRect = i->intersected(*j);
- CompositionRect testRect = *j;
- i = j;
- ++i; // set i to pos after j
+ // If no intersection, try the next rect.
+ if (intersectRect.rect.isEmpty())
+ continue;
- if (i == rects.end())
- break;
+ // Check if we've already encountered this intersection.
+ CompositionModelImpl::SegmentRects::iterator t =
+ std::find_if(intersections.begin(),
+ intersections.end(),
+ CompareSegmentRects(intersectRect));
- for (; i != rects.end(); ++i) {
- CompositionRect ri = testRect.intersected(*i);
- if (!ri.isEmpty()) {
- CompositionModelImpl::RectContainer::iterator t = std::find(intersections.begin(),
- intersections.end(), ri);
- if (t == intersections.end()) {
- ri.setBrush(mixBrushes(testRect.getBrush(), i->getBrush()));
- ri.setSelected(testRect.isSelected() || i->isSelected());
- intersections.push_back(ri);
- }
+ // If we've already seen this intersection, try the next rect.
+ if (t != intersections.end())
+ continue;
- }
+ // Add it to the intersections vector.
+ intersections.push_back(intersectRect);
}
}
+ // For each intersection, draw the rectangle
+ for (CompositionModelImpl::SegmentRects::iterator i =
+ intersections.begin();
+ i != intersections.end();
+ ++i) {
+
+ drawCompRect(painter, clipRect, *i, 1);
+ }
+
+#if 0
+// This code is from when segments could overlap each other on a track.
+// Overlapping segments are no longer allowed. See:
+// CompositionModelImpl::setTrackHeights()
+// Composition::getMaxContemporaneousSegmentsOnTrack()
//
// draw this level of intersections then compute and draw further ones
//
- int intersectionLvl = 1;
+ int level = 1;
while (!intersections.empty()) {
- for (CompositionModelImpl::RectContainer::iterator intIter = intersections.begin();
- intIter != intersections.end(); ++intIter) {
- CompositionRect r = *intIter;
- drawCompRect(r, p, clipRect, intersectionLvl);
+ // For each intersection, draw the segment rectangle
+ for (CompositionModelImpl::SegmentRects::iterator intersectionIter =
+ intersections.begin();
+ intersectionIter != intersections.end();
+ ++intersectionIter) {
+
+ drawCompRect(painter, clipRect, *intersectionIter, level);
}
+ // Bail if more than 10 intersections.
+ // Original comment: "put a limit on how many intersections we can
+ // compute and draw - this grows exponentially"
+ // That doesn't seem right. Each time through, the intersections
+ // will become fewer and fewer.
if (intersections.size() > 10)
- break; // put a limit on how many intersections we can compute and draw - this grows exponentially
-
- ++intersectionLvl;
-
- CompositionModelImpl::RectContainer intersections2;
-
- CompositionModelImpl::RectContainer::iterator i = intersections.begin(),
- j = intersections.begin();
-
- for (; j != intersections.end(); ++j) {
-
- CompositionRect testRect = *j;
- i = j;
- ++i; // set i to pos after j
+ break;
- if (i == intersections.end())
- break;
+ ++level;
+
+ CompositionModelImpl::SegmentRects intersections2;
+
+ // For each intersection rect
+ for (CompositionModelImpl::SegmentRects::iterator j =
+ intersections.begin();
+ j != intersections.end();
+ ++j) {
+
+ const SegmentRect &testRect = *j;
+
+ // For each rect after j
+ for (CompositionModelImpl::SegmentRects::iterator i = j + 1;
+ i != intersections.end();
+ ++i) {
+
+ SegmentRect intersectRect = testRect.intersected(*i);
+
+ // If we have an intersection, and it isn't simply the
+ // "i" rect.
+ // ??? Why? If the i rect is contained within the j
+ // rect, we ignore it?
+ if (!intersectRect.isEmpty() && intersectRect != *i) {
+ // Check to see if we've found this intersection already.
+ CompositionModelImpl::SegmentRects::iterator t =
+ std::find(intersections2.begin(),
+ intersections2.end(),
+ intersectRect);
+
+ // If we've not seen this intersection before
+ if (t == intersections2.end()) {
+ // Set the attributes.
+ // ??? What about selected?
+ intersectRect.setBrush(
+ mixBrushes(testRect.getBrush(), i->getBrush()));
+ }
- for (; i != intersections.end(); ++i) {
- CompositionRect ri = testRect.intersected(*i);
- if (!ri.isEmpty() && ri != *i) {
- CompositionModelImpl::RectContainer::iterator t = std::find(intersections2.begin(),
- intersections2.end(), ri);
- if (t == intersections2.end())
- ri.setBrush(mixBrushes(testRect.getBrush(), i->getBrush()));
- intersections2.push_back(ri);
+ // ??? Add all intersections that we find, even if we've
+ // already seen them?
+ intersections2.push_back(intersectRect);
}
}
}
intersections = intersections2;
}
-
-}
-
-void CompositionView::drawPointer(QPainter *p, const QRect& clipRect)
-{
- //RG_DEBUG << "CompositionView::drawPointer: clipRect "
- // << clipRect.x() << "," << clipRect.y() << " " << clipRect.width()
- // << "x" << clipRect.height() << " pointer pos is " << m_pointerPos << endl;
-
- if (m_pointerPos >= clipRect.x() && m_pointerPos <= (clipRect.x() + clipRect.width())) {
- p->save();
- p->setPen(m_pointerPen);
- p->drawLine(m_pointerPos, clipRect.y(), m_pointerPos, clipRect.y() + clipRect.height());
- p->restore();
- }
-
+#endif
}
-void CompositionView::drawTextFloat(QPainter *p, const QRect& clipRect)
+void CompositionView::drawTextFloat(QPainter *p)
{
- QFontMetrics metrics(p->fontMetrics());
-
- QRect bound = p->boundingRect(0, 0, 300, metrics.height() + 6, Qt::AlignLeft, m_textFloatText);
+ if (!m_model)
+ return;
- p->save();
+ // Find out how big of a rect we need for the text.
+ QRect boundingRect = p->boundingRect(
+ QRect(), // we want the "required" rectangle
+ 0, // we want the "required" rectangle
+ m_textFloatText);
- bound.setLeft(bound.left() - 2);
- bound.setRight(bound.right() + 2);
- bound.setTop(bound.top() - 2);
- bound.setBottom(bound.bottom() + 2);
+ // Add some margins to give the text room to breathe.
+ boundingRect.adjust(-4,-2,+4,+2);
QPoint pos(m_textFloatPos);
- if (pos.y() < 0 && getModel()) {
- if (pos.y() + bound.height() < 0) {
- pos.setY(pos.y() + getModel()->grid().getYSnap() * 3);
- } else {
- pos.setY(pos.y() + getModel()->grid().getYSnap() * 2);
- }
- }
- bound.moveTopLeft(pos);
-
- if (bound.intersects(clipRect)) {
-
- p->setBrush(CompositionColourCache::getInstance()->RotaryFloatBackground);
-
- drawRect(bound, p, clipRect, false, 0, true);
+ // If the text float would appear above the top of the viewport
+ if (pos.y() < contentsY()) {
+ // Move it down
+ pos.setY(pos.y() + m_model->grid().getYSnap() * 2 +
+ boundingRect.height());
+ }
- p->setPen(CompositionColourCache::getInstance()->RotaryFloatForeground);
+ boundingRect.moveTopLeft(pos);
- p->drawText(pos.x() + 2, pos.y() + 3 + metrics.ascent(), m_textFloatText);
+ p->save();
- }
+ p->setPen(CompositionColourCache::getInstance()->RotaryFloatForeground);
+ p->setBrush(CompositionColourCache::getInstance()->RotaryFloatBackground);
+ p->drawRect(boundingRect);
+ p->drawText(boundingRect, Qt::AlignCenter, m_textFloatText);
p->restore();
}
-bool CompositionView::event(QEvent* e)
+bool CompositionView::event(QEvent *e)
{
- if (e->type() == AudioPreviewThread::AudioPreviewQueueEmpty) {
- RG_DEBUG << "CompositionView::event - AudioPreviewQueueEmpty\n";
+ if (e->type() == AudioPeaksThread::AudioPeaksQueueEmpty) {
+ // Audio previews have been generated, redraw the segments.
segmentsNeedRefresh();
viewport()->update();
+
+ // No need to propagate to parent.
+ e->accept();
+ // Event was recognized.
return true;
}
return RosegardenScrollView::event(e);
}
-void CompositionView::enterEvent(QEvent */* e */)
+void CompositionView::enterEvent(QEvent *)
{
- QSettings settings;
- settings.beginGroup( GeneralOptionsConfigGroup );
-
- if (! qStrToBool( settings.value("toolcontexthelp", "true" ) ) ) {
- settings.endGroup();
- return;
- }
- settings.endGroup();
-
+ // Ask RosegardenMainWindow to display the context help in the status bar.
emit showContextHelp(m_toolContextHelp);
m_contextHelpShown = true;
}
-void CompositionView::leaveEvent(QEvent */* e */)
+void CompositionView::leaveEvent(QEvent *)
{
+ // Ask RosegardenMainWindow to clear the context help in the status bar.
emit showContextHelp("");
m_contextHelpShown = false;
}
void CompositionView::slotToolHelpChanged(const QString &text)
{
- if (m_toolContextHelp == text) return;
- m_toolContextHelp = text;
-
- QSettings settings;
-
- settings.beginGroup( GeneralOptionsConfigGroup );
-
- if (! qStrToBool( settings.value("toolcontexthelp", "true" ) ) ) {
- settings.endGroup();
+ // No change? Bail.
+ if (m_toolContextHelp == text)
return;
- }
- settings.endGroup();
- if (m_contextHelpShown) emit showContextHelp(text);
+ m_toolContextHelp = text;
+
+ // If we're showing context help, ask RosegardenMainWindow to update
+ // the context help in the status bar.
+ if (m_contextHelpShown)
+ emit showContextHelp(text);
}
-void CompositionView::contentsMousePressEvent(QMouseEvent* e)
+void CompositionView::mousePressEvent(QMouseEvent *e)
{
- setSelectCopy((e->modifiers() & Qt::ControlModifier) != 0);
- setSelectCopyingAsLink(((e->modifiers() & Qt::AltModifier) != 0) &&
- ((e->modifiers() & Qt::ControlModifier) != 0));
- setSelectAdd((e->modifiers() & Qt::ShiftModifier) != 0);
- setFineGrain((e->modifiers() & Qt::ShiftModifier) != 0);
- setPencilOverExisting((e->modifiers() & (Qt::AltModifier + Qt::ControlModifier)) != 0);
-
- switch (e->button()) {
- case Qt::LeftButton:
- case Qt::MidButton:
+ // The left and middle buttons can be used for dragging out new
+ // segments with SegmentSelector and SegmentPencil. We want to
+ // auto-scroll in those cases and others.
+ // ??? Would it be better to push this down into the tools?
+ if (e->button() == Qt::LeftButton ||
+ e->button() == Qt::MidButton)
startAutoScroll();
- if (m_tool)
- m_tool->handleMouseButtonPress(e);
- else
- RG_DEBUG << "CompositionView::contentsMousePressEvent() :"
- << this << " no tool\n";
- break;
- case Qt::RightButton:
- if (m_tool)
- m_tool->handleRightButtonPress(e);
- else
- RG_DEBUG << "CompositionView::contentsMousePressEvent() :"
- << this << " no tool\n";
- break;
- case Qt::MouseButtonMask:
- case Qt::NoButton:
- case Qt::XButton1:
- case Qt::XButton2:
- default:
- break;
- }
+ // Delegate to current tool
+ if (m_currentTool)
+ m_currentTool->mousePressEvent(e);
}
-void CompositionView::contentsMouseReleaseEvent(QMouseEvent* e)
+void CompositionView::mouseReleaseEvent(QMouseEvent *e)
{
- RG_DEBUG << "CompositionView::contentsMouseReleaseEvent()\n";
-
- stopAutoScroll();
-
- if (!m_tool)
- return ;
+ // In case there is no tool, and auto scroll is running.
+ slotStopAutoScroll();
- if (e->button() == Qt::LeftButton ||
- e->button() == Qt::MidButton )
- m_tool->handleMouseButtonRelease(e);
+ if (m_currentTool)
+ m_currentTool->mouseReleaseEvent(e);;
}
-void CompositionView::contentsMouseDoubleClickEvent(QMouseEvent* e)
+void CompositionView::mouseDoubleClickEvent(QMouseEvent *e)
{
- m_currentIndex = getFirstItemAt(e->pos());
+ const QPoint contentsPos = viewportToContents(e->pos());
- if (!m_currentIndex) {
- RG_DEBUG << "CompositionView::contentsMouseDoubleClickEvent - no currentIndex\n";
+ ChangingSegmentPtr item = m_model->getSegmentAt(contentsPos);
+
+ // If the user clicked on a space where there is no segment,
+ // move the playback position pointer to that time.
+ if (!item) {
const RulerScale *ruler = grid().getRulerScale();
- if (ruler) emit setPointerPosition(ruler->getTimeForX(e->pos().x()));
- return ;
- }
+ if (ruler)
+ emit setPointerPosition(ruler->getTimeForX(contentsPos.x()));
- RG_DEBUG << "CompositionView::contentsMouseDoubleClickEvent - have currentIndex\n";
+ return;
+ }
- CompositionItem* itemImpl = m_currentIndex;
+ // Ask RosegardenMainViewWidget to launch the default editor for
+ // the segment under the mouse pointer.
- if (m_currentIndex->isRepeating()) {
- timeT time = getModel()->getRepeatTimeAt(e->pos(), m_currentIndex);
+ if (item->isRepeating()) {
+ const timeT time = item->getRepeatTimeAt(grid(), contentsPos);
- RG_DEBUG << "editRepeat at time " << time << endl;
if (time > 0)
- emit editRepeat(itemImpl->getSegment(), time);
+ emit editRepeat(item->getSegment(), time);
else
- emit editSegment(itemImpl->getSegment());
+ emit editSegment(item->getSegment());
} else {
- emit editSegment(itemImpl->getSegment());
+ emit editSegment(item->getSegment());
}
}
-void CompositionView::contentsMouseMoveEvent(QMouseEvent* e)
+void CompositionView::mouseMoveEvent(QMouseEvent *e)
{
- if (!m_tool)
- return ;
-
- setFineGrain((e->modifiers() & Qt::ShiftModifier) != 0);
- setPencilOverExisting((e->modifiers() & Qt::AltModifier) != 0);
+ if (!m_currentTool)
+ return;
- int follow = m_tool->handleMouseMove(e);
- setScrollDirectionConstraint(follow);
+ // Delegate to the current tool.
+ int followMode = m_currentTool->mouseMoveEvent(e);
- if (follow != RosegardenScrollView::NoFollow) {
- doAutoScroll();
+ // ??? Can we push the rest of this down into the tools?
- if (follow & RosegardenScrollView::FollowHorizontal) {
- int mouseX = e->pos().x();
- slotScrollHorizSmallSteps(mouseX);
-
-//&& JAS - Deactivate auto expand feature when resizing / moving segments past
-//&& Compostion end. Though current code works, this creates lots of corner
-//&& cases that are not reversible using the REDO / UNDO commands.
-//&& Additionally, this makes accidentally altering the compostion length too easy.
-//&& Currently leaving code here until a full debate is complete.
-
-// // enlarge composition if needed
-// if ((horizontalScrollBar()->value() == horizontalScrollBar()->maximum()) &&
-// // This code minimizes the chances of auto expand when moving segments
-// // Not a perfect fix -- but fixes several auto expand errors
-// (mouseX > (contentsX() + visibleWidth() * 0.95))) {
-// resizeContents(contentsWidth() + m_stepSize, contentsHeight());
-// setContentsPos(contentsX() + m_stepSize, contentsY());
-// getModel()->setLength(contentsWidth());
-// slotUpdateSize();
-// }
- }
+ setFollowMode(followMode);
- if (follow & RosegardenScrollView::FollowVertical)
- slotScrollVertSmallSteps(e->pos().y());
+ if (followMode != RosegardenScrollView::NoFollow) {
+ doAutoScroll();
}
}
-#if 0
-// Dead Code.
-void CompositionView::releaseCurrentItem()
-{
- m_currentIndex = CompositionItemPtr();
-}
-#endif
-
-void CompositionView::setPointerPos(int pos)
+void CompositionView::drawPointer(int pos)
{
- //RG_DEBUG << "CompositionView::setPointerPos(" << pos << ")\n";
- int oldPos = m_pointerPos;
- if (oldPos == pos) return;
+ // If we've not moved, bail.
+ if (m_pointerPos == pos)
+ return;
+ const int oldPos = m_pointerPos;
m_pointerPos = pos;
- getModel()->pointerPosChanged(pos);
- // automagically grow contents width if pointer position goes beyond right end
- //
- if (pos >= (contentsWidth() - m_stepSize)) {
- resizeContents(pos + m_stepSize, contentsHeight());
- // grow composition too, if needed (it may not be the case if
- if (getModel()->getCompositionLength() < contentsWidth())
- getModel()->setCompositionLength(contentsWidth());
- }
-
-
- // interesting -- isAutoScrolling() never seems to return true?
- //RG_DEBUG << "CompositionView::setPointerPos(" << pos << "), isAutoScrolling " << isAutoScrolling() << ", contentsX " << contentsX() << ", m_lastPointerRefreshX " << m_lastPointerRefreshX << ", contentsHeight " << contentsHeight() << endl;
-
- if (contentsX() != m_lastPointerRefreshX) {
- m_lastPointerRefreshX = contentsX();
- // We'll need to shift the whole canvas anyway, so
- slotArtifactsNeedRefresh();
- return ;
- }
+ // This routine calls us back for each recording segment to make
+ // sure we update the display as the recording segments expand.
+ m_model->pointerPosChanged(pos);
- int deltaW = abs(m_pointerPos - oldPos);
+ int deltaPos = abs(m_pointerPos - oldPos);
- if (deltaW <= m_pointerPen.width() * 2) { // use one rect instead of two separate ones
+ // If the pointer has only moved slightly
+ if (deltaPos <= m_pointerPen.width() * 2) {
- QRect updateRect
- (std::min(m_pointerPos, oldPos) - m_pointerPen.width(), 0,
- deltaW + m_pointerPen.width() * 2, contentsHeight());
-
- artifactsNeedRefresh(updateRect);
+ // Use one update rect instead of two.
+ updateArtifacts(
+ QRect(std::min(m_pointerPos, oldPos) - m_pointerPen.width()/2, 0,
+ deltaPos + m_pointerPen.width(), contentsHeight()));
} else {
- artifactsNeedRefresh
- (QRect(m_pointerPos - m_pointerPen.width(), 0,
- m_pointerPen.width() * 2, contentsHeight()));
+ // Update the new pointer position.
+ updateArtifacts(
+ QRect(m_pointerPos - m_pointerPen.width()/2, 0,
+ m_pointerPen.width(), contentsHeight()));
- artifactsNeedRefresh
- (QRect(oldPos - m_pointerPen.width(), 0,
- m_pointerPen.width() * 2, contentsHeight()));
+ // Update the old pointer position.
+ updateArtifacts(
+ QRect(oldPos - m_pointerPen.width()/2, 0,
+ m_pointerPen.width(), contentsHeight()));
}
}
-void CompositionView::setGuidesPos(int x, int y)
+void CompositionView::drawGuides(int x, int y)
{
- m_topGuidePos = x;
- m_foreGuidePos = y;
- slotArtifactsNeedRefresh();
-}
+ m_drawGuides = true;
+ m_guideX = x;
+ m_guideY = y;
-void CompositionView::setGuidesPos(const QPoint& p)
-{
- m_topGuidePos = p.x();
- m_foreGuidePos = p.y();
- slotArtifactsNeedRefresh();
+ slotUpdateArtifacts();
}
-void CompositionView::setDrawGuides(bool d)
+void CompositionView::hideGuides()
{
- m_drawGuides = d;
- slotArtifactsNeedRefresh();
-}
+ m_drawGuides = false;
-void CompositionView::setTmpRect(const QRect& r)
-{
- setTmpRect(r, m_tmpRectFill);
+ slotUpdateArtifacts();
}
-void CompositionView::setTmpRect(const QRect& r, const QColor &c)
+void CompositionView::drawNewSegment(const QRect &r)
{
- QRect pRect = m_tmpRect;
- m_tmpRect = r;
- m_tmpRectFill = c;
- slotUpdateAll(m_tmpRect | pRect);
+ QRect previousRect = m_newSegmentRect;
+ m_newSegmentRect = r;
+
+ slotAllNeedRefresh(m_newSegmentRect | previousRect);
}
-void CompositionView::setTextFloat(int x, int y, const QString &text)
+void CompositionView::drawTextFloat(int x, int y, const QString &text)
{
m_textFloatPos.setX(x);
m_textFloatPos.setY(y);
m_textFloatText = text;
m_drawTextFloat = true;
- slotArtifactsNeedRefresh();
- // most of the time when the floating text is drawn
- // we want to update a larger part of the view
- // so don't update here
- // QRect r = fontMetrics().boundingRect(x, y, 300, 40, AlignLeft, m_textFloatText);
- // slotUpdateAll(r);
-
-
- // mainWindow->slotSetStatusMessage(text);
-}
-
-void CompositionView::setFineGrain(bool value)
-{
- m_fineGrain = value;
-}
-
-void CompositionView::setPencilOverExisting(bool value)
-{
- m_pencilOverExisting = value;
+ slotUpdateArtifacts();
}
-#if 0
-// Dead Code.
-void
-CompositionView::slotTextFloatTimeout()
-{
- hideTextFloat();
- slotArtifactsNeedRefresh();
- // mainWindow->slotSetStatusMessage(QString::null);
-}
-#endif
}
#include "CompositionView.moc"
diff --git a/src/gui/editors/segment/compositionview/CompositionView.h b/src/gui/editors/segment/compositionview/CompositionView.h
index aa78801..adb4971 100644
--- a/src/gui/editors/segment/compositionview/CompositionView.h
+++ b/src/gui/editors/segment/compositionview/CompositionView.h
@@ -1,10 +1,9 @@
-
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -20,9 +19,10 @@
#define RG_COMPOSITIONVIEW_H
#include "CompositionModelImpl.h"
-#include "CompositionItem.h"
#include "gui/general/RosegardenScrollView.h"
-#include <QBrush>
+#include "base/Selection.h" // SegmentSelection
+#include "base/TimeT.h" // timeT
+
#include <QColor>
#include <QPen>
#include <QPixmap>
@@ -47,16 +47,15 @@ namespace Rosegarden
class SnapGrid;
class SegmentToolBox;
class SegmentTool;
-class SegmentSelector;
class Segment;
class RosegardenDocument;
-class CompositionRect;
+class SegmentRect;
-/// Draws the Composition on the display.
+/// Draws the Composition on the display. The segment canvas.
/**
- * The key output routine is viewportPaintRect() which draws the segments
+ * The key output routine is drawAll() which draws the segments
* and the artifacts (playback position pointer, guides, "rubber band"
- * selection, ...) on the viewport (the portion of the composition that
+ * selection, ...) on the viewport (the portion of the Composition that
* is currently visible).
*
* TrackEditor creates and owns the only instance of this class. This
@@ -67,137 +66,72 @@ class CompositionView : public RosegardenScrollView
{
Q_OBJECT
public:
- CompositionView(RosegardenDocument*, CompositionModelImpl *,
- QWidget * parent=0);
+ CompositionView(RosegardenDocument *, CompositionModelImpl *,
+ QWidget *parent);
- /// Move the playback position pointer to a new X coordinate.
- /**
- * @see getPointerPos(), setPointerPosition(), and drawPointer()
- */
- void setPointerPos(int pos);
- /// Get the X coordinate of the playback position pointer.
- /**
- * @see setPointerPos(), setPointerPosition(), and drawPointer()
- */
- int getPointerPos() { return m_pointerPos; }
+ // *** Miscellaneous
- /// Sets the position of the guides. See setDrawGuides().
- void setGuidesPos(int x, int y);
- /// Sets the position of the guides. See setDrawGuides().
- void setGuidesPos(const QPoint& p);
- /// Enable/disable drawing of the guides.
- /**
- * The guides are blue crosshairs that stretch across the entire view.
- * They appear when selecting or moving a segment.
- *
- * @see setGuidesPos() and drawGuides()
- */
- void setDrawGuides(bool d);
+ CompositionModelImpl *getModel() { return m_model; }
- /// Get the rect for the "rubber band" selection.
- /**
- * @see setDrawSelectionRect()
- */
- QRect getSelectionRect() const { return m_selectionRect; }
- /// Set the position of the "rubber band" selection.
- /**
- * @see setDrawSelectionRect().
- */
- void setSelectionRectPos(const QPoint& pos);
- /// Set the size of the "rubber band" selection.
- /**
- * @see setDrawSelectionRect().
- */
- void setSelectionRectSize(int w, int h);
- /// Enable/disable drawing of the selection "rubber band" rectangle.
- /**
- * Clicking and dragging the arrow tool across the view enables this.
- *
- * @see getSelectionRect(), setSelectionRectPos(), and
- * setSelectionRectSize()
- */
- void setDrawSelectionRect(bool d);
-
- /// Get the snap grid from the CompositionModelImpl.
- SnapGrid& grid() { return m_model->grid(); }
-
- /// Get the topmost item (segment) at the given position on the view.
- CompositionItemPtr getFirstItemAt(QPoint pos);
+ /// CompositionModelImpl::m_grid
+ SnapGrid &grid() { return m_model->grid(); }
/// Returns the segment tool box. See setTool() and m_toolBox.
- SegmentToolBox* getToolBox() { return m_toolBox; }
-
- /// Returns the composition model. See m_model.
- CompositionModelImpl* getModel() { return m_model; }
+ SegmentToolBox *getToolBox() { return m_toolBox; }
- /// See getTmpRect().
- void setTmpRect(const QRect& r);
- /// See getTmpRect().
- void setTmpRect(const QRect& r, const QColor &c);
- /// Get the temporary segment rect when drawing a new segment.
+ /// Set the current segment editing tool.
/**
- * The "temp rect" is used by the pencil tool when first drawing
- * out the segment while the mouse button is being held down.
- *
- * @see setTmpRect()
+ * @see getToolBox()
*/
- const QRect& getTmpRect() const { return m_tmpRect; }
+ void setTool(const QString &toolName);
- /// Set the snap resolution of the grid to something suitable.
- /**
- * fine indicates whether the current tool is a fine-grain sort
- * (such as the resize or move tools) or a coarse one (such as the
- * segment creation pencil). If the user is requesting extra-fine
- * resolution (through setFineGrain()) that will also be
- * taken into account.
- */
- void setSnapGrain(bool fine);
+ // *** Segments
- /// Is the user requesting extra-fine resolution (shift key)?
+ /// Enables/disables display of the text labels on each segment.
/**
- * Find out whether the user is requesting extra-fine resolution
- * (e.g. by holding Shift key). This is seldom necessary -- most
- * client code will only need to query the snap grid that is
- * adjusted appropriately by the view when interactions take
- * place.
+ * From the menu: View > Show Segment Labels.
*
- * @see setFineGrain()
+ * @see drawCompRectLabel()
*/
- bool isFineGrain() const { return m_fineGrain; }
+ void setShowSegmentLabels(bool labels) { m_showSegmentLabels = labels; }
- /// Is the user pressing the Ctrl key to draw over a segment?
+ /// Set whether the segment items contain previews or not.
/**
- * Find out whether the user is requesting to draw over an existing segment
- * with the pencil, by holding the Ctrl key. This is used by the segment
- * pencil to decide whether to abort or not if a user attempts to draw over
- * an existing segment, and this is all necessary in order to avoid breaking
- * the double-click-to-open behavior.
- *
- * @see setPencilOverExisting()
+ * From the menu: View > Show Segment Previews.
*/
- bool pencilOverExisting() const { return m_pencilOverExisting; }
+ void setShowPreviews(bool previews) { m_showPreviews = previews; }
- /// Set whether the segment items contain previews or not.
+ /// Delegates to CompositionModelImpl::deleteCachedPreviews().
/**
- * @see isShowingPreviews()
+ * Redrawing previews is expensive. This routine is primarily used
+ * to indicate that the preview cache needs to be regenerated for
+ * zoom and the commands (e.g. transpose).
+ *
+ * In a perfect world, the preview cache should be regenerated for
+ * the following reasons only:
+ * 1. The contents of a segment have changed.
+ * 2. Zoom.
+ * 3. More?
*/
- void setShowPreviews(bool previews) { m_showPreviews = previews; }
+ void deleteCachedPreviews();
- /// Return whether the segment items contain previews or not.
+ /// Delegates to CompositionModelImpl::setAudioPeaksThread().
/**
- * @see setShowPreviews()
+ * This is called when the document is being destroyed or the
+ * application is going down.
*/
- bool isShowingPreviews() { return m_showPreviews; }
+ void endAudioPreviewGeneration();
+
+ // *** Selection
+ /// Selects the segments via CompositionModelImpl::setSelected().
/**
- * Delegates to CompositionModelImpl::clearSegmentRectsCache().
+ * Used by RosegardenMainViewWidget.
*/
- void clearSegmentRectsCache(bool clearPreviews = false);
+ void selectSegments(const SegmentSelection &segments);
- /// Return the selected Segments if we're currently using a "Selector".
+ /// Delegates to CompositionModelImpl::getSelectedSegments().
/**
- * Delegates to CompositionModelImpl::getSelectedSegments().
- *
* @see haveSelection()
*/
SegmentSelection getSelectedSegments();
@@ -206,186 +140,244 @@ public:
/**
* @see getSelectedSegments()
*/
- bool haveSelection() const { return m_model->haveSelection(); }
+ bool haveSelection() const { return m_model->haveSelection(); }
/// Updates the portion of the view where the selected items are.
/**
+ * This is only used for segment join and update figuration. It
+ * might be useful in more situations. However, since the
+ * CompositionView is redrawn every time a command is executed
+ * (TrackEditor::slotCommandExecuted()), there's no incentive to
+ * use this.
+ *
* @see RosegardenScrollView::updateContents()
*/
- void updateSelectionContents();
+ void updateSelectedSegments();
- /// Set a text float on this canvas.
+ // *** Artifacts
+
+ /// Move the playback position pointer to a new X coordinate.
/**
- * The floating text can contain
- * anything and can be left to timeout or you can hide it
- * explicitly with hideTextFloat().
- *
- * Used by SegmentMover::handleMouseMove() to display time,
- * bar, and beat on the view while the user is moving a segment.
- * Also used by SegmentSelector::handleMouseMove().
- *
- * @see slotTextFloatTimeout()
+ * @see getPointerPos(), setPointerPosition(), and drawArtifacts()
*/
- void setTextFloat(int x, int y, const QString &text);
- /// See setTextFloat().
- void hideTextFloat() { m_drawTextFloat = false; }
+ void drawPointer(int pos);
+ /// Get the X coordinate of the playback position pointer.
+ /**
+ * @see drawPointer() and setPointerPosition()
+ */
+ int getPointerPos() { return m_pointerPos; }
- /// Enables/disables display of the text labels on each segment.
/**
- * From the menu: View > Show Segment Labels.
+ * The guides are blue crosshairs that stretch across the entire view.
+ * They appear when selecting or moving a segment.
*
- * @see drawCompRectLabel()
+ * @see hideGuides() and drawArtifacts()
*/
- void setShowSegmentLabels(bool b) { m_showSegmentLabels = b; }
+ void drawGuides(int x, int y);
+ void hideGuides();
- /// Set the image that will appear behind the segments on the view.
- void setBackgroundPixmap(const QPixmap &m);
+ /// Set the starting position of the "rubber band" selection.
+ void drawSelectionRectPos1(const QPoint &pos);
+ /// Set the ending position of the "rubber band" selection.
+ void drawSelectionRectPos2(const QPoint &pos);
+ /// Hide the "rubber band" selection rectangle.
+ void hideSelectionRect();
- /// Delegates to CompositionModelImpl::setAudioPreviewThread().
- void endAudioPreviewGeneration();
-
- /// Set the current segment editing tool.
- /**
- * @see getToolBox()
- */
- void setTool(const QString& toolName);
+ void setNewSegmentColor(const QColor &color) { m_newSegmentColor = color; }
+ /// Used by SegmentPencil to draw a new segment.
+ void drawNewSegment(const QRect &r);
+ const QRect &getNewSegmentRect() const { return m_newSegmentRect; }
+ void hideNewSegment() { drawNewSegment(QRect()); }
- /// Selects the segments via CompositionModelImpl::setSelected().
/**
- * Used by RosegardenMainViewWidget.
+ * Used by SegmentMover::mouseMoveEvent() to display time,
+ * bar, and beat on the view while the user is moving a segment.
+ * Also used by SegmentSelector::mouseMoveEvent() for the same
+ * purpose.
+ *
+ * @see hideTextFloat()
*/
- void selectSegments(const SegmentSelection &segment);
+ void drawTextFloat(int x, int y, const QString &text);
+ /// See drawTextFloat().
+ void hideTextFloat() { m_drawTextFloat = false; }
- /// Show the splitting line on a Segment. Used by SegmentSplitter.
/**
+ * Used by SegmentSplitter.
+ *
* @see hideSplitLine()
*/
- void showSplitLine(int x, int y);
- /// See showSplitLine().
+ void drawSplitLine(int x, int y);
+ /// See drawSplitLine().
void hideSplitLine();
-
public slots:
-// void scrollRight();
-// void scrollLeft();
- //void slotContentsMoving(int x, int y);
-
- /// Handle scroll wheel events from TrackEditor::m_trackButtonScroll.
- void slotExternalWheelEvent(QWheelEvent*);
-
- // TextFloat timer handler.
-// void slotTextFloatTimeout();
+ /// Handle TrackButtons scroll wheel events.
+ /**
+ * Forwards the events to RosegardenScrollView to make sure we are
+ * synced up with TrackButtons.
+ *
+ * @see TrackEditor::m_trackButtonScroll
+ */
+ void slotExternalWheelEvent(QWheelEvent *);
/// Redraw everything. Segments and artifacts.
+ /**
+ * This is called in many places after making changes that affect the
+ * segment canvas.
+ *
+ * RosegardenMainViewWidget connects this to
+ * CommandHistory::commandExecuted().
+ */
void slotUpdateAll();
- /// Redraw everything (segments and artifacts) within the specified rect.
+
+ /// Deferred update of segments and artifacts within the specified rect.
/**
* Because this routine is called so frequently, it doesn't actually
* do any work. Instead it sets a flag, m_updateNeeded, and
* slotUpdateTimer() does the actual work by calling
- * updateAll() on a more leisurely schedule.
+ * updateAll2(rect) on a more leisurely schedule.
*/
- void slotUpdateAll(const QRect &rect);
+ void slotAllNeedRefresh(const QRect &rect);
- /// Handles a view size change.
+ /// Resize the contents to match the Composition.
/**
* @see RosegardenScrollView::resizeContents().
*/
void slotUpdateSize();
signals:
- /// Emitted when a segment is double-clicked to launch the default segment editor.
+ /// Signal emitted when a segment is double-clicked.
/**
+ * Causes the default editor to be launched.
+ *
* Connected to RosegardenMainViewWidget::slotEditSegment().
+ *
+ * rename: segmentDoubleClicked()?
*/
- void editSegment(Segment*);
-// void editSegmentNotation(Segment*);
-// void editSegmentMatrix(Segment*);
-// void editSegmentAudio(Segment*);
-// void editSegmentEventList(Segment*);
-// void audioSegmentAutoSplit(Segment*);
+ void editSegment(Segment *);
- /// Emitted when a segment repeat is double-clicked.
+ /// Signal emitted when a segment repeat is double-clicked.
/**
* Connected to RosegardenMainViewWidget::slotEditRepeat() which converts
* the repeat to a segment. This doesn't actually start the segment
- * editor. contentsMouseDoubleClickEvent() emits editSegment() after
+ * editor. mouseDoubleClickEvent() emits editSegment() after
* it emits this.
*
- * rename: segmentRepeatDoubleClick(), repeatToSegment(), others?
- * Not sure which might be most helpful to readers of the code.
- * editRepeat() is misleading. repeatToSegment() is more correct
- * at the same level of abstraction.
+ * rename: repeatDoubleClicked()?
*/
- void editRepeat(Segment*, timeT);
+ void editRepeat(Segment *, timeT);
- /// Emitted when a double-click occurs on the ruler.
+ /// Signal emitted when a double-click occurs on the background.
/**
+ * Causes the pointer to move to where the user double-clicked.
+ *
* Connected to RosegardenDocument::slotSetPointerPosition().
* Connection is made by the RosegardenMainViewWidget ctor.
*
- * @see setPointerPos() and drawPointer()
+ * @see drawPointer()
+ *
+ * rename: backgroundDoubleClicked()?
*/
void setPointerPosition(timeT);
- /// Emitted when hovering over the CompositionView to show help text.
+ /// Signal emitted when the context help needs to change.
/**
+ * The context help is displayed in the status bar at the bottom
+ * of the main window.
+ *
* Connected to RosegardenMainWindow::slotShowToolHelp().
+ *
+ * rename: contextHelpChanged()
*/
void showContextHelp(const QString &);
-protected:
- /// Redraw in response to AudioPreviewThread::AudioPreviewQueueEmpty.
- virtual bool event(QEvent *);
+private slots:
- /// Passes the event on to the current tool.
- virtual void contentsMousePressEvent(QMouseEvent*);
- /// Passes the event on to the current tool.
- virtual void contentsMouseReleaseEvent(QMouseEvent*);
- /// Launches a segment editor or moves the position pointer.
- virtual void contentsMouseDoubleClickEvent(QMouseEvent*);
- /// Passes the event on to the current tool.
+ // *** Update
+
+ /// Updates the artifacts in the entire viewport.
/**
- * Also handles scrolling as needed.
+ * In addition to being used locally several times, this is also
+ * connected to CompositionModelImpl::needArtifactsUpdate().
*/
- virtual void contentsMouseMoveEvent(QMouseEvent*);
+ void slotUpdateArtifacts() {
+ updateContents();
+ }
- /// Delegates to viewportPaintRect() for each rect that needs painting.
- virtual void viewportPaintEvent(QPaintEvent*);
- /// Handles resize. Uses slotUpdateSize().
- virtual void resizeEvent(QResizeEvent*);
+ /// Used to reduce the frequency of updates.
+ /**
+ * slotAllNeedRefresh(rect) sets the m_updateNeeded flag to
+ * tell slotUpdateTimer() that it needs to perform an update.
+ */
+ void slotUpdateTimer();
+
+ /// Redraw everything with the new color scheme.
+ /**
+ * Connected to RosegardenDocument::docColoursChanged().
+ */
+ void slotRefreshColourCache();
+
+ /// Updates the tool context help and shows it if the mouse is in the view.
+ /**
+ * The tool context help appears in the status bar at the bottom.
+ *
+ * Connected to SegmentToolBox::showContextHelp().
+ *
+ * @see showContextHelp()
+ */
+ void slotToolHelpChanged(const QString &);
- // These are sent from the top level app when it gets key
- // depresses relating to selection add (usually Qt::SHIFT) and
- // selection copy (usually CONTROL)
+ // *** Recording
- /// Handle SHIFT key.
/**
- * Delegates to SegmentSelector::setSegmentAdd(). Used by
- * contentsMousePressEvent() with "value" indicating whether the user
- * is holding down the SHIFT key.
+ * Delegates to CompositionModelImpl::addRecordingItem().
+ * Connected to RosegardenDocument::newMIDIRecordingSegment().
+ *
+ * Suggestion: Try eliminating this middleman.
*/
- void setSelectAdd(bool value);
- /// Handle CONTROL key.
+ void slotNewMIDIRecordingSegment(Segment *);
+
/**
- * Delegates to SegmentSelector::setSegmentCopy(). Used by
- * contentsMousePressEvent() with "value" indicating whether the user is
- * holding down the CONTROL key.
+ * Delegates to CompositionModelImpl::addRecordingItem().
+ * Connected to RosegardenDocument::newAudioRecordingSegment().
+ *
+ * Suggestion: Try eliminating this middleman.
*/
- void setSelectCopy(bool value);
- /// Handle ALT and CONTROL keys.
+ void slotNewAudioRecordingSegment(Segment *);
+
/**
- * Delegates to SegmentSelector::setSegmentCopyingAsLink().
- * Used by contentsMousePressEvent() with "value" indicating whether the
- * user is holding down the ALT and CONTROL keys.
+ * Delegates to CompositionModelImpl::clearRecordingItems().
+ * Connected to RosegardenDocument::stoppedAudioRecording() and
+ * RosegardenDocument::stoppedMIDIRecording().
*/
- void setSelectCopyingAsLink(bool value);
+ void slotStoppedRecording();
+
+private:
+
+ CompositionModelImpl *m_model;
+
+ // --- Event Handlers ---------------------------------
+
+ /// Redraw in response to AudioPeaksThread::AudioPeaksQueueEmpty.
+ virtual bool event(QEvent *);
- /// See isFineGrain().
- void setFineGrain(bool value);
- /// See pencilOverExisting().
- void setPencilOverExisting(bool value);
+ /// Passes the event on to the current tool.
+ virtual void mousePressEvent(QMouseEvent *);
+ /// Passes the event on to the current tool.
+ virtual void mouseReleaseEvent(QMouseEvent *);
+ /// Launches a segment editor or moves the position pointer.
+ virtual void mouseDoubleClickEvent(QMouseEvent *);
+ /// Passes the event on to the current tool.
+ /**
+ * Also handles scrolling as needed.
+ */
+ virtual void mouseMoveEvent(QMouseEvent *);
+
+ /// Delegates to drawAll().
+ virtual void paintEvent(QPaintEvent *);
+ /// Handles resize. Uses slotUpdateSize().
+ virtual void resizeEvent(QResizeEvent *);
/// Called when the mouse enters the view.
/**
@@ -395,6 +387,7 @@ protected:
* @see leaveEvent() and slotToolHelpChanged()
*/
virtual void enterEvent(QEvent *);
+
/// Called when the mouse leaves the view.
/**
* Override of QWidget::leaveEvent().
@@ -405,308 +398,200 @@ protected:
*/
virtual void leaveEvent(QEvent *);
- /// Draw the segments and artifacts on the viewport (screen).
- /**
- * First, the appropriate portion of the segments layer (m_segmentsLayer)
- * is copied to the double-buffer (m_doubleBuffer). Then the artifacts
- * are drawn over top of the segments in the double-buffer by
- * refreshArtifacts(). Finally, the double-buffer is copied to
- * the display (QAbstractScrollArea::viewport()).
- */
- virtual void viewportPaintRect(QRect);
-
- /// Scrolls and refreshes the segment layer (m_segmentsLayer) if needed.
+ // --- Segments ---------------------------------------
+
+ /// Deferred update of the segments within the entire viewport.
/**
- * Returns enough information to determine how much additional work
- * needs to be done to update the viewport.
- * Used by viewportPaintRect().
- *
- * This routine appears to mainly refresh the segments layer. Scrolling
- * only happens if needed. Having "scroll" in the name might be
- * misleading. However, calling this refreshSegmentsLayer() confuses
- * it with refreshSegments(). Need to dig a bit more.
+ * This will cause scrollSegmentsLayer() to refresh the entire
+ * segments layer (m_segmentsLayer) the next time it is called.
+ * This in turn will cause drawAll() to redraw the entire
+ * viewport the next time it is called.
*/
- bool scrollSegmentsLayer(QRect &rect, bool& scroll);
+ void segmentsNeedRefresh() {
+ m_segmentsRefresh.setRect(contentsX(), contentsY(), viewport()->width(), viewport()->height());
+ }
- /// Draw the segments on the segment layer (m_segmentsLayer).
+ /// Deferred update of the segments within the specified rect.
/**
- * Draws the background then calls drawSegments() to draw the segments on the
- * segments layer (m_segmentsLayer). Used by
- * scrollSegmentsLayer().
- */
- void refreshSegments(const QRect&);
- /// Draw the artifacts on the double-buffer (m_doubleBuffer).
- /*
- * Calls drawArtifacts() to draw the artifacts on the double-buffer
- * (m_doubleBuffer). Used by viewportPaintRect().
+ * This will cause the given portion of the viewport to be refreshed
+ * the next time drawAll() is called.
*/
- void refreshArtifacts(const QRect&);
+ void segmentsNeedRefresh(const QRect &r) {
+ m_segmentsRefresh |=
+ (QRect(contentsX(), contentsY(), viewport()->width(), viewport()->height())
+ & r);
+ }
- /// Draws the segments on the segments layer (m_segmentsLayer).
+ /// Scroll and refresh the segment layer (m_segmentsLayer) if needed.
/**
- * Also draws the track dividers.
- *
- * Used by refreshSegments().
+ * Used by drawAll().
*/
- void drawSegments(QPainter *segmentLayerPainter, const QRect& rect);
- /// Draw the previews for audio segments on the segments layer (m_segmentsLayer).
+ void scrollSegmentsLayer();
+ int m_lastContentsX;
+ int m_lastContentsY;
+
+ /// Portion of the viewport that needs segments refreshed.
/**
- * Used by drawSegments().
+ * Used only by scrollSegmentsLayer() to limit work done redrawing
+ * the segment rectangles.
*/
- void drawAudioPreviews(QPainter * p, const QRect& rect);
- /// Draws the overlay artifacts on the double-buffer.
+ QRect m_segmentsRefresh;
+
+ /// Draw the segments on the m_segmentsLayer.
/**
- * "Artifacts" include anything that isn't a segment. E.g. The playback
- * position pointer, guides, and the "rubber band" selection. Used by
- * refreshArtifacts().
+ * Draws the background then calls drawSegments() to draw the segments on the
+ * segments layer (m_segmentsLayer). Used by
+ * scrollSegmentsLayer().
*/
- void drawArtifacts(QPainter * p, const QRect& rect);
- /// Draws a rectangle on the given painter with proper clipping.
+ void drawSegments(const QRect &);
+ QPixmap m_backgroundPixmap;
+
+ /// Draw the track dividers.
+ void drawTrackDividers(QPainter *segmentsLayerPainter, const QRect &clipRect);
+ const QColor m_trackDividerColor;
+
+ /// Draw a rectangle on the given painter.
/**
- * This is an improved QPainter::drawRect().
+ * This is QPainter::drawRect() with special handling of colors. It
+ * darkens the color of the segment based on isSelected and intersectLvl.
*
* @see drawCompRect()
*/
- void drawRect(const QRect& rect, QPainter * p, const QRect& clipRect,
- bool isSelected = false, int intersectLvl = 0, bool fill = true);
+ void drawRect(QPainter *painter, const QRect &clipRect, const QRect &rect,
+ bool isSelected = false, int intersectLvl = 0);
+
/// A version of drawRect() that handles segment repeats.
- void drawCompRect(const CompositionRect& r, QPainter *p, const QRect& clipRect,
- int intersectLvl = 0, bool fill = true);
+ void drawCompRect(QPainter *painter, const QRect &clipRect,
+ const SegmentRect &rect, int intersectLvl = 0);
+
/// Used by drawSegments() to draw the segment labels.
/**
* @see setShowSegmentLabels()
*/
- void drawCompRectLabel(const CompositionRect& r, QPainter *p, const QRect& clipRect);
+ void drawCompRectLabel(QPainter *painter,
+ const SegmentRect &rect);
+ /// Used by drawCompRectLabel() to draw a halo around a text label.
+ std::vector<QPoint> m_haloOffsets;
+
/// Used by drawSegments() to draw any intersections between rectangles.
- void drawIntersections(const CompositionModelImpl::RectContainer &, QPainter *p, const QRect &clipRect);
+ void drawIntersections(QPainter *painter, const QRect &clipRect,
+ const CompositionModelImpl::SegmentRects &rects);
- /// Used by drawArtifacts() to draw the playback position pointer.
+ /// Draw the previews for audio segments on the m_segmentsLayer.
/**
- * @see setPointerPos() and setPointerPosition()
+ * Used by drawSegments().
*/
- void drawPointer(QPainter * p, const QRect& clipRect);
- /// Used by drawArtifacts() to draw the guides on the double-buffer.
+ void drawAudioPreviews(QPainter *segmentsLayerPainter, const QRect &clipRect);
+
+ /// drawImage() for tiled audio previews.
/**
- * @see setGuidesPos() and setDrawGuides()
+ * This routine hides the fact that audio previews are stored as a
+ * series of QImage tiles. It treats them as if they were one large
+ * QImage. This simplifies drawAudioPreviews().
*/
- void drawGuides(QPainter * p, const QRect& clipRect);
- /// Used by drawArtifacts() to draw floating text.
- /**
- * @see setTextFloat()
- */
- void drawTextFloat(QPainter * p, const QRect& clipRect);
-
-// void initStepSize();
-// void releaseCurrentItem();
+ void drawImage(
+ QPainter *painter,
+ QPoint dest, const CompositionModelImpl::QImageVector &tileVector,
+ QRect source);
- /// Used by drawIntersections() to mix the brushes of intersecting rectangles.
- static QColor mixBrushes(QBrush a, QBrush b);
+ bool m_showPreviews;
+ bool m_showSegmentLabels;
- /// Helper function to make it easier to get the segment selector tool.
- SegmentSelector* getSegmentSelectorTool();
-
- /// Adds the entire viewport to the segments refresh rect.
+ /// Layer that contains the segment rectangles.
/**
- * This will cause scrollSegmentsLayer() to refresh the entire
- * segments layer (m_segmentsLayer) the next time it is called.
- * This in turn will cause viewportPaintRect() to redraw the entire
- * viewport the next time it is called.
+ * @see drawAll() and drawSegments()
*/
- void segmentsNeedRefresh() {
- m_segmentsRefresh =
- QRect(contentsX(), contentsY(), visibleWidth(), visibleHeight());
- }
+ QPixmap m_segmentsLayer;
- /// Adds the specified rect to the segments refresh rect.
+ /// Used by drawSegments().
/**
- * This will cause the given portion of the viewport to be refreshed
- * the next time viewportPaintRect() is called.
+ * This is a std::vector with one element per segment. Each element
+ * (a RectRange) contains a pair of iterators into a vector of
+ * preview QRects.
*/
- void segmentsNeedRefresh(QRect r) {
- m_segmentsRefresh |=
- (QRect(contentsX(), contentsY(), visibleWidth(), visibleHeight())
- & r);
- }
+ CompositionModelImpl::NotationPreviewRanges m_notationPreview;
+ /// Set by drawSegments(), used by drawAudioPreviews()
+ CompositionModelImpl::AudioPreviews m_audioPreview;
- /// Does the actual work for slotUpdateAll()
- void updateAll(const QRect& rect);
-
-protected slots:
+ /// Drives slotUpdateTimer().
+ QTimer m_updateTimer;
+ /// Lets slotUpdateTimer() know there's work to do.
+ bool m_updateNeeded;
+ /// Accumulated update rectangle.
+ QRect m_updateRect;
- /// Updates the artifacts in the entire viewport.
- /**
- * In addition to being used locally several times, this is also
- * connected to CompositionModelImpl::needArtifactsUpdate().
- */
- void slotArtifactsNeedRefresh() {
- m_artifactsRefresh =
- QRect(contentsX(), contentsY(), visibleWidth(), visibleHeight());
- updateContents();
- }
+ // --- Artifacts --------------------------------------
-protected:
/// Updates the artifacts in the given rect.
- void artifactsNeedRefresh(QRect r) {
- m_artifactsRefresh |=
- (QRect(contentsX(), contentsY(), visibleWidth(), visibleHeight())
- & r);
+ void updateArtifacts(const QRect &r) {
updateContents(r);
}
- /// Updates the entire viewport.
- void allNeedRefresh() {
- segmentsNeedRefresh();
- slotArtifactsNeedRefresh();
- }
-
- /// Updates the given rect on the view.
- void allNeedRefresh(QRect r) {
- segmentsNeedRefresh(r);
- artifactsNeedRefresh(r);
- }
-
-protected slots:
- /// Redraw everything with the new color scheme.
- /**
- * Connected to RosegardenDocument::docColoursChanged().
- */
- void slotRefreshColourCache();
-
- /**
- * Delegates to CompositionModelImpl::addRecordingItem().
- * Connected to RosegardenDocument::newMIDIRecordingSegment().
- *
- * Suggestion: Try eliminating this middleman.
- */
- void slotNewMIDIRecordingSegment(Segment*);
- /**
- * Delegates to CompositionModelImpl::addRecordingItem().
- * Connected to RosegardenDocument::newAudioRecordingSegment().
- *
- * Suggestion: Try eliminating this middleman.
- */
- void slotNewAudioRecordingSegment(Segment*);
-
- // no longer used, see RosegardenDocument::insertRecordedMidi()
- // void slotRecordMIDISegmentUpdated(Segment*, timeT updatedFrom);
-
- /**
- * Delegates to CompositionModelImpl::clearRecordingItems().
- * Connected to RosegardenDocument::stoppedAudioRecording() and
- * RosegardenDocument::stoppedMIDIRecording().
- */
- void slotStoppedRecording();
-
- /// Updates the tool context help and shows it if the mouse is in the view.
+ /// Draw the artifacts on the viewport.
/**
- * The tool context help appears in the status bar at the bottom.
- *
- * Connected to SegmentToolBox::showContextHelp().
- *
- * @see showContextHelp()
+ * "Artifacts" include anything that isn't a segment. E.g. The playback
+ * position pointer, guides, and the "rubber band" selection.
+ * Used by drawAll().
*/
- void slotToolHelpChanged(const QString &);
+ void drawArtifacts();
- /// Used to reduce the frequency of updates.
+ /// Used by drawArtifacts() to draw floating text.
/**
- * slotUpdateAll() sets the m_updateNeeded flag to
- * tell slotUpdateTimer() that it needs to perform an update.
+ * @see setTextFloat()
*/
- void slotUpdateTimer();
-
-protected:
-
- //--------------- Data members ---------------------------------
-
- CompositionModelImpl* m_model;
- CompositionItemPtr m_currentIndex;
-
- SegmentTool* m_tool;
- SegmentToolBox* m_toolBox;
+ void drawTextFloat(QPainter *painter);
+ bool m_drawTextFloat;
+ QString m_textFloatText;
+ QPoint m_textFloatPos;
- /// Performance testing.
- bool m_enableDrawing;
-
- bool m_showPreviews;
- bool m_showSegmentLabels;
- bool m_fineGrain;
- bool m_pencilOverExisting;
-
- //int m_minWidth;
+ // Playback Position Pointer
+ int m_pointerPos;
+ const QPen m_pointerPen;
- int m_stepSize;
- QColor m_rectFill;
- QColor m_selectedRectFill;
+ // New Segment
+ QRect m_newSegmentRect;
+ QColor m_newSegmentColor;
- int m_pointerPos;
- QColor m_pointerColor;
- int m_pointerWidth;
- QPen m_pointerPen;
+ // Split Line
+ QPoint m_splitLinePos;
- QRect m_tmpRect;
- QColor m_tmpRectFill;
- QPoint m_splitLinePos;
+ // Guides
+ bool m_drawGuides;
+ const QColor m_guideColor;
+ int m_guideX;
+ int m_guideY;
- QColor m_trackDividerColor;
+ // Selection Rect (rubber band)
+ bool m_drawSelectionRect;
+ QRect m_selectionRect;
- bool m_drawGuides;
- QColor m_guideColor;
- int m_topGuidePos;
- int m_foreGuidePos;
+ // --- Both Segments and Artifacts --------------------
- bool m_drawSelectionRect;
- QRect m_selectionRect;
+ /// Update segments and artifacts within rect.
+ void updateAll2(const QRect &rect);
- bool m_drawTextFloat;
- QString m_textFloatText;
- QPoint m_textFloatPos;
-
- /// Layer that contains the segment rectangles.
- /**
- * @see viewportPaintRect() and drawSegments()
- */
- QPixmap m_segmentsLayer;
-
- /// The display double-buffer.
- /**
- * Double-buffers are used to reduce flicker and reduce the complexity
- * of drawing code (e.g. no need to erase anything, just redraw it all).
- *
- * @see viewportPaintRect()
- */
- QPixmap m_doubleBuffer;
+ /// Update segments and artifacts within the entire viewport.
+ void updateAll() {
+ segmentsNeedRefresh();
+ slotUpdateArtifacts();
+ }
- /// Portion of the viewport that needs segments refreshed.
- /**
- * Used only by scrollSegmentsLayer() to limit work done redrawing
- * the segment rectangles.
- */
- QRect m_segmentsRefresh;
+ /// Draw the segments and artifacts on the viewport (screen).
+ void drawAll();
- /// Portion of the viewport that needs artifacts refreshed.
- /**
- * Used only by viewportPaintRect() to limit work done redrawing the
- * artifacts.
- */
- QRect m_artifactsRefresh;
+ // --- Tools ------------------------------------------
- int m_lastBufferRefreshX;
- int m_lastBufferRefreshY;
- int m_lastPointerRefreshX;
- QPixmap m_backgroundPixmap;
+ SegmentToolBox *m_toolBox;
+ /// The tool that receives mouse events.
+ SegmentTool *m_currentTool;
- QString m_toolContextHelp;
- bool m_contextHelpShown;
+ QString m_toolContextHelp;
+ bool m_contextHelpShown;
- CompositionModelImpl::AudioPreviewDrawData m_audioPreview;
- CompositionModelImpl::RectRanges m_notationPreview;
+ // --- DEBUG ------------------------------------------
- /// Drives slotUpdateTimer().
- QTimer *m_updateTimer;
- /// Lets slotUpdateTimer() know there's work to do.
- bool m_updateNeeded;
- /// Accumulated update rectangle.
- QRect m_updateRect;
+ /// Performance testing.
+ bool m_enableDrawing;
};
diff --git a/src/gui/editors/segment/compositionview/NotationPreview.cpp b/src/gui/editors/segment/compositionview/NotationPreview.cpp
deleted file mode 100644
index 81eb434..0000000
--- a/src/gui/editors/segment/compositionview/NotationPreview.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
-/*
- Rosegarden
- A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
-
- Other copyrights also apply to some parts of this work. Please
- see the AUTHORS file and individual file headers for details.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
-*/
-
-#define RG_MODULE_STRING "[NotationPreview]"
-
-#if 0 // Abandoning. No sense dragging down the build...
-
-// Local
-#include "NotationPreview.h"
-
-// Rosegarden
-#include "CompositionRect.h"
-#include "CompositionModelImpl.h"
-#include "base/Composition.h"
-#include "base/Studio.h"
-#include "base/BaseProperties.h"
-#include "base/Profiler.h"
-
-// System
-#include <math.h>
-#include <algorithm>
-
-namespace Rosegarden
-{
-
-
-NotationPreview::NotationPreview(Composition &composition,
- CompositionModelImpl &compositionModelImpl,
- Studio &studio,
- RulerScale *rulerScale,
- int vStep) :
- m_composition(composition),
- m_compositionModelImpl(compositionModelImpl),
- m_studio(studio),
- m_grid(rulerScale, vStep)
-{
-}
-
-void NotationPreview::getSegmentRects(
- const QRect &clipRect, RectRanges *notationPreview)
-{
- // The code here must mimic the code in
- // CompositionModelImpl::getSegmentRects().
-
- // This is interesting as CompositionModelImpl::getSegmentRects() is
- // essentially a renderer for all the segments and previews. It just
- // renders to rectangles. It's then up to CompositionView to draw
- // those rectangles on the screen.
-
- // The code in CompositionModelImpl::getSegmentRects() is interleaved
- // in such a way that all the work gets done at the same time. This
- // makes sense. For NotationPreview::getSegmentRects() to make sense,
- // we might need to turn CompositionModelImpl::getSegmentRects() inside
- // out and redesign it. At this point, it would probably be good to
- // think through an "ideal" design and see if that gives us any ideas.
-
- // for each segment in the composition
-
- // if the segment is moving, continue
-
- // end for
-
- // for each moving segment
- // end for
-}
-
-void NotationPreview::makeNotationPreviewRects(QPoint basePoint,
- const Segment* segment, const QRect& clipRect, RectRanges* npRects)
-{
- Profiler profiler("NotationPreview::makeNotationPreviewRects");
-
- RectList* cachedNPData = getNotationPreviewData(segment);
-
- if (cachedNPData->empty())
- return ;
-
- RectList::iterator npEnd = cachedNPData->end();
-
- // Find the first preview rect that *starts within* the clipRect.
- // Probably not the right thing to do as this means any event that starts
- // prior to the clipRect but stretches through the clipRect will be
- // dropped. And this explains why long notes disappear from the segment
- // previews.
- // Note that RectList is a std::vector, so this call will take increasing
- // amounts of time as the number of events to the left of the clipRect
- // increases. This is probably at least a small part of the "CPU usage
- // increasing over time" issue.
- // If cachedNPData is sorted by start time, we could at least do a binary
- // search.
- RectList::iterator npi = std::lower_bound(cachedNPData->begin(), npEnd, clipRect, RectCompare());
-
- // If no preview rects were within the clipRect, bail.
- if (npi == npEnd)
- return ;
-
- // ??? Go back one event if we aren't already at the beginning. Why?
- // Hilariously, this partially "fixes" the "missing event in preview"
- // problem. However, it only "fixes" the problem for a single event.
- // Is that why this is here?
- // When testing, to get around the fact that the segments are drawn on a
- // segment layer in CompositionView, just disable then re-enable segment
- // previews in the menu and the "missing event in preview" problem is easy
- // to see.
- if (npi != cachedNPData->begin())
- --npi;
-
- // Compute the interval within the Notation Preview for this segment.
-
- RectRange interval;
- interval.range.first = npi;
-
- // Compute the rightmost x coord (xLim)
- int segEndX = int(nearbyint(m_grid.getRulerScale()->getXForTime(segment->getEndMarkerTime())));
- int xLim = std::min(clipRect.right(), segEndX);
-
- //RG_DEBUG << "NotationPreview::makeNotationPreviewRects : basePoint.x : "
- // << basePoint.x();
-
- // Search sequentially for the last preview rect in the segment.
- while (npi != npEnd && npi->x() < xLim)
- ++npi;
-
- interval.range.second = npi;
- interval.basePoint.setX(0);
- interval.basePoint.setY(basePoint.y());
- interval.color = segment->getPreviewColour();
-
- // Add the interval to the caller's interval list.
- npRects->push_back(interval);
-}
-
-void NotationPreview::makeNotationPreviewRectsMovingSegment(QPoint basePoint,
- const Segment* segment, const QRect& currentSR, RectRanges* npRects)
-{
- CompositionRect unmovedSR =
- m_compositionModelImpl.computeSegmentRect(*segment);
-
- RectList* cachedNPData = getNotationPreviewData(segment);
-
- if (cachedNPData->empty())
- return ;
-
- RectList::iterator npBegin = cachedNPData->begin();
- RectList::iterator npEnd = cachedNPData->end();
-
- RectList::iterator npi;
-
- if (m_compositionModelImpl.getChangeType() ==
- CompositionModelImpl::ChangeResizeFromStart)
- npi = std::lower_bound(npBegin, npEnd, currentSR, RectCompare());
- else
- npi = std::lower_bound(npBegin, npEnd, unmovedSR, RectCompare());
-
- if (npi == npEnd)
- return ;
-
- // ??? Bump iterator back one to try and pick up the previous event
- // rectangle which might be needed.
- if (npi != npBegin &&
- m_compositionModelImpl.getChangeType() !=
- CompositionModelImpl::ChangeResizeFromStart) {
- --npi;
- }
-
- // Compute the interval within the Notation Preview for this segment.
-
- RectRange interval;
- interval.range.first = npi;
-
- // Compute the rightmost x coord (xLim)
- int xLim = m_compositionModelImpl.getChangeType() ==
- CompositionModelImpl::ChangeMove ?
- unmovedSR.right() : currentSR.right();
-
- //RG_DEBUG << "NotationPreview::makeNotationPreviewRectsMovingSegment : basePoint.x : "
- // << basePoint.x();
-
- // Search sequentially for the last preview rect in the segment.
- while (npi != npEnd && npi->x() < xLim)
- ++npi;
-
- interval.range.second = npi;
- interval.basePoint.setY(basePoint.y());
-
- if (m_compositionModelImpl.getChangeType() ==
- CompositionModelImpl::ChangeMove)
- interval.basePoint.setX(basePoint.x() - unmovedSR.x());
- else
- interval.basePoint.setX(0);
-
- interval.color = segment->getPreviewColour();
-
- npRects->push_back(interval);
-}
-
-NotationPreview::RectList* NotationPreview::getNotationPreviewData(const Segment* s)
-{
- RectList* npData = m_notationPreviewDataCache[s];
-
- if (!npData) {
- npData = makeNotationPreviewDataCache(s);
- }
-
- return npData;
-}
-
-NotationPreview::RectList* NotationPreview::makeNotationPreviewDataCache(const Segment *s)
-{
- RectList* npData = new RectList();
-
- // Create the preview
- createEventRects(s, npData);
-
- // Store in the cache.
- // Callers guarantee that m_notationPreviewDataCache[s] is not currently
- // pointing to anything.
- m_notationPreviewDataCache[s] = npData;
-
- return npData;
-}
-
-void NotationPreview::createEventRects(const Segment *segment, RectList *npData)
-{
- npData->clear();
-
- int segStartX = static_cast<int>(nearbyint(
- m_grid.getRulerScale()->getXForTime(segment->getStartTime())));
-
- bool isPercussion = false;
- Track *track = m_composition.getTrackById(segment->getTrack());
- if (track) {
- InstrumentId iid = track->getInstrument();
- Instrument *instrument = m_studio.getInstrumentById(iid);
- if (instrument && instrument->isPercussion()) isPercussion = true;
- }
-
- // For each event in the segment
- for (Segment::const_iterator i = segment->begin();
- i != segment->end(); ++i) {
-
- long pitch = 0;
- if (!(*i)->isa(Note::EventType) ||
- !(*i)->get<Int>(BaseProperties::PITCH, pitch)) {
- continue;
- }
-
- timeT eventStart = (*i)->getAbsoluteTime();
- timeT eventEnd = eventStart + (*i)->getDuration();
- // if (eventEnd > segment->getEndMarkerTime()) {
- // eventEnd = segment->getEndMarkerTime();
- // }
-
- int x = static_cast<int>(nearbyint(
- m_grid.getRulerScale()->getXForTime(eventStart)));
- int width = static_cast<int>(nearbyint(
- m_grid.getRulerScale()->getWidthForDuration(
- eventStart, eventEnd - eventStart)));
-
- //RG_DEBUG << "NotationPreview::createEventRects: x = " << x << ", width = " << width << " (time = " << eventStart << ", duration = " << eventEnd - eventStart << ")";
-
- if (x <= segStartX) {
- ++x;
- if (width > 1) --width;
- }
- if (width > 1) --width;
- if (width < 1) ++width;
-
- const double y0 = 0;
- const double y1 = m_grid.getYSnap();
- double y = y1 + ((y0 - y1) * (pitch - 16)) / 96;
-
- int height = 1;
-
- if (isPercussion) {
- height = 2;
- if (width > 2) width = 2;
- }
-
- if (y < y0) y = y0;
- if (y > y1 - height + 1) y = y1 - height + 1;
-
- // ??? static_cast<int>(nearbyint(y))?
- QRect r(x, static_cast<int>(y), width, height);
-
- npData->push_back(r);
- }
-}
-
-
-}
-
-// We're not a QObject just yet.
-//#include "NotationPreview.moc"
-#endif
diff --git a/src/gui/editors/segment/compositionview/NotationPreview.h b/src/gui/editors/segment/compositionview/NotationPreview.h
deleted file mode 100644
index 63c8618..0000000
--- a/src/gui/editors/segment/compositionview/NotationPreview.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
-/*
- Rosegarden
- A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
-
- Other copyrights also apply to some parts of this work. Please
- see the AUTHORS file and individual file headers for details.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
-*/
-
-#ifndef RG_NOTATIONPREVIEW_H
-#define RG_NOTATIONPREVIEW_H
-
-// Rosegarden
-#include "base/SnapGrid.h"
-
-// Qt
-#include <QRect>
-#include <QColor>
-
-// System
-#include <map>
-#include <vector>
-
-namespace Rosegarden
-{
-
-
-// Forward declares
-class Composition;
-class CompositionModelImpl;
-class Studio;
-class Segment;
-
-/// Draw Event objects on a QPainter
-/**
- * WORK ABANDONED
- *
- * This will likely be abandoned. I've come to the conclusion that although
- * this is a good idea, the code isn't currently organized in a way that is
- * amenable to cleanly teasing out the concept of a Notation Preview. That's
- * ok. I'm considering attacking this from a different direction. One way or
- * another, we'll get there.
- *
- * WORK IN PROGRESS
- *
- * This code is not used by any part of the system yet. I am working on
- * pulling the notation preview code out of CompositionModelImpl. This
- * will provide a class for an important concept. And that's really what
- * it's all about.
- *
- * TODO
- * - Finish bringing in all necessary pieces.
- * - Evaluate all use of m_notationPreviewDataCache in CompositionModelImpl.
- * We need to bring all of it in here.
- * - Come up with a clever way to swap this in without disturbing anything
- * so we can easily go back to the old way.
- *
- * We should probably be heading towards a MIDISegmentView class that renders
- * a segment (or all the segments in a composition) on a QPainter.
- *
- * One key question is whether this class
- * should handle a single segment, or all the segments in the composition.
- * Not sure which results in the simpler implementation. Handling a single
- * segment means the client would need to manage a collection of these
- * objects. Handling all segments means it would need to juggle a cache
- * for each segment, much like the current implementation. Maybe we could
- * do something in between. Perhaps it could look like it handles all of
- * the segments, but internally it will manage "info" structs for each
- * segment. This really doesn't have the same issues as other systems I've
- * worked on, so I'm not sure that the one-for-one approach has any benefit.
- *
- * Let's go with managing all segments first as that is in keeping with the
- * code it is coming from. Then we'll think through whether pulling out
- * the "aggregation" has any benefits.
- */
-class NotationPreview
-{
-public:
- NotationPreview(Composition &composition,
- CompositionModelImpl &compositionModelImpl,
- Studio &studio,
- RulerScale *rulerScale,
- int vStep);
-
- typedef std::vector<QRect> RectList;
-
- struct RectRange {
- std::pair<RectList::iterator, RectList::iterator> range;
- QPoint basePoint;
- QColor color;
- };
-
- typedef std::vector<RectRange> RectRanges;
-
- // From CompositionView::drawSegments().
- // ??? Should this class be able to draw itself?
- // This would mean that CompositionView could own the object.
- // I think that in the end this is indeed the right thing to do.
- // NotationPreview is a "view" class. It is a view of the
- // events in a segment drawn on a QPainter. I guess it is really
- // part of a SegmentView. So maybe we should eventually have a
- // MIDISegmentView and an AudioSegmentView. CompositionView would
- // bring these together to draw the composition.
- void draw();
-
- // From CompositionModelImpl::getSegmentRects()
- // ??? Or should it just provide this and let CompositionView draw?
- // This would mean that CompositionModelImpl might own the object.
- // Probably easiest to go with this first, then see if moving
- // draw into here is possible and whether it helps simplify things.
- void getSegmentRects(const QRect &clipRect, RectRanges *notationPreview);
-
-private:
- Composition &m_composition;
- CompositionModelImpl &m_compositionModelImpl;
- Studio &m_studio;
- SnapGrid m_grid;
-
- struct RectCompare {
- bool operator()(const QRect &r1, const QRect &r2) const {
- return r1.left() < r2.left();
- }
- };
-
- // From CompositionModelImpl::makeNotationPreviewRects()
- void makeNotationPreviewRects(QPoint basePoint,
- const Segment* segment, const QRect& clipRect, RectRanges* npRects);
-
- // From CompositionModelImpl::makeNotationPreviewRectsMovingSegment()
- void makeNotationPreviewRectsMovingSegment(QPoint basePoint,
- const Segment* segment, const QRect& currentSR, RectRanges* npRects);
-
- // From CompositionModelImpl::getNotationPreviewData()
- RectList *getNotationPreviewData(const Segment* s);
-
- // From CompositionModelImpl::makeNotationPreviewDataCache()
- RectList *makeNotationPreviewDataCache(const Segment *s);
-
- // From CompositionModelImpl::createEventRects()
- void createEventRects(const Segment *segment, RectList *rects);
-
- typedef std::map<const Segment *, RectList *> NotationPreviewDataCache;
- // ??? Need to bring in all code from CompositionModelImpl that maintains
- // this cache.
- NotationPreviewDataCache m_notationPreviewDataCache;
-};
-
-
-}
-
-#endif
diff --git a/src/gui/editors/segment/compositionview/SegmentEraser.cpp b/src/gui/editors/segment/compositionview/SegmentEraser.cpp
index cbd3703..6f0541c 100644
--- a/src/gui/editors/segment/compositionview/SegmentEraser.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentEraser.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -22,12 +22,13 @@
#include "misc/Debug.h"
#include "commands/segment/SegmentEraseCommand.h"
#include "CompositionView.h"
-#include "CompositionItem.h"
+#include "ChangingSegment.h"
#include "document/RosegardenDocument.h"
#include "gui/general/BaseTool.h"
#include "gui/general/RosegardenScrollView.h"
#include "SegmentTool.h"
#include "document/Command.h"
+#include "document/CommandHistory.h"
#include <QPoint>
#include <QString>
#include <QMouseEvent>
@@ -36,6 +37,9 @@
namespace Rosegarden
{
+
+const QString SegmentEraser::ToolName = "segmenteraser";
+
SegmentEraser::SegmentEraser(CompositionView *c, RosegardenDocument *d)
: SegmentTool(c, d)
{
@@ -48,26 +52,51 @@ void SegmentEraser::ready()
setBasicContextHelp();
}
-void SegmentEraser::handleMouseButtonPress(QMouseEvent *e)
+void SegmentEraser::mousePressEvent(QMouseEvent *e)
{
- setCurrentIndex(m_canvas->getFirstItemAt(e->pos()));
+ // Let the baseclass have a go.
+ SegmentTool::mousePressEvent(e);
+
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ // Save the Segment for the mouse release event.
+ setChangingSegment(m_canvas->getModel()->getSegmentAt(pos));
}
-void SegmentEraser::handleMouseButtonRelease(QMouseEvent*)
+void SegmentEraser::mouseReleaseEvent(QMouseEvent *e)
{
- if (m_currentIndex) {
- // no need to test the result, we know it's good (see handleMouseButtonPress)
- CompositionItem* item = m_currentIndex;
-
- addCommandToHistory(new SegmentEraseCommand(item->getSegment()));
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
+
+ // If a Segment was selected by the press event
+ if (getChangingSegment()) {
+ // Erase it
+ CommandHistory::getInstance()->addCommand(
+ new SegmentEraseCommand(getChangingSegment()->getSegment()));
}
- setCurrentIndex(CompositionItemPtr());
+ // Clear the current Segment.
+ setChangingSegment(ChangingSegmentPtr());
}
-int SegmentEraser::handleMouseMove(QMouseEvent*)
+int SegmentEraser::mouseMoveEvent(QMouseEvent *e)
{
+ // No need to propagate.
+ e->accept();
+
setBasicContextHelp();
+
return RosegardenScrollView::NoFollow;
}
@@ -76,7 +105,6 @@ void SegmentEraser::setBasicContextHelp()
setContextHelp(tr("Click on a segment to delete it"));
}
-const QString SegmentEraser::ToolName = "segmenteraser";
}
#include "SegmentEraser.moc"
diff --git a/src/gui/editors/segment/compositionview/SegmentEraser.h b/src/gui/editors/segment/compositionview/SegmentEraser.h
index be7371b..db05037 100644
--- a/src/gui/editors/segment/compositionview/SegmentEraser.h
+++ b/src/gui/editors/segment/compositionview/SegmentEraser.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -43,9 +43,9 @@ public:
virtual void ready();
- virtual void handleMouseButtonPress(QMouseEvent*);
- virtual void handleMouseButtonRelease(QMouseEvent*);
- virtual int handleMouseMove(QMouseEvent*);
+ virtual void mousePressEvent(QMouseEvent *);
+ virtual int mouseMoveEvent(QMouseEvent *);
+ virtual void mouseReleaseEvent(QMouseEvent *);
static const QString ToolName;
diff --git a/src/gui/editors/segment/compositionview/SegmentItemPreview.cpp b/src/gui/editors/segment/compositionview/SegmentItemPreview.cpp
index 9d88526..e1102d1 100644
--- a/src/gui/editors/segment/compositionview/SegmentItemPreview.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentItemPreview.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/compositionview/SegmentItemPreview.h b/src/gui/editors/segment/compositionview/SegmentItemPreview.h
index 127254d..c11c1c9 100644
--- a/src/gui/editors/segment/compositionview/SegmentItemPreview.h
+++ b/src/gui/editors/segment/compositionview/SegmentItemPreview.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/compositionview/SegmentJoiner.cpp b/src/gui/editors/segment/compositionview/SegmentJoiner.cpp
index e04ec38..6d058f2 100644
--- a/src/gui/editors/segment/compositionview/SegmentJoiner.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentJoiner.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -34,6 +34,9 @@
namespace Rosegarden
{
+
+const QString SegmentJoiner::ToolName = "segmentjoiner";
+
SegmentJoiner::SegmentJoiner(CompositionView *c, RosegardenDocument *d)
: SegmentTool(c, d)
{
@@ -44,16 +47,48 @@ SegmentJoiner::~SegmentJoiner()
{}
void
-SegmentJoiner::handleMouseButtonPress(QMouseEvent*)
-{}
+SegmentJoiner::mousePressEvent(QMouseEvent *e)
+{
+ // Let the baseclass have a go.
+ SegmentTool::mousePressEvent(e);
+
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
+
+ //QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ // ??? not implemented
+}
void
-SegmentJoiner::handleMouseButtonRelease(QMouseEvent*)
-{}
+SegmentJoiner::mouseReleaseEvent(QMouseEvent *e)
+{
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
+
+ //QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ // ??? not implemented
+}
int
-SegmentJoiner::handleMouseMove(QMouseEvent*)
+SegmentJoiner::mouseMoveEvent(QMouseEvent *e)
{
+ // No need to propagate.
+ e->accept();
+
+ //QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ // ??? not implemented
+
return RosegardenScrollView::NoFollow;
}
@@ -61,7 +96,6 @@ void
SegmentJoiner::contentsMouseDoubleClickEvent(QMouseEvent*)
{}
-const QString SegmentJoiner::ToolName = "segmentjoiner";
}
#include "SegmentJoiner.moc"
diff --git a/src/gui/editors/segment/compositionview/SegmentJoiner.h b/src/gui/editors/segment/compositionview/SegmentJoiner.h
index bd9644d..54e77be 100644
--- a/src/gui/editors/segment/compositionview/SegmentJoiner.h
+++ b/src/gui/editors/segment/compositionview/SegmentJoiner.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -43,9 +43,9 @@ public:
virtual ~SegmentJoiner();
- virtual void handleMouseButtonPress(QMouseEvent*);
- virtual void handleMouseButtonRelease(QMouseEvent*);
- virtual int handleMouseMove(QMouseEvent*);
+ virtual void mousePressEvent(QMouseEvent *);
+ virtual int mouseMoveEvent(QMouseEvent *);
+ virtual void mouseReleaseEvent(QMouseEvent *);
// don't do double clicks
virtual void contentsMouseDoubleClickEvent(QMouseEvent*);
diff --git a/src/gui/editors/segment/compositionview/SegmentMover.cpp b/src/gui/editors/segment/compositionview/SegmentMover.cpp
index 173eb09..f987e7f 100644
--- a/src/gui/editors/segment/compositionview/SegmentMover.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentMover.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -26,7 +26,6 @@
#include "base/Track.h"
#include "base/SnapGrid.h"
#include "commands/segment/SegmentReconfigureCommand.h"
-#include "CompositionItemHelper.h"
#include "CompositionModelImpl.h"
#include "CompositionView.h"
#include "document/RosegardenDocument.h"
@@ -34,8 +33,9 @@
#include "gui/general/RosegardenScrollView.h"
#include "SegmentTool.h"
#include "SegmentToolBox.h"
-#include "SegmentSelector.h"
#include "document/Command.h"
+#include "document/CommandHistory.h"
+
#include <QCursor>
#include <QEvent>
#include <QPoint>
@@ -47,8 +47,14 @@
namespace Rosegarden
{
+
+const QString SegmentMover::ToolName = "segmentmover";
+
SegmentMover::SegmentMover(CompositionView *c, RosegardenDocument *d)
- : SegmentTool(c, d)
+ : SegmentTool(c, d),
+ m_clickPoint(),
+ m_changeMade(false)
+
{
RG_DEBUG << "SegmentMover()\n";
}
@@ -56,285 +62,271 @@ SegmentMover::SegmentMover(CompositionView *c, RosegardenDocument *d)
void SegmentMover::ready()
{
m_canvas->viewport()->setCursor(Qt::SizeAllCursor);
- //connect(m_canvas, SIGNAL(contentsMoving (int, int)),
- // this, SLOT(slotCanvasScrolled(int, int)));
setBasicContextHelp();
}
void SegmentMover::stow()
{
- //disconnect(m_canvas, SIGNAL(contentsMoving (int, int)),
- // this, SLOT(slotCanvasScrolled(int, int)));
}
-void SegmentMover::slotCanvasScrolled(int newX, int newY)
+void SegmentMover::mousePressEvent(QMouseEvent *e)
{
+ // Let the baseclass have a go.
+ SegmentTool::mousePressEvent(e);
- Qt::MouseButton button = Qt::NoButton;
- Qt::MouseButtons buttons = Qt::NoButton;
- Qt::KeyboardModifiers modifiers = 0;
- QMouseEvent tmpEvent(QEvent::MouseMove,
- m_canvas->viewport()->mapFromGlobal(QCursor::pos()) + QPoint(newX, newY), button, buttons, modifiers);
- handleMouseMove(&tmpEvent);
-}
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
-void SegmentMover::handleMouseButtonPress(QMouseEvent *e)
-{
- CompositionItemPtr item = m_canvas->getFirstItemAt(e->pos());
- SegmentSelector* selector = dynamic_cast<SegmentSelector*>
- (getToolBox()->getTool("segmentselector"));
+ // No need to propagate.
+ e->accept();
- // #1027303: Segment move issue
- // Clear selection if we're clicking on an item that's not in it
- // and we're not in add mode
+ QPoint pos = m_canvas->viewportToContents(e->pos());
- if (selector && item &&
- !m_canvas->getModel()->isSelected(item) && !selector->isSegmentAdding()) {
- m_canvas->getModel()->clearSelected();
- m_canvas->getModel()->signalSelection();
-// m_canvas->updateContents();
- m_canvas->update();
- }
+ CompositionModelImpl *model = m_canvas->getModel();
- if (item) {
+ // Get the Segment that was clicked.
+ ChangingSegmentPtr changingSegment = model->getSegmentAt(pos);
- setCurrentIndex(item);
- m_clickPoint = e->pos();
- Segment* s = CompositionItemHelper::getSegment(m_currentIndex);
+ // If the segment canvas background was clicked, clear the selection.
+ if (!changingSegment) {
+ model->clearSelected();
+ model->selectionHasChanged();
+ m_canvas->update();
+ return;
+ }
- int x = int(m_canvas->grid().getRulerScale()->getXForTime(s->getStartTime()));
- int y = int(m_canvas->grid().getYBinCoordinate(s->getTrack()));
+ // The original segment in the composition.
+ Segment *segment = changingSegment->getSegment();
- m_canvas->setGuidesPos(x, y);
- m_canvas->setDrawGuides(true);
+ // If we're clicking on a segment that isn't in the selection
+ if (!model->isSelected(segment)) {
- if (m_canvas->getModel()->haveSelection()) {
- RG_DEBUG << "SegmentMover::handleMouseButtonPress() : haveSelection\n";
- // startChange on all selected segments
- m_canvas->getModel()->startChangeSelection(CompositionModelImpl::ChangeMove);
+ // Clear the selection.
+ model->clearSelected();
+ model->selectionHasChanged();
+ }
+ setChangingSegment(changingSegment);
+ m_clickPoint = pos;
- CompositionModelImpl::ItemContainer& changingItems = m_canvas->getModel()->getChangingItems();
- // set m_currentIndex to its "sibling" among selected (now moving) items
- setCurrentIndex(CompositionItemHelper::findSiblingCompositionItem(changingItems, m_currentIndex));
+ setSnapTime(e, SnapGrid::SnapToBeat);
- } else {
- RG_DEBUG << "SegmentMover::handleMouseButtonPress() : no selection\n";
- m_canvas->getModel()->startChange(item, CompositionModelImpl::ChangeMove);
- }
+ int x = int(m_canvas->grid().getRulerScale()->getXForTime(
+ segment->getStartTime()));
+ int y = m_canvas->grid().getYBinCoordinate(segment->getTrack());
-// m_canvas->updateContents();
- m_canvas->update();
+ m_canvas->drawGuides(x, y);
- m_passedInertiaEdge = false;
+ // If some segments are already selected
+ if (model->haveSelection()) {
- } else {
+ // Start the move on all selected segments
+ model->startChangeSelection(CompositionModelImpl::ChangeMove);
+
+ // Find the clicked segment in the model.
+ ChangingSegmentPtr newChangingSegment =
+ model->findChangingSegment(segment);
- // check for addmode - clear the selection if not
- RG_DEBUG << "SegmentMover::handleMouseButtonPress() : clear selection\n";
- m_canvas->getModel()->clearSelected();
- m_canvas->getModel()->signalSelection();
-// m_canvas->updateContents();
- m_canvas->update();
- }
+ if (newChangingSegment) {
+ // Toss the local "changing" segment since it isn't going to
+ // be moving at all. Swap it for the same changing segment in
+ // the model. That one *will* be moving and can be used to
+ // drive the guides.
+ setChangingSegment(newChangingSegment);
+ }
+
+ } else { // Nothing selected, just move the one that was clicked
+ model->startChange(changingSegment, CompositionModelImpl::ChangeMove);
+ }
+ m_canvas->update();
}
-void SegmentMover::handleMouseButtonRelease(QMouseEvent *e)
+void SegmentMover::mouseReleaseEvent(QMouseEvent *e)
{
- Composition &comp = m_doc->getComposition();
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
- int startDragTrackPos = m_canvas->grid().getYBin(m_clickPoint.y());
- int currentTrackPos = m_canvas->grid().getYBin(e->pos().y());
- int trackDiff = currentTrackPos - startDragTrackPos;
+ // No need to propagate.
+ e->accept();
- if (m_currentIndex) {
+ // If we weren't moving anything, bail.
+ if (!getChangingSegment())
+ return;
- if (changeMade()) {
+ if (m_changeMade) {
- CompositionModelImpl::ItemContainer& changingItems = m_canvas->getModel()->getChangingItems();
+ QPoint pos = m_canvas->viewportToContents(e->pos());
- SegmentReconfigureCommand *command =
- new SegmentReconfigureCommand
- (changingItems.size() == 1 ? tr("Move Segment") : tr("Move Segments"), &comp);
+ // Compute how far we've moved vertically.
+ const int startTrackPos = m_canvas->grid().getYBin(m_clickPoint.y());
+ const int currentTrackPos = m_canvas->grid().getYBin(pos.y());
+ const int deltaTrack = currentTrackPos - startTrackPos;
+ CompositionModelImpl::ChangingSegmentSet &changingSegments =
+ m_canvas->getModel()->getChangingSegments();
- CompositionModelImpl::ItemContainer::iterator it;
+ Composition &comp = m_doc->getComposition();
- for (it = changingItems.begin();
- it != changingItems.end();
- ++it) {
+ SegmentReconfigureCommand *command =
+ new SegmentReconfigureCommand(
+ changingSegments.size() == 1 ?
+ tr("Move Segment") :
+ tr("Move Segments"),
+ &comp);
- CompositionItemPtr item = *it;
+ // For each changing segment
+ for (CompositionModelImpl::ChangingSegmentSet::iterator it =
+ changingSegments.begin();
+ it != changingSegments.end();
+ ++it) {
- Segment* segment = CompositionItemHelper::getSegment(item);
+ ChangingSegmentPtr changingSegment = *it;
- TrackId origTrackId = segment->getTrack();
- int trackPos = comp.getTrackPositionById(origTrackId);
- trackPos += trackDiff;
+ // The original Segment in the Composition.
+ Segment *segment = changingSegment->getSegment();
- if (trackPos < 0) {
- trackPos = 0;
- } else if (trackPos >= (int)comp.getNbTracks()) {
- trackPos = comp.getNbTracks() - 1;
- }
+ // New Track ID
- Track *newTrack = comp.getTrackByPosition(trackPos);
- int newTrackId = origTrackId;
- if (newTrack) newTrackId = newTrack->getId();
+ TrackId origTrackId = segment->getTrack();
+ int trackPos = comp.getTrackPositionById(origTrackId) + deltaTrack;
- timeT newStartTime = CompositionItemHelper::getStartTime(item, m_canvas->grid());
+ if (trackPos < 0) {
+ trackPos = 0;
+ } else if (trackPos >= (int)comp.getNbTracks()) {
+ trackPos = comp.getNbTracks() - 1;
+ }
- // We absolutely don't want to snap the end time
- // to the grid. We want it to remain exactly the same
- // as it was, but relative to the new start time.
- timeT newEndTime = newStartTime + segment->getEndMarkerTime(false)
- - segment->getStartTime();
+ Track *newTrack = comp.getTrackByPosition(trackPos);
- command->addSegment(segment,
- newStartTime,
- newEndTime,
- newTrackId);
- }
+ int newTrackId = origTrackId;
+ if (newTrack)
+ newTrackId = newTrack->getId();
+
+ // New start time
+
+ timeT newStartTime = changingSegment->getStartTime(m_canvas->grid());
+
+ // New end time
+
+ // We absolutely don't want to snap the end time
+ // to the grid. We want it to remain exactly the same
+ // as it was, but relative to the new start time.
+ timeT newEndTime = newStartTime +
+ segment->getEndMarkerTime(false) - segment->getStartTime();
+
+ // Add the changed segment to the command
- addCommandToHistory(command);
+ command->addSegment(segment,
+ newStartTime,
+ newEndTime,
+ newTrackId);
}
- m_canvas->hideTextFloat();
- m_canvas->setDrawGuides(false);
- m_canvas->getModel()->endChange();
- m_canvas->slotUpdateAll();
+ CommandHistory::getInstance()->addCommand(command);
+ m_changeMade = false;
}
- setChangeMade(false);
- m_currentIndex = CompositionItemPtr();
+ m_canvas->hideTextFloat();
+ m_canvas->hideGuides();
+ m_canvas->getModel()->endChange();
+ m_canvas->slotUpdateAll();
+
+ setChangingSegment(ChangingSegmentPtr());
setBasicContextHelp();
}
-int SegmentMover::handleMouseMove(QMouseEvent *e)
+int SegmentMover::mouseMoveEvent(QMouseEvent *e)
{
- m_canvas->setSnapGrain(true);
-
- Composition &comp = m_doc->getComposition();
+ // No need to propagate.
+ e->accept();
- if (!m_currentIndex) {
- setBasicContextHelp();
+ // If we aren't moving anything, bail.
+ if (!getChangingSegment())
return RosegardenScrollView::NoFollow;
- }
- if (!m_canvas->isFineGrain()) {
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ setSnapTime(e, SnapGrid::SnapToBeat);
+
+ // If shift isn't being held down
+ if ((e->modifiers() & Qt::ShiftModifier) == 0) {
setContextHelp(tr("Hold Shift to avoid snapping to beat grid"));
} else {
clearContextHelp();
}
- CompositionModelImpl::ItemContainer& changingItems = m_canvas->getModel()->getChangingItems();
-
- // RG_DEBUG << "SegmentMover::handleMouseMove : nb changingItems = "
- // << changingItems.size() << endl;
-
- CompositionModelImpl::ItemContainer::iterator it;
- int guideX = 0;
- int guideY = 0;
- QRect updateRect;
+ const SnapGrid &grid = m_canvas->grid();
- for (it = changingItems.begin();
- it != changingItems.end();
- ++it) {
- // it->second->showRepeatRect(false);
-
- int dx = e->pos().x() - m_clickPoint.x(),
- dy = e->pos().y() - m_clickPoint.y();
-
- const int inertiaDistance = m_canvas->grid().getYSnap() / 3;
- if (!m_passedInertiaEdge &&
- (dx < inertiaDistance && dx > -inertiaDistance) &&
- (dy < inertiaDistance && dy > -inertiaDistance)) {
- return RosegardenScrollView::NoFollow;
- } else {
- m_passedInertiaEdge = true;
- }
+ // Compute how far we've moved vertically.
+ const int startTrackPos = grid.getYBin(m_clickPoint.y());
+ const int currentTrackPos = grid.getYBin(pos.y());
+ const int deltaTrack = currentTrackPos - startTrackPos;
- timeT newStartTime = m_canvas->grid().snapX((*it)->savedRect().x() + dx);
+ const int dx = pos.x() - m_clickPoint.x();
- int newX = int(m_canvas->grid().getRulerScale()->getXForTime(newStartTime));
+ Composition &comp = m_doc->getComposition();
- int startDragTrackPos = m_canvas->grid().getYBin(m_clickPoint.y());
- int currentTrackPos = m_canvas->grid().getYBin(e->pos().y());
- int trackDiff = currentTrackPos - startDragTrackPos;
- int trackPos = m_canvas->grid().getYBin((*it)->savedRect().y());
+ CompositionModelImpl::ChangingSegmentSet &changingSegments =
+ m_canvas->getModel()->getChangingSegments();
-// std::cerr << "segment " << *it << ": mouse started at track " << startDragTrackPos << ", is now at " << currentTrackPos << ", trackPos from " << trackPos << " to ";
+ // For each changing segment, move it
+ for (CompositionModelImpl::ChangingSegmentSet::iterator it =
+ changingSegments.begin();
+ it != changingSegments.end();
+ ++it) {
- trackPos += trackDiff;
+ ChangingSegmentPtr changingSegment = *it;
-// std::cerr << trackPos << std::endl;
+ const timeT newStartTime = grid.snapX(changingSegment->savedRect().x() + dx);
+ const int newX = int(grid.getRulerScale()->getXForTime(newStartTime));
- if (trackPos < 0) {
+ int trackPos = grid.getYBin(changingSegment->savedRect().y()) + deltaTrack;
+ if (trackPos < 0)
trackPos = 0;
- } else if (trackPos >= (int)comp.getNbTracks()) {
- trackPos = comp.getNbTracks() - 1;
- }
-/*!!!
- int newY = m_canvas->grid().snapY((*it)->savedRect().y() + dy);
- // Make sure we don't set a non-existing track
- if (newY < 0) {
- newY = 0;
- }
- int trackPos = m_canvas->grid().getYBin(newY);
-
- // RG_DEBUG << "SegmentMover::handleMouseMove: orig y "
- // << (*it)->savedRect().y()
- // << ", dy " << dy << ", newY " << newY
- // << ", track " << track << endl;
-
- // Make sure we don't set a non-existing track (c'td)
- // TODO: make this suck less. Either the tool should
- // not allow it in the first place, or we automatically
- // create new tracks - might make undo very tricky though
- //
- if (trackPos >= comp.getNbTracks())
+ if (trackPos >= (int)comp.getNbTracks())
trackPos = comp.getNbTracks() - 1;
-*/
- int newY = m_canvas->grid().getYBinCoordinate(trackPos);
+ const int newY = grid.getYBinCoordinate(trackPos);
- // RG_DEBUG << "SegmentMover::handleMouseMove: moving to "
- // << newX << "," << newY << endl;
+ changingSegment->moveTo(newX, newY);
+ m_changeMade = true;
+ }
- updateRect |= (*it)->rect();
- (*it)->moveTo(newX, newY);
- updateRect |= (*it)->rect();
- setChangeMade(true);
+ if (m_changeMade) {
+ // Make sure the segments are redrawn.
+ m_canvas->slotUpdateAll();
}
- if (changeMade())
- m_canvas->getModel()->signalContentChange();
+ // Draw the guides
- guideX = m_currentIndex->rect().x();
- guideY = m_currentIndex->rect().y();
+ int guideX = getChangingSegment()->rect().x();
+ int guideY = getChangingSegment()->rect().y();
- m_canvas->setGuidesPos(guideX, guideY);
+ m_canvas->drawGuides(guideX, guideY);
- timeT currentIndexStartTime = m_canvas->grid().snapX(m_currentIndex->rect().x());
+ // Format and draw the text float
- RealTime time = comp.getElapsedRealTime(currentIndexStartTime);
- QString ms;
- ms.sprintf("%03d", time.msec());
+ timeT guideTime = grid.snapX(guideX);
+
+ RealTime time = comp.getElapsedRealTime(guideTime);
int bar, beat, fraction, remainder;
- comp.getMusicalTimeForAbsoluteTime(currentIndexStartTime, bar, beat, fraction, remainder);
+ comp.getMusicalTimeForAbsoluteTime(guideTime, bar, beat, fraction, remainder);
- QString posString = QString("%1.%2s (%3, %4, %5)")
- .arg(time.sec).arg(ms)
+ QString timeString = QString("%1.%2s (%3, %4, %5)")
+ .arg(time.sec).arg(time.msec(), 3, 10, QChar('0'))
.arg(bar + 1).arg(beat).arg(fraction);
- m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
-// m_canvas->updateContents();
+ m_canvas->drawTextFloat(guideX + 10, guideY - 30, timeString);
+
m_canvas->update();
- return RosegardenScrollView::FollowHorizontal | RosegardenScrollView::FollowVertical;
+ return RosegardenScrollView::FollowHorizontal |
+ RosegardenScrollView::FollowVertical;
}
void SegmentMover::setBasicContextHelp()
@@ -342,7 +334,6 @@ void SegmentMover::setBasicContextHelp()
setContextHelp(tr("Click and drag to move a segment"));
}
-const QString SegmentMover::ToolName = "segmentmover";
}
#include "SegmentMover.moc"
diff --git a/src/gui/editors/segment/compositionview/SegmentMover.h b/src/gui/editors/segment/compositionview/SegmentMover.h
index f732a58..64e9163 100644
--- a/src/gui/editors/segment/compositionview/SegmentMover.h
+++ b/src/gui/editors/segment/compositionview/SegmentMover.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -41,28 +41,22 @@ class SegmentMover : public SegmentTool
friend class SegmentToolBox;
public:
-
virtual void ready();
virtual void stow();
- virtual void handleMouseButtonPress(QMouseEvent*);
- virtual void handleMouseButtonRelease(QMouseEvent*);
- virtual int handleMouseMove(QMouseEvent*);
+ virtual void mousePressEvent(QMouseEvent *);
+ virtual int mouseMoveEvent(QMouseEvent *);
+ virtual void mouseReleaseEvent(QMouseEvent *);
static const QString ToolName;
-protected slots:
- void slotCanvasScrolled(int newX, int newY);
-
protected:
SegmentMover(CompositionView*, RosegardenDocument*);
void setBasicContextHelp();
- //--------------- Data members ---------------------------------
-
- QPoint m_clickPoint;
- bool m_passedInertiaEdge;
+ QPoint m_clickPoint;
+ bool m_changeMade;
};
diff --git a/src/gui/editors/segment/compositionview/SegmentOrderer.cpp b/src/gui/editors/segment/compositionview/SegmentOrderer.cpp
index c4959f7..ac0576d 100644
--- a/src/gui/editors/segment/compositionview/SegmentOrderer.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentOrderer.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/compositionview/SegmentOrderer.h b/src/gui/editors/segment/compositionview/SegmentOrderer.h
index 9a2219a..c5222e3 100644
--- a/src/gui/editors/segment/compositionview/SegmentOrderer.h
+++ b/src/gui/editors/segment/compositionview/SegmentOrderer.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/compositionview/SegmentPencil.cpp b/src/gui/editors/segment/compositionview/SegmentPencil.cpp
index 7bc36ad..4e825cf 100644
--- a/src/gui/editors/segment/compositionview/SegmentPencil.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentPencil.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -26,7 +26,6 @@
#include "base/SnapGrid.h"
#include "base/Track.h"
#include "commands/segment/SegmentInsertCommand.h"
-#include "CompositionItemHelper.h"
#include "CompositionView.h"
#include "document/RosegardenDocument.h"
#include "gui/general/BaseTool.h"
@@ -34,6 +33,8 @@
#include "gui/general/RosegardenScrollView.h"
#include "SegmentTool.h"
#include "document/Command.h"
+#include "document/CommandHistory.h"
+
#include <QCursor>
#include <QEvent>
#include <QPoint>
@@ -44,6 +45,8 @@
namespace Rosegarden
{
+const QString SegmentPencil::ToolName = "segmentpencil";
+
SegmentPencil::SegmentPencil(CompositionView *c, RosegardenDocument *d)
: SegmentTool(c, d),
m_newRect(false),
@@ -57,59 +60,59 @@ SegmentPencil::SegmentPencil(CompositionView *c, RosegardenDocument *d)
void SegmentPencil::ready()
{
m_canvas->viewport()->setCursor(Qt::IBeamCursor);
- //connect(m_canvas, SIGNAL(contentsMoving (int, int)),
- // this, SLOT(slotCanvasScrolled(int, int)));
setContextHelpFor(QPoint(0, 0));
}
void SegmentPencil::stow()
{
- //disconnect(m_canvas, SIGNAL(contentsMoving (int, int)),
- // this, SLOT(slotCanvasScrolled(int, int)));
}
-void SegmentPencil::slotCanvasScrolled(int newX, int newY)
+void SegmentPencil::mousePressEvent(QMouseEvent *e)
{
- Qt::MouseButton button = Qt::NoButton;
- Qt::MouseButtons buttons = Qt::NoButton;
- Qt::KeyboardModifiers modifiers = 0;
- QMouseEvent tmpEvent(QEvent::MouseMove,
- m_canvas->viewport()->mapFromGlobal(QCursor::pos()) + QPoint(newX, newY), button, buttons, modifiers);
- handleMouseMove(&tmpEvent);
-}
+ // Let the baseclass have a go.
+ SegmentTool::mousePressEvent(e);
-void SegmentPencil::handleMouseButtonPress(QMouseEvent *e)
-{
- if (e->button() != Qt::LeftButton)
+ // We only care about the left and middle mouse buttons.
+ // SegmentSelector might send us a middle press.
+ if (e->button() != Qt::LeftButton &&
+ e->button() != Qt::MidButton)
return;
+ // No need to propagate.
+ e->accept();
+
// is user holding Ctrl+Alt? (ugly, but we are running short on available
// modifiers; Alt is grabbed by the window manager, and right clicking, my
// (dmm) original idea, is grabbed by the context menu, so let's see how
// this goes over
- bool pencilAnyway = (m_canvas->pencilOverExisting());
+ // ??? Why not just set this to true? The use case is starting a
+ // pencil click/drag on top of an existing segment. If the
+ // user wants to draw a segment on top of a segment, just let
+ // them. Maybe this was an issue when segments could overlap?
+ bool pencilAnyway = ((e->modifiers() & Qt::AltModifier) != 0 &&
+ (e->modifiers() & Qt::ControlModifier) != 0);
m_newRect = false;
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
// Check if mouse click was on a rect
//
- CompositionItemPtr item = m_canvas->getFirstItemAt(e->pos());
+ ChangingSegmentPtr item = m_canvas->getModel()->getSegmentAt(pos);
// If user clicked a rect, and pencilAnyway is false, then there's nothing
// left to do here
if (item) {
- delete item;
if (!pencilAnyway) return ;
}
// make new item
- // Switch to coarse-grain snap resolution.
- m_canvas->setSnapGrain(false);
-
SnapGrid &snapGrid = m_canvas->grid();
- int trackPosition = snapGrid.getYBin(e->pos().y());
+ setSnapTime(e, SnapGrid::SnapToBar);
+
+ int trackPosition = snapGrid.getYBin(pos.y());
// Don't do anything if the user clicked beyond the track buttons
//
@@ -123,7 +126,7 @@ void SegmentPencil::handleMouseButtonPress(QMouseEvent *e)
TrackId trackId = t->getId();
// Save the mouse X as the original Press point
- m_pressX = e->pos().x();
+ m_pressX = pos.x();
m_startTime = snapGrid.snapX(m_pressX, SnapGrid::SnapLeft);
m_endTime = snapGrid.snapX(m_pressX, SnapGrid::SnapRight);
@@ -145,43 +148,46 @@ void SegmentPencil::handleMouseButtonPress(QMouseEvent *e)
tmpRect.setY(snapGrid.getYBinCoordinate(trackPosition) + 1);
tmpRect.setHeight(snapGrid.getYSnap() * multiple - 2);
- m_canvas->setTmpRect(tmpRect,
- GUIPalette::convertColour
- (m_doc->getComposition().getSegmentColourMap().
- getColourByIndex(t->getColor())));
+ m_canvas->setNewSegmentColor(GUIPalette::convertColour(
+ m_doc->getComposition().getSegmentColourMap().
+ getColourByIndex(t->getColor())));
+ m_canvas->drawNewSegment(tmpRect);
m_newRect = true;
m_canvas->update(tmpRect);
}
-void SegmentPencil::handleMouseButtonRelease(QMouseEvent* e)
+void SegmentPencil::mouseReleaseEvent(QMouseEvent *e)
{
- if (e->button() != Qt::LeftButton)
- return ;
+ // Have to allow middle button for SegmentSelector's middle
+ // button feature to work.
+ if (e->button() != Qt::LeftButton &&
+ e->button() != Qt::MidButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
- setContextHelpFor(e->pos());
+ setContextHelpFor(pos);
if (m_newRect) {
- QRect tmpRect = m_canvas->getTmpRect();
+ QRect tmpRect = m_canvas->getNewSegmentRect();
int trackPosition = m_canvas->grid().getYBin(tmpRect.y());
Track *track =
m_doc->getComposition().getTrackByPosition(trackPosition);
-//RG_DEBUG << "SegmentPencil::handleMouseButtonRelease():";
-//RG_DEBUG << " m_startTime = " << m_startTime;
-//RG_DEBUG << " m_endTime = " << m_endTime;
-//RG_DEBUG << " track id = " << track->getId();
-
SegmentInsertCommand *command =
new SegmentInsertCommand(m_doc, track->getId(),
m_startTime, m_endTime);
m_newRect = false;
- addCommandToHistory(command);
+ CommandHistory::getInstance()->addCommand(command);
// add the SegmentItem by hand, instead of allowing the usual
// update mechanism to spot it. This way we can select the
@@ -211,38 +217,42 @@ void SegmentPencil::handleMouseButtonRelease(QMouseEvent* e)
segment->setLabel( track->getPresetLabel().c_str() );
}
- CompositionItemPtr item = CompositionItemHelper::makeCompositionItem(segment);
m_canvas->getModel()->clearSelected();
- m_canvas->getModel()->setSelected(item);
- m_canvas->getModel()->signalSelection();
+ m_canvas->getModel()->setSelected(segment);
+ m_canvas->getModel()->selectionHasChanged();
- m_canvas->setTmpRect(QRect());
+ m_canvas->hideNewSegment();
m_canvas->slotUpdateAll();
}
}
-int SegmentPencil::handleMouseMove(QMouseEvent *e)
+int SegmentPencil::mouseMoveEvent(QMouseEvent *e)
{
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
if (!m_newRect) {
- setContextHelpFor(e->pos());
+ setContextHelpFor(pos);
return RosegardenScrollView::NoFollow;
}
- if (!m_canvas->isFineGrain()) {
+ // If shift isn't being held down
+ if ((e->modifiers() & Qt::ShiftModifier) == 0) {
setContextHelp(tr("Hold Shift to avoid snapping to bar lines"));
} else {
clearContextHelp();
}
- QRect tmpRect = m_canvas->getTmpRect();
-
- // Switch to coarse-grain snap resolution.
- m_canvas->setSnapGrain(false);
+ QRect tmpRect = m_canvas->getNewSegmentRect();
SnapGrid &snapGrid = m_canvas->grid();
- int mouseX = e->pos().x();
+ setSnapTime(e, SnapGrid::SnapToBar);
+
+ int mouseX = pos.x();
// if mouse X is to the right of the original Press point
if (mouseX >= m_pressX) {
@@ -268,7 +278,7 @@ int SegmentPencil::handleMouseMove(QMouseEvent *e)
tmpRect.setLeft(leftX);
tmpRect.setRight(rightX);
- m_canvas->setTmpRect(tmpRect);
+ m_canvas->drawNewSegment(tmpRect);
return RosegardenScrollView::FollowHorizontal;
}
@@ -290,7 +300,5 @@ void SegmentPencil::setContextHelpFor(QPoint p)
setContextHelp(tr("Click and drag to draw an empty segment. Control+Alt click and drag to draw in overlap mode."));
}
-const QString SegmentPencil::ToolName = "segmentpencil";
-
}
#include "SegmentPencil.moc"
diff --git a/src/gui/editors/segment/compositionview/SegmentPencil.h b/src/gui/editors/segment/compositionview/SegmentPencil.h
index e0fcc10..c3e7683 100644
--- a/src/gui/editors/segment/compositionview/SegmentPencil.h
+++ b/src/gui/editors/segment/compositionview/SegmentPencil.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -49,15 +49,12 @@ public:
virtual void ready();
virtual void stow();
- virtual void handleMouseButtonPress(QMouseEvent*);
- virtual void handleMouseButtonRelease(QMouseEvent*);
- virtual int handleMouseMove(QMouseEvent*);
+ virtual void mousePressEvent(QMouseEvent *);
+ virtual int mouseMoveEvent(QMouseEvent *);
+ virtual void mouseReleaseEvent(QMouseEvent *);
static const QString ToolName;
-protected slots:
- void slotCanvasScrolled(int newX, int newY);
-
protected:
SegmentPencil(CompositionView*, RosegardenDocument*);
void setContextHelpFor(QPoint p);
diff --git a/src/gui/editors/segment/compositionview/SegmentRect.cpp b/src/gui/editors/segment/compositionview/SegmentRect.cpp
new file mode 100644
index 0000000..5663e33
--- /dev/null
+++ b/src/gui/editors/segment/compositionview/SegmentRect.cpp
@@ -0,0 +1,60 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
+
+/*
+ Rosegarden
+ A MIDI and audio sequencer and musical notation editor.
+ Copyright 2000-2015 the Rosegarden development team.
+
+ Other copyrights also apply to some parts of this work. Please
+ see the AUTHORS file and individual file headers for details.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version. See the file
+ COPYING included with this distribution for more information.
+*/
+
+
+#include "SegmentRect.h"
+#include "base/ColourMap.h"
+
+#include <QBrush>
+#include <QColor>
+#include <QPen>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
+#include <QString>
+
+
+namespace Rosegarden
+{
+
+
+const QColor SegmentRect::DefaultPenColor = QColor(Qt::black);
+const QColor SegmentRect::DefaultBrushColor = QColor(COLOUR_DEF_R, COLOUR_DEF_G, COLOUR_DEF_B);
+
+SegmentRect SegmentRect::intersected(const SegmentRect &other) const
+{
+ SegmentRect intersected;
+ intersected.rect = rect.intersected(other.rect);
+
+ // Mix m_brush colors
+ const QColor &thisColor = brush.color();
+ const QColor &otherColor = other.brush.color();
+
+ QColor color((thisColor.red() + otherColor.red()) / 2,
+ (thisColor.green() + otherColor.green()) / 2,
+ (thisColor.blue() + otherColor.blue()) / 2);
+
+ intersected.brush = color;
+
+ // Combine selected
+ intersected.selected = (selected || other.selected);
+
+ return intersected;
+}
+
+
+}
diff --git a/src/gui/editors/segment/compositionview/SegmentRect.h b/src/gui/editors/segment/compositionview/SegmentRect.h
new file mode 100644
index 0000000..86f4865
--- /dev/null
+++ b/src/gui/editors/segment/compositionview/SegmentRect.h
@@ -0,0 +1,97 @@
+
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
+
+/*
+ Rosegarden
+ A MIDI and audio sequencer and musical notation editor.
+ Copyright 2000-2015 the Rosegarden development team.
+
+ Other copyrights also apply to some parts of this work. Please
+ see the AUTHORS file and individual file headers for details.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version. See the file
+ COPYING included with this distribution for more information.
+*/
+
+#ifndef RG_SEGMENTRECT_H
+#define RG_SEGMENTRECT_H
+
+#include <QBrush>
+#include <QColor>
+#include <QPen>
+#include <QRect>
+#include <QString>
+
+#include <vector>
+
+
+class QSize;
+class QPoint;
+
+
+namespace Rosegarden
+{
+
+/// A segment rectangle.
+class SegmentRect
+{
+public:
+ SegmentRect() :
+ rect(),
+ selected(false),
+ brush(DefaultBrushColor),
+ pen(DefaultPenColor),
+ repeatMarks(),
+ baseWidth(0),
+ label()
+ { }
+
+ SegmentRect(const QRect &r) :
+ rect(r),
+ selected(false),
+ brush(DefaultBrushColor),
+ pen(DefaultPenColor),
+ repeatMarks(),
+ baseWidth(0),
+ label()
+ { }
+
+ SegmentRect(const QPoint &topLeft, const QSize &size) :
+ rect(topLeft, size),
+ selected(false),
+ brush(DefaultBrushColor),
+ pen(DefaultPenColor),
+ repeatMarks(),
+ baseWidth(0),
+ label()
+ { }
+
+ QRect rect;
+
+ bool selected;
+
+ QBrush brush;
+ static const QColor DefaultBrushColor;
+
+ QPen pen;
+ static const QColor DefaultPenColor;
+
+ typedef std::vector<int> RepeatMarks;
+ RepeatMarks repeatMarks;
+ bool isRepeating() const { return !repeatMarks.empty(); }
+
+ int baseWidth;
+
+ QString label;
+
+ /// Like QRect::intersected(), but also combines the brush colors.
+ SegmentRect intersected(const SegmentRect &other) const;
+};
+
+
+}
+
+#endif
diff --git a/src/gui/editors/segment/compositionview/SegmentResizer.cpp b/src/gui/editors/segment/compositionview/SegmentResizer.cpp
index 26b9283..61c8dc3 100644
--- a/src/gui/editors/segment/compositionview/SegmentResizer.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentResizer.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -32,7 +32,6 @@
#include "commands/segment/SegmentReconfigureCommand.h"
#include "commands/segment/SegmentResizeFromStartCommand.h"
#include "commands/segment/SegmentLinkToCopyCommand.h"
-#include "CompositionItemHelper.h"
#include "CompositionModelImpl.h"
#include "CompositionView.h"
#include "document/RosegardenDocument.h"
@@ -42,6 +41,8 @@
#include "gui/widgets/ProgressDialog.h"
#include "SegmentTool.h"
#include "document/Command.h"
+#include "document/CommandHistory.h"
+
#include <QMessageBox>
#include <QCursor>
#include <QEvent>
@@ -54,6 +55,9 @@
namespace Rosegarden
{
+
+const QString SegmentResizer::ToolName = "segmentresizer";
+
SegmentResizer::SegmentResizer(CompositionView *c, RosegardenDocument *d,
int edgeThreshold)
: SegmentTool(c, d),
@@ -65,37 +69,37 @@ SegmentResizer::SegmentResizer(CompositionView *c, RosegardenDocument *d,
void SegmentResizer::ready()
{
m_canvas->viewport()->setCursor(Qt::SizeHorCursor);
- //connect(m_canvas, SIGNAL(contentsMoving (int, int)),
- // this, SLOT(slotCanvasScrolled(int, int)));
setBasicContextHelp(false);
}
void SegmentResizer::stow()
{
- //disconnect(m_canvas, SIGNAL(contentsMoving (int, int)),
- // this, SLOT(slotCanvasScrolled(int, int)));
}
-void SegmentResizer::slotCanvasScrolled(int newX, int newY)
+void SegmentResizer::mousePressEvent(QMouseEvent *e)
{
- QMouseEvent tmpEvent(QEvent::MouseMove,
- m_canvas->viewport()->mapFromGlobal(QCursor::pos()) + QPoint(newX, newY),
- Qt::NoButton, Qt::NoButton, 0);
- handleMouseMove(&tmpEvent);
-}
+ RG_DEBUG << "SegmentResizer::mousePressEvent" << endl;
-void SegmentResizer::handleMouseButtonPress(QMouseEvent *e)
-{
- RG_DEBUG << "SegmentResizer::handleMouseButtonPress" << endl;
+ // Let the baseclass have a go.
+ SegmentTool::mousePressEvent(e);
+
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
- CompositionItemPtr item = m_canvas->getFirstItemAt(e->pos());
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ ChangingSegmentPtr item = m_canvas->getModel()->getSegmentAt(pos);
if (item) {
- RG_DEBUG << "SegmentResizer::handleMouseButtonPress - got item" << endl;
- setCurrentIndex(item);
+ RG_DEBUG << "SegmentResizer::mousePressEvent - got item" << endl;
+ setChangingSegment(item);
// Are we resizing from start or end?
- if (item->rect().x() + item->rect().width() / 2 > e->pos().x()) {
+ if (item->rect().x() + item->rect().width() / 2 > pos.x()) {
m_resizeStart = true;
} else {
m_resizeStart = false;
@@ -105,18 +109,26 @@ void SegmentResizer::handleMouseButtonPress(QMouseEvent *e)
m_resizeStart ? CompositionModelImpl::ChangeResizeFromStart :
CompositionModelImpl::ChangeResizeFromEnd);
+ setSnapTime(e, SnapGrid::SnapToBeat);
}
}
-void SegmentResizer::handleMouseButtonRelease(QMouseEvent *e)
+void SegmentResizer::mouseReleaseEvent(QMouseEvent *e)
{
- RG_DEBUG << "SegmentResizer::handleMouseButtonRelease" << endl;
+ //RG_DEBUG << "mouseReleaseEvent()";
+
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
bool rescale = (e->modifiers() & Qt::ControlModifier);
- if (m_currentIndex) {
+ if (getChangingSegment()) {
- Segment* segment = CompositionItemHelper::getSegment(m_currentIndex);
+ Segment* segment = getChangingSegment()->getSegment();
// We only want to snap the end that we were actually resizing.
@@ -128,12 +140,10 @@ void SegmentResizer::handleMouseButtonRelease(QMouseEvent *e)
timeT newStartTime, newEndTime;
if (m_resizeStart) {
- newStartTime = CompositionItemHelper::getStartTime
- (m_currentIndex, m_canvas->grid());
+ newStartTime = getChangingSegment()->getStartTime(m_canvas->grid());
newEndTime = oldEndTime;
} else {
- newEndTime = CompositionItemHelper::getEndTime
- (m_currentIndex, m_canvas->grid());
+ newEndTime = getChangingSegment()->getEndTime(m_canvas->grid());
newStartTime = oldStartTime;
}
@@ -165,14 +175,14 @@ void SegmentResizer::handleMouseButtonRelease(QMouseEvent *e)
new AudioSegmentRescaleCommand(m_doc, segment, ratio,
newStartTime, newEndTime);
- //cc 20140508: avoid dereferencing self-deleted
+ //cc 20150508: avoid dereferencing self-deleted
//progress dialog after user has closed it, by
//using a QPointer
QPointer<ProgressDialog> progressDlg = new ProgressDialog(
tr("Rescaling audio file..."), (QWidget*)parent());
command->connectProgressDialog(progressDlg);
- addCommandToHistory(command);
+ CommandHistory::getInstance()->addCommand(command);
if (progressDlg) {
command->disconnectProgressDialog(progressDlg);
@@ -203,15 +213,16 @@ void SegmentResizer::handleMouseButtonRelease(QMouseEvent *e)
newEndTime - newStartTime,
oldEndTime - oldStartTime,
newStartTime);
- addCommandToHistory(command);
+ CommandHistory::getInstance()->addCommand(command);
}
} else {
if (m_resizeStart) {
if (segment->getType() == Segment::Audio) {
- addCommandToHistory(new AudioSegmentResizeFromStartCommand
- (segment, newStartTime));
+ CommandHistory::getInstance()->addCommand(
+ new AudioSegmentResizeFromStartCommand(
+ segment, newStartTime));
} else {
SegmentLinkToCopyCommand* unlinkCmd =
new SegmentLinkToCopyCommand(segment);
@@ -224,7 +235,7 @@ void SegmentResizer::handleMouseButtonRelease(QMouseEvent *e)
command->addCommand(unlinkCmd);
command->addCommand(resizeCmd);
- addCommandToHistory(command);
+ CommandHistory::getInstance()->addCommand(command);
}
} else {
@@ -234,8 +245,7 @@ void SegmentResizer::handleMouseButtonRelease(QMouseEvent *e)
SegmentReconfigureCommand *command =
new SegmentReconfigureCommand(tr("Resize Segment"), &comp);
- int trackPos = CompositionItemHelper::getTrackPos
- (m_currentIndex, m_canvas->grid());
+ int trackPos = getChangingSegment()->getTrackPos(m_canvas->grid());
Track *track = comp.getTrackByPosition(trackPos);
@@ -243,7 +253,7 @@ void SegmentResizer::handleMouseButtonRelease(QMouseEvent *e)
newStartTime,
newEndTime,
track->getId());
- addCommandToHistory(command);
+ CommandHistory::getInstance()->addCommand(command);
}
}
}
@@ -253,63 +263,68 @@ void SegmentResizer::handleMouseButtonRelease(QMouseEvent *e)
// m_canvas->updateContents();
m_canvas->update();
- setChangeMade(false);
- m_currentIndex = CompositionItemPtr();
+ //setChangeMade(false);
+ setChangingSegment(ChangingSegmentPtr());
setBasicContextHelp();
}
-int SegmentResizer::handleMouseMove(QMouseEvent *e)
+int SegmentResizer::mouseMoveEvent(QMouseEvent *e)
{
- // RG_DEBUG << "SegmentResizer::handleMouseMove" << endl;
+ // RG_DEBUG << "SegmentResizer::mouseMoveEvent" << endl;
+
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
bool rescale = (e->modifiers() & Qt::ControlModifier);
- if (!m_currentIndex) {
+ if (!getChangingSegment()) {
setBasicContextHelp(rescale);
return RosegardenScrollView::NoFollow;
}
if (rescale) {
- if (!m_canvas->isFineGrain()) {
+ // If shift isn't being held down
+ if ((e->modifiers() & Qt::ShiftModifier) == 0) {
setContextHelp(tr("Hold Shift to avoid snapping to beat grid"));
} else {
clearContextHelp();
}
} else {
- if (!m_canvas->isFineGrain()) {
+ // If shift isn't being held down
+ if ((e->modifiers() & Qt::ShiftModifier) == 0) {
setContextHelp(tr("Hold Shift to avoid snapping to beat grid; hold Ctrl as well to rescale contents"));
} else {
setContextHelp(tr("Hold Ctrl to rescale contents"));
}
}
- Segment* segment = CompositionItemHelper::getSegment(m_currentIndex);
+ Segment* segment = getChangingSegment()->getSegment();
// Don't allow Audio segments to resize yet
//
/*!!!
if (segment->getType() == Segment::Audio)
{
- m_currentIndex = CompositionItemPtr();
+ setChangingSegment(NULL);
QMessageBox::information(m_canvas,
tr("You can't yet resize an audio segment!"));
return RosegardenScrollView::NoFollow;
}
*/
- QRect oldRect = m_currentIndex->rect();
+ QRect oldRect = getChangingSegment()->rect();
- // Indicate fine-grain snap resolution.
- // ??? rename setSnapGrain() -> setSnapFineGrain()
- m_canvas->setSnapGrain(true);
+ setSnapTime(e, SnapGrid::SnapToBeat);
// Convert X coord to time
- timeT time = m_canvas->grid().snapX(e->pos().x());
+ timeT time = m_canvas->grid().snapX(pos.x());
// Get the "snap size" of the grid at the current X coord. It can change
// with certain snap modes and different time signatures.
// ??? rename getSnapTime() -> getSnapTimeForX()
- timeT snapSize = m_canvas->grid().getSnapTime(double(e->pos().x()));
+ timeT snapSize = m_canvas->grid().getSnapTime(double(pos.x()));
// If snap to grid is off
if (snapSize == 0) {
@@ -323,7 +338,7 @@ int SegmentResizer::handleMouseMove(QMouseEvent *e)
timeT duration = itemEndTime - time;
- // RG_DEBUG << "SegmentResizer::handleMouseMove() resize start : duration = "
+ // RG_DEBUG << "SegmentResizer::mouseMoveEvent() resize start : duration = "
// << duration << " - snap = " << snapSize
// << " - itemEndTime : " << itemEndTime
// << " - time : " << time
@@ -339,9 +354,8 @@ int SegmentResizer::handleMouseMove(QMouseEvent *e)
}
// Change the size of the segment on the canvas.
- CompositionItemHelper::setStartTime(m_currentIndex,
- newStartTime,
- m_canvas->grid());
+ getChangingSegment()->setStartTime(newStartTime, m_canvas->grid());
+
} else { // resize end
timeT itemStartTime = segment->getStartTime();
@@ -350,7 +364,7 @@ int SegmentResizer::handleMouseMove(QMouseEvent *e)
timeT newEndTime = time;
- // RG_DEBUG << "SegmentResizer::handleMouseMove() resize end : duration = "
+ // RG_DEBUG << "SegmentResizer::mouseMoveEvent() resize end : duration = "
// << duration << " - snap = " << snapSize
// << " - itemStartTime : " << itemStartTime
// << " - time : " << time
@@ -365,18 +379,16 @@ int SegmentResizer::handleMouseMove(QMouseEvent *e)
}
// Change the size of the segment on the canvas.
- CompositionItemHelper::setEndTime(m_currentIndex,
- newEndTime,
- m_canvas->grid());
+ getChangingSegment()->setEndTime(newEndTime, m_canvas->grid());
}
// Redraw the canvas
- m_canvas->slotUpdateAll(m_currentIndex->rect() | oldRect);
+ m_canvas->slotAllNeedRefresh(getChangingSegment()->rect() | oldRect);
return RosegardenScrollView::FollowHorizontal;
}
-bool SegmentResizer::cursorIsCloseEnoughToEdge(CompositionItemPtr p, const QPoint &coord,
+bool SegmentResizer::cursorIsCloseEnoughToEdge(ChangingSegmentPtr p, const QPoint &coord,
int edgeThreshold, bool &start)
{
if (abs(p->rect().x() + p->rect().width() - coord.x()) < edgeThreshold) {
@@ -399,7 +411,6 @@ void SegmentResizer::setBasicContextHelp(bool ctrlPressed)
}
}
-const QString SegmentResizer::ToolName = "segmentresizer";
}
#include "SegmentResizer.moc"
diff --git a/src/gui/editors/segment/compositionview/SegmentResizer.h b/src/gui/editors/segment/compositionview/SegmentResizer.h
index 3e37bfd..7a17144 100644
--- a/src/gui/editors/segment/compositionview/SegmentResizer.h
+++ b/src/gui/editors/segment/compositionview/SegmentResizer.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -25,7 +25,7 @@
class QPoint;
class QMouseEvent;
-class CompositionItemPtr;
+class ChangingSegmentPtr;
namespace Rosegarden
@@ -50,20 +50,17 @@ public:
virtual void ready();
virtual void stow();
- virtual void handleMouseButtonPress(QMouseEvent*);
- virtual void handleMouseButtonRelease(QMouseEvent*);
- virtual int handleMouseMove(QMouseEvent*);
+ virtual void mousePressEvent(QMouseEvent *);
+ virtual int mouseMoveEvent(QMouseEvent *);
+ virtual void mouseReleaseEvent(QMouseEvent *);
- static bool cursorIsCloseEnoughToEdge(CompositionItemPtr, const QPoint&, int, bool &);
+ static bool cursorIsCloseEnoughToEdge(ChangingSegmentPtr, const QPoint&, int, bool &);
void setEdgeThreshold(int e) { m_edgeThreshold = e; }
int getEdgeThreshold() { return m_edgeThreshold; }
static const QString ToolName;
-protected slots:
- void slotCanvasScrolled(int newX, int newY);
-
protected:
SegmentResizer(CompositionView*, RosegardenDocument*, int edgeThreshold = 10);
void setBasicContextHelp(bool ctrlPressed = false);
diff --git a/src/gui/editors/segment/compositionview/SegmentSelector.cpp b/src/gui/editors/segment/compositionview/SegmentSelector.cpp
index c7a2fd3..478cdc1 100644
--- a/src/gui/editors/segment/compositionview/SegmentSelector.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentSelector.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -30,10 +30,10 @@
#include "commands/segment/SegmentQuickCopyCommand.h"
#include "commands/segment/SegmentQuickLinkCommand.h"
#include "commands/segment/SegmentReconfigureCommand.h"
-#include "CompositionItemHelper.h"
#include "CompositionModelImpl.h"
#include "CompositionView.h"
#include "document/RosegardenDocument.h"
+#include "document/CommandHistory.h"
#include "misc/ConfigGroups.h"
#include "gui/general/BaseTool.h"
#include "gui/general/RosegardenScrollView.h"
@@ -41,6 +41,7 @@
#include "SegmentResizer.h"
#include "SegmentTool.h"
#include "SegmentToolBox.h"
+
#include <QApplication>
#include <QSettings>
#include <QCursor>
@@ -54,6 +55,9 @@
namespace Rosegarden
{
+
+const QString SegmentSelector::ToolName = "segmentselector";
+
SegmentSelector::SegmentSelector(CompositionView *c, RosegardenDocument *d)
: SegmentTool(c, d),
m_segmentAddMode(false),
@@ -62,6 +66,7 @@ SegmentSelector::SegmentSelector(CompositionView *c, RosegardenDocument *d)
m_segmentQuickCopyDone(false),
m_buttonPressed(false),
m_selectionMoveStarted(false),
+ m_changeMade(false),
m_dispatchTool(0)
{
RG_DEBUG << "SegmentSelector()\n";
@@ -73,41 +78,57 @@ SegmentSelector::~SegmentSelector()
void SegmentSelector::ready()
{
m_canvas->viewport()->setCursor(Qt::ArrowCursor);
- //connect(m_canvas, SIGNAL(contentsMoving (int, int)),
- // this, SLOT(slotCanvasScrolled(int, int)));
setContextHelp(tr("Click and drag to select segments"));
}
void SegmentSelector::stow()
{}
-void SegmentSelector::slotCanvasScrolled(int newX, int newY)
-{
- QMouseEvent tmpEvent(QEvent::MouseMove,
- m_canvas->viewport()->mapFromGlobal(QCursor::pos()) + QPoint(newX, newY),
- Qt::NoButton, Qt::NoButton, 0);
- handleMouseMove(&tmpEvent);
-}
-
void
-SegmentSelector::handleMouseButtonPress(QMouseEvent *e)
+SegmentSelector::mousePressEvent(QMouseEvent *e)
{
- RG_DEBUG << "SegmentSelector::handleMouseButtonPress\n";
+ // Let the baseclass have a go.
+ SegmentTool::mousePressEvent(e);
+
+ // We only care about the left and middle mouse buttons.
+ if (e->button() != Qt::LeftButton &&
+ e->button() != Qt::MidButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
+
m_buttonPressed = true;
- CompositionItemPtr item = m_canvas->getFirstItemAt(e->pos());
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ ChangingSegmentPtr item = m_canvas->getModel()->getSegmentAt(pos);
+
+ // Shift adds to the selection.
+ m_segmentAddMode = ((e->modifiers() & Qt::ShiftModifier) != 0);
+ // Ctrl is segment copy.
+ m_segmentCopyMode = ((e->modifiers() & Qt::ControlModifier) != 0);
+ // Alt+Ctrl is copy as link.
+ m_segmentCopyingAsLink = (
+ (item && item->getSegment()->isTrulyLinked()) ||
+ (((e->modifiers() & Qt::AltModifier) != 0) &&
+ ((e->modifiers() & Qt::ControlModifier) != 0)));
// If we're in segmentAddMode or not clicking on an item then we don't
// clear the selection vector. If we're clicking on an item and it's
// not in the selection - then also clear the selection.
//
if ((!m_segmentAddMode && !item) ||
- (!m_segmentAddMode && !(m_canvas->getModel()->isSelected(item)))) {
+ (!m_segmentAddMode &&
+ !(m_canvas->getModel()->isSelected(item->getSegment())))) {
+
m_canvas->getModel()->clearSelected();
}
if (item) {
+ // *** Resize Segment
+
// Fifteen percent of the width of the SegmentItem, up to 10px
//
int threshold = int(float(item->rect().width()) * 0.15);
@@ -125,10 +146,10 @@ SegmentSelector::handleMouseButtonPress(QMouseEvent *e)
if ((!m_segmentAddMode ||
!m_canvas->getModel()->haveSelection()) &&
SegmentResizer::cursorIsCloseEnoughToEdge(
- item, e->pos(), threshold, start)) {
+ item, pos, threshold, start)) {
SegmentResizer* resizer = dynamic_cast<SegmentResizer*>(
- getToolBox()->getTool(SegmentResizer::ToolName));
+ m_canvas->getToolBox()->getTool(SegmentResizer::ToolName));
resizer->setEdgeThreshold(threshold);
@@ -136,59 +157,68 @@ SegmentSelector::handleMouseButtonPress(QMouseEvent *e)
// at a time.
//
m_canvas->getModel()->clearSelected();
- m_canvas->getModel()->setSelected(item);
+ m_canvas->getModel()->setSelected(item->getSegment());
m_dispatchTool = resizer;
m_dispatchTool->ready(); // set mouse cursor
- m_dispatchTool->handleMouseButtonPress(e);
+ m_dispatchTool->mousePressEvent(e);
return;
}
+ // *** Selecting and Moving
+
+ // ??? Why not let SegmentMover take care of moving? This
+ // code is awfully similar. Not similar enough?
+
bool selecting = true;
- if (m_segmentAddMode && m_canvas->getModel()->isSelected(item)) {
+ if (m_segmentAddMode &&
+ m_canvas->getModel()->isSelected(item->getSegment())) {
+
selecting = false;
} else {
// put the segment in 'move' mode only if it's being selected
m_canvas->getModel()->startChange(item, CompositionModelImpl::ChangeMove);
}
- m_canvas->getModel()->setSelected(item, selecting);
+ m_canvas->getModel()->setSelected(item->getSegment(), selecting);
- // Moving
- //
- // RG_DEBUG << "SegmentSelector::handleMouseButtonPress - m_currentIndex = " << item << endl;
- m_currentIndex = item;
- m_clickPoint = e->pos();
+ //RG_DEBUG << "SegmentSelector::mousePressEvent - item = " << item << endl;
+ // ??? This was a line that appeared to leak memory. Was it really
+ // leaking memory?
+ setChangingSegment(item);
+ m_clickPoint = pos;
int guideX = item->rect().x();
int guideY = item->rect().y();
- m_canvas->setGuidesPos(guideX, guideY);
+ m_canvas->drawGuides(guideX, guideY);
- m_canvas->setDrawGuides(true);
+ setSnapTime(e, SnapGrid::SnapToBeat);
} else {
- // Add on middle button or ctrl+left - bounding box on rest
- //
+ // If middle button or Ctrl+left button
if (e->button() == Qt::MidButton ||
((e->button() == Qt::LeftButton) && (e->modifiers() & Qt::ControlModifier))) {
- m_dispatchTool = getToolBox()->getTool(SegmentPencil::ToolName);
+ // Create a new segment with the SegmentPencil tool.
+
+ m_dispatchTool = m_canvas->getToolBox()->getTool(SegmentPencil::ToolName);
if (m_dispatchTool) {
m_dispatchTool->ready(); // set mouse cursor
- m_dispatchTool->handleMouseButtonPress(e);
+ m_dispatchTool->mousePressEvent(e);
}
return ;
} else {
- m_canvas->setSelectionRectPos(e->pos());
- m_canvas->setDrawSelectionRect(true);
+ // Selection rubber band
+
+ m_canvas->drawSelectionRectPos1(pos);
if (!m_segmentAddMode)
m_canvas->getModel()->clearSelected();
@@ -198,36 +228,46 @@ SegmentSelector::handleMouseButtonPress(QMouseEvent *e)
// Tell the RosegardenMainViewWidget that we've selected some new Segments -
// when the list is empty we're just unselecting.
//
- m_canvas->getModel()->signalSelection();
+ m_canvas->getModel()->selectionHasChanged();
m_passedInertiaEdge = false;
}
void
-SegmentSelector::handleMouseButtonRelease(QMouseEvent *e)
+SegmentSelector::mouseReleaseEvent(QMouseEvent *e)
{
+ // We only care about the left and middle mouse buttons.
+ if (e->button() != Qt::LeftButton &&
+ e->button() != Qt::MidButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
m_buttonPressed = false;
// Hide guides and stuff
//
- m_canvas->setDrawGuides(false);
+ m_canvas->hideGuides();
m_canvas->hideTextFloat();
if (m_dispatchTool) {
- m_dispatchTool->handleMouseButtonRelease(e);
+ m_dispatchTool->mouseReleaseEvent(e);
m_dispatchTool = 0;
m_canvas->viewport()->setCursor(Qt::ArrowCursor);
return ;
}
int startDragTrackPos = m_canvas->grid().getYBin(m_clickPoint.y());
- int currentTrackPos = m_canvas->grid().getYBin(e->pos().y());
+ int currentTrackPos = m_canvas->grid().getYBin(pos.y());
int trackDiff = currentTrackPos - startDragTrackPos;
- if (!m_currentIndex) {
- m_canvas->setDrawSelectionRect(false);
+ if (!getChangingSegment()) {
+ m_canvas->hideSelectionRect();
m_canvas->getModel()->finalizeSelectionRect();
- m_canvas->getModel()->signalSelection();
+ m_canvas->getModel()->selectionHasChanged();
return ;
}
@@ -235,24 +275,25 @@ SegmentSelector::handleMouseButtonRelease(QMouseEvent *e)
Composition &comp = m_doc->getComposition();
- if (m_canvas->getModel()->isSelected(m_currentIndex)) {
+ if (m_canvas->getModel()->isSelected(getChangingSegment()->getSegment())) {
- CompositionModelImpl::ItemContainer& changingItems = m_canvas->getModel()->getChangingItems();
- CompositionModelImpl::ItemContainer::iterator it;
+ CompositionModelImpl::ChangingSegmentSet& changingItems =
+ m_canvas->getModel()->getChangingSegments();
+ CompositionModelImpl::ChangingSegmentSet::iterator it;
- if (changeMade()) {
+ if (m_changeMade) {
SegmentReconfigureCommand *command =
new SegmentReconfigureCommand
- (tr("Move Segment(s)", "", m_selectedItems.size()), &comp);
+ (tr("Move %n Segment(s)", "", changingItems.size()), &comp);
for (it = changingItems.begin();
it != changingItems.end();
++it) {
- CompositionItemPtr item = *it;
+ ChangingSegmentPtr item = *it;
- Segment* segment = CompositionItemHelper::getSegment(item);
+ Segment* segment = item->getSegment();
TrackId origTrackId = segment->getTrack();
int trackPos = comp.getTrackPositionById(origTrackId);
@@ -268,8 +309,7 @@ SegmentSelector::handleMouseButtonRelease(QMouseEvent *e)
int newTrackId = origTrackId;
if (newTrack) newTrackId = newTrack->getId();
- timeT itemStartTime = CompositionItemHelper::getStartTime
- (item, m_canvas->grid());
+ timeT itemStartTime = item->getStartTime(m_canvas->grid());
// We absolutely don't want to snap the end time to
// the grid. We want it to remain exactly the same as
@@ -285,7 +325,7 @@ SegmentSelector::handleMouseButtonRelease(QMouseEvent *e)
newTrackId);
}
- addCommandToHistory(command);
+ CommandHistory::getInstance()->addCommand(command);
}
m_canvas->getModel()->endChange();
@@ -295,58 +335,45 @@ SegmentSelector::handleMouseButtonRelease(QMouseEvent *e)
// if we've just finished a quick copy then drop the Z level back
if (m_segmentQuickCopyDone) {
m_segmentQuickCopyDone = false;
- // m_currentIndex->setZ(2); // see SegmentItem::setSelected --??
+ // getChangingSegment()->setZ(2); // see SegmentItem::setSelected --??
}
- setChangeMade(false);
+ m_changeMade = false;
m_selectionMoveStarted = false;
- m_currentIndex = CompositionItemPtr();
+ setChangingSegment(ChangingSegmentPtr());
- setContextHelpFor(e->pos());
+ setContextHelpFor(pos);
}
int
-SegmentSelector::handleMouseMove(QMouseEvent *e)
+SegmentSelector::mouseMoveEvent(QMouseEvent *e)
{
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ // ??? Does QMouseEvent offer a button state we can use instead of this?
if (!m_buttonPressed) {
- setContextHelpFor(e->pos(), (e->modifiers() & Qt::ControlModifier));
+ setContextHelpFor(pos, (e->modifiers() & Qt::ControlModifier));
return RosegardenScrollView::NoFollow;
}
if (m_dispatchTool) {
- return m_dispatchTool->handleMouseMove(e);
+ return m_dispatchTool->mouseMoveEvent(e);
}
Composition &comp = m_doc->getComposition();
- if (!m_currentIndex) {
+ if (!getChangingSegment()) {
- // RG_DEBUG << "SegmentSelector::handleMouseMove: no current item\n";
+ // RG_DEBUG << "SegmentSelector::mouseMoveEvent: no current item\n";
- // do a bounding box
- QRect selectionRect = m_canvas->getSelectionRect();
+ m_canvas->drawSelectionRectPos2(pos);
- m_canvas->setDrawSelectionRect(true);
-
- // same as for notation view
- int w = int(e->pos().x() - selectionRect.x());
- int h = int(e->pos().y() - selectionRect.y());
- if (w > 0)
- ++w;
- else
- --w;
- if (h > 0)
- ++h;
- else
- --h;
-
- // Translate these points
- //
- m_canvas->setSelectionRectSize(w, h);
-
- m_canvas->getModel()->signalSelection();
+ m_canvas->getModel()->selectionHasChanged();
return RosegardenScrollView::FollowHorizontal | RosegardenScrollView::FollowVertical;
}
@@ -379,7 +406,7 @@ SegmentSelector::handleMouseMove(QMouseEvent *e)
mcommand->addCommand(command);
}
- addCommandToHistory(mcommand);
+ CommandHistory::getInstance()->addCommand(mcommand);
// generate SegmentItem
//
@@ -389,43 +416,54 @@ SegmentSelector::handleMouseMove(QMouseEvent *e)
m_segmentQuickCopyDone = true;
}
- m_canvas->setSnapGrain(true);
+ setSnapTime(e, SnapGrid::SnapToBeat);
int startDragTrackPos = m_canvas->grid().getYBin(m_clickPoint.y());
- int currentTrackPos = m_canvas->grid().getYBin(e->pos().y());
+ int currentTrackPos = m_canvas->grid().getYBin(pos.y());
int trackDiff = currentTrackPos - startDragTrackPos;
- if (m_canvas->getModel()->isSelected(m_currentIndex)) {
+ if (m_canvas->getModel()->isSelected(getChangingSegment()->getSegment())) {
- if (!m_canvas->isFineGrain()) {
+ // If shift isn't being held down
+ if ((e->modifiers() & Qt::ShiftModifier) == 0) {
setContextHelp(tr("Hold Shift to avoid snapping to beat grid"));
} else {
clearContextHelp();
}
- // RG_DEBUG << "SegmentSelector::handleMouseMove: current item is selected\n";
+ // RG_DEBUG << "SegmentSelector::mouseMoveEvent: current item is selected\n";
if (!m_selectionMoveStarted) { // start move on selected items only once
m_canvas->getModel()->startChangeSelection(CompositionModelImpl::ChangeMove);
m_selectionMoveStarted = true;
}
- CompositionModelImpl::ItemContainer& changingItems = m_canvas->getModel()->getChangingItems();
- setCurrentIndex(CompositionItemHelper::findSiblingCompositionItem(changingItems, m_currentIndex));
+ ChangingSegmentPtr newChangingSegment =
+ m_canvas->getModel()->findChangingSegment(
+ getChangingSegment()->getSegment());
- CompositionModelImpl::ItemContainer::iterator it;
- int guideX = 0;
- int guideY = 0;
+ if (newChangingSegment) {
+ // Toss the local "changing" segment since it isn't going to
+ // be moving at all. Swap it for the same changing segment in
+ // CompositionModelImpl. That one *will* be moving and can be
+ // used to drive the guides.
+ setChangingSegment(newChangingSegment);
+ }
+
+ CompositionModelImpl::ChangingSegmentSet& changingItems =
+ m_canvas->getModel()->getChangingSegments();
+
+ CompositionModelImpl::ChangingSegmentSet::iterator it;
for (it = changingItems.begin();
it != changingItems.end();
++it) {
- // RG_DEBUG << "SegmentSelector::handleMouseMove() : movingItem at "
+ // RG_DEBUG << "SegmentSelector::mouseMoveEvent() : movingItem at "
// << (*it)->rect().x() << "," << (*it)->rect().y() << endl;
- int dx = e->pos().x() - m_clickPoint.x(),
- dy = e->pos().y() - m_clickPoint.y();
+ int dx = pos.x() - m_clickPoint.x(),
+ dy = pos.y() - m_clickPoint.y();
const int inertiaDistance = m_canvas->grid().getYSnap() / 3;
if (!m_passedInertiaEdge &&
@@ -457,18 +495,20 @@ SegmentSelector::handleMouseMove(QMouseEvent *e)
int newY = m_canvas->grid().getYBinCoordinate(trackPos);
(*it)->moveTo(newX, newY);
- setChangeMade(true);
+ m_changeMade = true;
}
- if (changeMade())
- m_canvas->getModel()->signalContentChange();
+ if (m_changeMade) {
+ // Make sure the segments are redrawn.
+ m_canvas->slotUpdateAll();
+ }
- guideX = m_currentIndex->rect().x();
- guideY = m_currentIndex->rect().y();
+ int guideX = getChangingSegment()->rect().x();
+ int guideY = getChangingSegment()->rect().y();
- m_canvas->setGuidesPos(guideX, guideY);
+ m_canvas->drawGuides(guideX, guideY);
- timeT currentIndexStartTime = m_canvas->grid().snapX(m_currentIndex->rect().x());
+ timeT currentIndexStartTime = m_canvas->grid().snapX(getChangingSegment()->rect().x());
RealTime time = comp.getElapsedRealTime(currentIndexStartTime);
QString ms;
@@ -481,12 +521,12 @@ SegmentSelector::handleMouseMove(QMouseEvent *e)
.arg(time.sec).arg(ms)
.arg(bar + 1).arg(beat).arg(fraction);
- m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
+ m_canvas->drawTextFloat(guideX + 10, guideY - 30, posString);
// m_canvas->updateContents();
m_canvas->update();
} else {
- // RG_DEBUG << "SegmentSelector::handleMouseMove: current item not selected\n";
+ // RG_DEBUG << "SegmentSelector::mouseMoveEvent: current item not selected\n";
}
return RosegardenScrollView::FollowHorizontal | RosegardenScrollView::FollowVertical;
@@ -503,14 +543,14 @@ void SegmentSelector::setContextHelpFor(QPoint p, bool ctrlPressed)
}
settings.endGroup();
- CompositionItemPtr item = m_canvas->getFirstItemAt(p);
+ ChangingSegmentPtr item = m_canvas->getModel()->getSegmentAt(p);
if (!item) {
setContextHelp(tr("Click and drag to select segments; middle-click and drag to draw an empty segment"));
} else {
- // Same logic as in handleMouseButtonPress to establish
+ // Same logic as in mousePressEvent to establish
// whether we'd be moving or resizing
int threshold = int(float(item->rect().width()) * 0.15);
@@ -545,7 +585,6 @@ void SegmentSelector::setContextHelpFor(QPoint p, bool ctrlPressed)
}
}
-const QString SegmentSelector::ToolName = "segmentselector";
}
#include "SegmentSelector.moc"
diff --git a/src/gui/editors/segment/compositionview/SegmentSelector.h b/src/gui/editors/segment/compositionview/SegmentSelector.h
index eb02d23..9a78b46 100644
--- a/src/gui/editors/segment/compositionview/SegmentSelector.h
+++ b/src/gui/editors/segment/compositionview/SegmentSelector.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -48,34 +48,15 @@ public:
virtual void ready();
virtual void stow();
- virtual void handleMouseButtonPress(QMouseEvent*);
- virtual void handleMouseButtonRelease(QMouseEvent*);
- virtual int handleMouseMove(QMouseEvent*);
-
- // These two alter the behaviour of the selection mode
- //
- // - SegmentAdd (usually when Qt::SHIFT is held down) allows
- // multiple selections of Segments.
- //
- // - SegmentCopy (usually CONTROL) allows draw and drop
- // copying of Segments - it's a quick shortcut
- //
- void setSegmentAdd(const bool &value) { m_segmentAddMode = value; }
- void setSegmentCopy(const bool &value) { m_segmentCopyMode = value; }
- void setSegmentCopyingAsLink(const bool &value) { m_segmentCopyingAsLink = value; }
+ virtual void mousePressEvent(QMouseEvent *);
+ virtual int mouseMoveEvent(QMouseEvent *);
+ virtual void mouseReleaseEvent(QMouseEvent *);
bool isSegmentAdding() const { return m_segmentAddMode; }
bool isSegmentCopying() const { return m_segmentCopyMode; }
- // Return the SegmentItem list for other tools to use
- //
- SegmentItemList* getSegmentItemList() { return &m_selectedItems; }
-
static const QString ToolName;
-protected slots:
- void slotCanvasScrolled(int newX, int newY);
-
protected:
SegmentSelector(CompositionView*, RosegardenDocument*);
@@ -83,8 +64,6 @@ protected:
//--------------- Data members ---------------------------------
- SegmentItemList m_selectedItems;
-
bool m_segmentAddMode;
bool m_segmentCopyMode;
bool m_segmentCopyingAsLink;
@@ -93,6 +72,7 @@ protected:
bool m_passedInertiaEdge;
bool m_buttonPressed;
bool m_selectionMoveStarted;
+ bool m_changeMade;
SegmentTool *m_dispatchTool;
};
diff --git a/src/gui/editors/segment/compositionview/SegmentSplitter.cpp b/src/gui/editors/segment/compositionview/SegmentSplitter.cpp
index c53ad01..4699dd2 100644
--- a/src/gui/editors/segment/compositionview/SegmentSplitter.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentSplitter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -24,13 +24,14 @@
#include "base/SnapGrid.h"
#include "commands/segment/AudioSegmentSplitCommand.h"
#include "commands/segment/SegmentSplitCommand.h"
-#include "CompositionItemHelper.h"
#include "CompositionView.h"
#include "document/RosegardenDocument.h"
#include "gui/general/BaseTool.h"
#include "gui/general/RosegardenScrollView.h"
#include "SegmentTool.h"
#include "document/Command.h"
+#include "document/CommandHistory.h"
+
#include <QPoint>
#include <QRect>
#include <QString>
@@ -40,6 +41,9 @@
namespace Rosegarden
{
+
+const QString SegmentSplitter::ToolName = "segmentsplitter";
+
SegmentSplitter::SegmentSplitter(CompositionView *c, RosegardenDocument *d)
: SegmentTool(c, d),
m_prevX(0),
@@ -54,53 +58,73 @@ SegmentSplitter::~SegmentSplitter()
void SegmentSplitter::ready()
{
m_canvas->viewport()->setCursor(Qt::SplitHCursor);
- setBasicContextHelp();
+ setContextHelp(tr("Click on a segment to split it in two; hold Shift to avoid snapping to beat grid"));
}
void
-SegmentSplitter::handleMouseButtonPress(QMouseEvent *e)
+SegmentSplitter::mousePressEvent(QMouseEvent *e)
{
- // Remove cursor and replace with line on a SegmentItem
- // at where the cut will be made
- CompositionItemPtr item = m_canvas->getFirstItemAt(e->pos());
+ // Let the baseclass have a go.
+ SegmentTool::mousePressEvent(e);
+
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ ChangingSegmentPtr item = m_canvas->getModel()->getSegmentAt(pos);
if (item) {
+ // Remove cursor and replace with line on a SegmentItem
+ // at where the cut will be made
m_canvas->viewport()->setCursor(Qt::BlankCursor);
+
m_prevX = item->rect().x();
+ // ??? Clearly, not used.
m_prevX = item->rect().y();
+
drawSplitLine(e);
- delete item;
}
}
void
-SegmentSplitter::handleMouseButtonRelease(QMouseEvent *e)
+SegmentSplitter::mouseReleaseEvent(QMouseEvent *e)
{
- setBasicContextHelp();
+ // We only care about the left mouse button.
+ if (e->button() != Qt::LeftButton)
+ return;
+
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
- CompositionItemPtr item = m_canvas->getFirstItemAt(e->pos());
+ ChangingSegmentPtr item = m_canvas->getModel()->getSegmentAt(pos);
if (item) {
- m_canvas->setSnapGrain(true);
- Segment* segment = CompositionItemHelper::getSegment(item);
+ setSnapTime(e, SnapGrid::SnapToBeat);
+
+ Segment* segment = item->getSegment();
if (segment->getType() == Segment::Audio) {
AudioSegmentSplitCommand *command =
- new AudioSegmentSplitCommand(segment, m_canvas->grid().snapX(e->pos().x()));
+ new AudioSegmentSplitCommand(segment, m_canvas->grid().snapX(pos.x()));
if (command->isValid())
- addCommandToHistory(command);
+ CommandHistory::getInstance()->addCommand(command);
} else {
SegmentSplitCommand *command =
- new SegmentSplitCommand(segment, m_canvas->grid().snapX(e->pos().x()));
+ new SegmentSplitCommand(segment, m_canvas->grid().snapX(pos.x()));
if (command->isValid())
- addCommandToHistory(command);
+ CommandHistory::getInstance()->addCommand(command);
}
// m_canvas->updateContents(item->rect());
m_canvas->update(item->rect());
-
- delete item;
}
// Reinstate the cursor
@@ -109,16 +133,22 @@ SegmentSplitter::handleMouseButtonRelease(QMouseEvent *e)
}
int
-SegmentSplitter::handleMouseMove(QMouseEvent *e)
+SegmentSplitter::mouseMoveEvent(QMouseEvent *e)
{
- setBasicContextHelp();
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
+
+ // ??? Minor bug: Middle button will cause the split line to
+ // appear. We should be able to query the QMouseEvent for the
+ // button state and bail if left isn't currently pressed.
- CompositionItemPtr item = m_canvas->getFirstItemAt(e->pos());
+ ChangingSegmentPtr item = m_canvas->getModel()->getSegmentAt(pos);
if (item) {
// m_canvas->viewport()->setCursor(Qt::blankCursor);
drawSplitLine(e);
- delete item;
return RosegardenScrollView::FollowHorizontal;
} else {
m_canvas->viewport()->setCursor(Qt::SplitHCursor);
@@ -130,27 +160,23 @@ SegmentSplitter::handleMouseMove(QMouseEvent *e)
void
SegmentSplitter::drawSplitLine(QMouseEvent *e)
{
- m_canvas->setSnapGrain(true);
+ setSnapTime(e, SnapGrid::SnapToBeat);
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
// Turn the real X into a snapped X
//
- timeT xT = m_canvas->grid().snapX(e->pos().x());
+ timeT xT = m_canvas->grid().snapX(pos.x());
int x = (int)(m_canvas->grid().getRulerScale()->getXForTime(xT));
// Need to watch y doesn't leak over the edges of the
// current Segment.
//
- int y = m_canvas->grid().snapY(e->pos().y());
+ int y = m_canvas->grid().snapY(pos.y());
- m_canvas->showSplitLine(x, y);
+ m_canvas->drawSplitLine(x, y);
- QRect updateRect(std::max(0, std::min(x, m_prevX) - 5), y,
- std::max(m_prevX, x) + 5, m_prevY + m_canvas->grid().getYSnap());
-
-// m_canvas->updateContents(updateRect);
- m_canvas->update(updateRect);
-
- m_prevX = x;
+ m_prevX = x;
m_prevY = y;
}
@@ -160,17 +186,6 @@ SegmentSplitter::contentsMouseDoubleClickEvent(QMouseEvent*)
// DO NOTHING
}
-void
-SegmentSplitter::setBasicContextHelp()
-{
- if (!m_canvas->isFineGrain()) {
- setContextHelp(tr("Click on a segment to split it in two; hold Shift to avoid snapping to beat grid"));
- } else {
- setContextHelp(tr("Click on a segment to split it in two"));
- }
-}
-
-const QString SegmentSplitter::ToolName = "segmentsplitter";
}
#include "SegmentSplitter.moc"
diff --git a/src/gui/editors/segment/compositionview/SegmentSplitter.h b/src/gui/editors/segment/compositionview/SegmentSplitter.h
index 48eb8c8..789eeaa 100644
--- a/src/gui/editors/segment/compositionview/SegmentSplitter.h
+++ b/src/gui/editors/segment/compositionview/SegmentSplitter.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -47,9 +47,9 @@ public:
virtual void ready();
- virtual void handleMouseButtonPress(QMouseEvent*);
- virtual void handleMouseButtonRelease(QMouseEvent*);
- virtual int handleMouseMove(QMouseEvent*);
+ virtual void mousePressEvent(QMouseEvent *);
+ virtual int mouseMoveEvent(QMouseEvent *);
+ virtual void mouseReleaseEvent(QMouseEvent *);
// don't do double clicks
virtual void contentsMouseDoubleClickEvent(QMouseEvent*);
@@ -66,7 +66,9 @@ protected:
timeT &splitTime);
//--------------- Data members ---------------------------------
+ // ??? unused
int m_prevX;
+ // ??? unused
int m_prevY;
};
diff --git a/src/gui/editors/segment/compositionview/SegmentTool.cpp b/src/gui/editors/segment/compositionview/SegmentTool.cpp
index 9dcbc8b..b121181 100644
--- a/src/gui/editors/segment/compositionview/SegmentTool.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentTool.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -38,8 +38,7 @@ namespace Rosegarden
SegmentTool::SegmentTool(CompositionView* canvas, RosegardenDocument *doc)
: BaseTool("SegmentTool", canvas),
m_canvas(canvas),
- m_doc(doc),
- m_changeMade(false)
+ m_doc(doc)
{
//RG_DEBUG << "SegmentTool::SegmentTool()";
@@ -73,8 +72,8 @@ SegmentTool::SegmentTool(CompositionView* canvas, RosegardenDocument *doc)
}
SegmentTool::~SegmentTool()
-{}
-
+{
+}
void SegmentTool::ready()
{
@@ -82,26 +81,34 @@ void SegmentTool::ready()
}
void
-SegmentTool::handleRightButtonPress(QMouseEvent *e)
+SegmentTool::mousePressEvent(QMouseEvent *e)
{
- if (m_currentIndex) // mouse button is pressed for some tool
+ // We only care about the right button.
+ if (e->button() != Qt::RightButton)
+ return;
+
+ if (m_changingSegment) // mouse button is pressed for some tool
return ;
- //RG_DEBUG << "SegmentTool::handleRightButtonPress()\n";
+ // No need to propagate.
+ e->accept();
+
+ QPoint pos = m_canvas->viewportToContents(e->pos());
- setCurrentIndex(m_canvas->getFirstItemAt(e->pos()));
+ setChangingSegment(m_canvas->getModel()->getSegmentAt(pos));
- if (m_currentIndex) {
- if (!m_canvas->getModel()->isSelected(m_currentIndex)) {
+ if (m_changingSegment) {
+ if (!m_canvas->getModel()->isSelected(m_changingSegment->getSegment())) {
m_canvas->getModel()->clearSelected();
- m_canvas->getModel()->setSelected(m_currentIndex);
- m_canvas->getModel()->signalSelection();
+ m_canvas->getModel()->setSelected(m_changingSegment->getSegment());
+ m_canvas->getModel()->selectionHasChanged();
}
}
showMenu();
- setCurrentIndex(CompositionItemPtr());
+
+ setChangingSegment(ChangingSegmentPtr());
}
void
@@ -131,24 +138,24 @@ SegmentTool::createMenu()
m_menu = menu;
}
-void
-SegmentTool::addCommandToHistory(Command *command)
-{
- CommandHistory::getInstance()->addCommand(command);
-}
-
-void SegmentTool::setCurrentIndex(CompositionItemPtr item)
+void SegmentTool::setChangingSegment(ChangingSegmentPtr changingSegment)
{
- if (item != m_currentIndex)
+ if (changingSegment != m_changingSegment)
{
- delete m_currentIndex;
- m_currentIndex = item;
+ m_changingSegment = changingSegment;
}
}
-SegmentToolBox* SegmentTool::getToolBox()
+void SegmentTool::setSnapTime(QMouseEvent *e, timeT snapTime)
{
- return m_canvas->getToolBox();
+ SnapGrid &snapGrid = m_canvas->grid();
+
+ // If shift isn't being held down
+ if ((e->modifiers() & Qt::ShiftModifier) == 0) {
+ snapGrid.setSnapTime(snapTime);
+ } else {
+ snapGrid.setSnapTime(SnapGrid::NoSnap);
+ }
}
void SegmentTool::slotEdit()
diff --git a/src/gui/editors/segment/compositionview/SegmentTool.h b/src/gui/editors/segment/compositionview/SegmentTool.h
index 12c3edf..a5ad328 100644
--- a/src/gui/editors/segment/compositionview/SegmentTool.h
+++ b/src/gui/editors/segment/compositionview/SegmentTool.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -19,13 +19,12 @@
#ifndef RG_SEGMENTTOOL_H
#define RG_SEGMENTTOOL_H
+#include "gui/general/RosegardenScrollView.h"
#include "gui/general/BaseTool.h"
#include "gui/general/ActionFileClient.h"
-#include "CompositionItem.h"
-
-#include <QPoint>
-#include <utility>
-#include <vector>
+#include "ChangingSegment.h"
+#include "CompositionModelImpl.h"
+#include "base/TimeT.h"
class QMouseEvent;
@@ -34,66 +33,61 @@ class QMouseEvent;
namespace Rosegarden
{
-class Command;
-class SegmentToolBox;
+
class RosegardenDocument;
class CompositionView;
//////////////////////////////////////////////////////////////////////
-class SegmentToolBox;
-class SegmentSelector;
-
-// Allow the tools to share the Selector tool's selection
-// through these.
-//
-typedef std::pair<QPoint, CompositionItemPtr> SegmentItemPair;
-typedef std::vector<SegmentItemPair> SegmentItemList;
-
+/// Baseclass for the Segment canvas tools, e.g. SegmentPencil.
class SegmentTool : public BaseTool, public ActionFileClient
{
Q_OBJECT
public:
- friend class SegmentToolBox;
-
virtual ~SegmentTool();
/**
- * Is called by the parent View (EditView or SegmentCanvas) when
+ * Is called by the parent View (e.g. CompositionView) when
* the tool is set as current.
* Add any setup here
*/
virtual void ready();
- virtual void handleRightButtonPress(QMouseEvent*);
- virtual void handleMouseButtonPress(QMouseEvent*) = 0;
- virtual void handleMouseButtonRelease(QMouseEvent*) = 0;
- virtual int handleMouseMove(QMouseEvent*) = 0;
-
- void addCommandToHistory(Command *command);
+ /**
+ * Derivers need to call this to make sure the right-click
+ * context menu works. See SegmentPencil::mousePressEvent().
+ */
+ virtual void mousePressEvent(QMouseEvent *);
+ virtual int mouseMoveEvent(QMouseEvent *)
+ { return RosegardenScrollView::NoFollow; }
+ virtual void mouseReleaseEvent(QMouseEvent *) { }
protected:
- SegmentTool(CompositionView*, RosegardenDocument *doc);
+ /// Protected since a SegmentTool isn't very useful on its own.
+ SegmentTool(CompositionView *, RosegardenDocument *);
- virtual void createMenu();
- virtual bool hasMenu() { return true; }
-
- void setCurrentIndex(CompositionItemPtr item);
+ CompositionView *m_canvas;
+ RosegardenDocument *m_doc;
- SegmentToolBox* getToolBox();
+ /// Set the Segment that the tool is working on.
+ /**
+ * The Segment tools use this to pass the changing Segment
+ * between their mouse press, move, and release handlers.
+ */
+ void setChangingSegment(ChangingSegmentPtr changingSegment);
+ ChangingSegmentPtr getChangingSegment() { return m_changingSegment; }
- bool changeMade() { return m_changeMade; }
- void setChangeMade(bool c) { m_changeMade = c; }
+ /// Sets the SnapGrid snap time based on the Shift key.
+ void setSnapTime(QMouseEvent *e, timeT snapTime);
- //--------------- Data members ---------------------------------
+private:
+ /// Right-click context menu.
+ virtual void createMenu();
+ virtual bool hasMenu() { return true; }
- CompositionView* m_canvas;
- CompositionItemPtr m_currentIndex;
- RosegardenDocument* m_doc;
-// QPoint m_origPos;
- bool m_changeMade;
+ ChangingSegmentPtr m_changingSegment;
private slots:
// This is just a mess of forwarding functions to RosegardenMainWindow.
diff --git a/src/gui/editors/segment/compositionview/SegmentToolBox.cpp b/src/gui/editors/segment/compositionview/SegmentToolBox.cpp
index f7c5d08..55c12ee 100644
--- a/src/gui/editors/segment/compositionview/SegmentToolBox.cpp
+++ b/src/gui/editors/segment/compositionview/SegmentToolBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/segment/compositionview/SegmentToolBox.h b/src/gui/editors/segment/compositionview/SegmentToolBox.h
index 7b107c6..bcdc948 100644
--- a/src/gui/editors/segment/compositionview/SegmentToolBox.h
+++ b/src/gui/editors/segment/compositionview/SegmentToolBox.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/tempo/TempoListItem.cpp b/src/gui/editors/tempo/TempoListItem.cpp
index 190566c..7bf7551 100644
--- a/src/gui/editors/tempo/TempoListItem.cpp
+++ b/src/gui/editors/tempo/TempoListItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/tempo/TempoListItem.h b/src/gui/editors/tempo/TempoListItem.h
index e45c422..4bc853d 100644
--- a/src/gui/editors/tempo/TempoListItem.h
+++ b/src/gui/editors/tempo/TempoListItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index bc4624d..e66ff01 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/editors/tempo/TempoView.h b/src/gui/editors/tempo/TempoView.h
index 18c804e..b6fc36f 100644
--- a/src/gui/editors/tempo/TempoView.h
+++ b/src/gui/editors/tempo/TempoView.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ActionCommandRegistry.cpp b/src/gui/general/ActionCommandRegistry.cpp
index 4003abe..507a0b7 100644
--- a/src/gui/general/ActionCommandRegistry.cpp
+++ b/src/gui/general/ActionCommandRegistry.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ActionCommandRegistry.h b/src/gui/general/ActionCommandRegistry.h
index a57cf20..522a0dc 100644
--- a/src/gui/general/ActionCommandRegistry.h
+++ b/src/gui/general/ActionCommandRegistry.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ActionFileClient.cpp b/src/gui/general/ActionFileClient.cpp
index 5f8abd6..c714bf8 100644
--- a/src/gui/general/ActionFileClient.cpp
+++ b/src/gui/general/ActionFileClient.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ActionFileClient.h b/src/gui/general/ActionFileClient.h
index 1accff9..0509810 100644
--- a/src/gui/general/ActionFileClient.h
+++ b/src/gui/general/ActionFileClient.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ActionFileParser.cpp b/src/gui/general/ActionFileParser.cpp
index 009cbe6..cf7de50 100644
--- a/src/gui/general/ActionFileParser.cpp
+++ b/src/gui/general/ActionFileParser.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ActionFileParser.h b/src/gui/general/ActionFileParser.h
index 56ca344..3afcf31 100644
--- a/src/gui/general/ActionFileParser.h
+++ b/src/gui/general/ActionFileParser.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/AutoSaveFinder.cpp b/src/gui/general/AutoSaveFinder.cpp
index edd82ec..b7cc4bf 100644
--- a/src/gui/general/AutoSaveFinder.cpp
+++ b/src/gui/general/AutoSaveFinder.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2007 Queen
Mary, University of London.
diff --git a/src/gui/general/AutoSaveFinder.h b/src/gui/general/AutoSaveFinder.h
index fbe4f8e..869240f 100644
--- a/src/gui/general/AutoSaveFinder.h
+++ b/src/gui/general/AutoSaveFinder.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2007 Queen
Mary, University of London.
diff --git a/src/gui/general/BaseTool.cpp b/src/gui/general/BaseTool.cpp
index 00876c6..98b1c07 100644
--- a/src/gui/general/BaseTool.cpp
+++ b/src/gui/general/BaseTool.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/BaseTool.h b/src/gui/general/BaseTool.h
index 3239305..2df691f 100644
--- a/src/gui/general/BaseTool.h
+++ b/src/gui/general/BaseTool.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/BaseToolBox.cpp b/src/gui/general/BaseToolBox.cpp
index 05ede67..4b2a94c 100644
--- a/src/gui/general/BaseToolBox.cpp
+++ b/src/gui/general/BaseToolBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/BaseToolBox.h b/src/gui/general/BaseToolBox.h
index dc969ee..27a3f5f 100644
--- a/src/gui/general/BaseToolBox.h
+++ b/src/gui/general/BaseToolBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/CategoryElement.cpp b/src/gui/general/CategoryElement.cpp
index 09a92b4..4dd9b17 100644
--- a/src/gui/general/CategoryElement.cpp
+++ b/src/gui/general/CategoryElement.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/CategoryElement.h b/src/gui/general/CategoryElement.h
index 4c3004a..22d415a 100644
--- a/src/gui/general/CategoryElement.h
+++ b/src/gui/general/CategoryElement.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ClefIndex.cpp b/src/gui/general/ClefIndex.cpp
index 3e391fa..c486fff 100644
--- a/src/gui/general/ClefIndex.cpp
+++ b/src/gui/general/ClefIndex.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/general/ClefIndex.h b/src/gui/general/ClefIndex.h
index c7c8fa0..59baa6d 100644
--- a/src/gui/general/ClefIndex.h
+++ b/src/gui/general/ClefIndex.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/general/DecoyAction.cpp b/src/gui/general/DecoyAction.cpp
index 7f8083d..ebb29c9 100644
--- a/src/gui/general/DecoyAction.cpp
+++ b/src/gui/general/DecoyAction.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/DecoyAction.h b/src/gui/general/DecoyAction.h
index 7571a93..2091043 100644
--- a/src/gui/general/DecoyAction.h
+++ b/src/gui/general/DecoyAction.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 1243537..23b378f 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h
index 0648072..2b6d36d 100644
--- a/src/gui/general/EditViewBase.h
+++ b/src/gui/general/EditViewBase.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/EditViewTimeSigNotifier.h b/src/gui/general/EditViewTimeSigNotifier.h
index 4d6c5ca..888edab 100644
--- a/src/gui/general/EditViewTimeSigNotifier.h
+++ b/src/gui/general/EditViewTimeSigNotifier.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/FileSource.cpp b/src/gui/general/FileSource.cpp
index fc7a18d..490fb36 100644
--- a/src/gui/general/FileSource.cpp
+++ b/src/gui/general/FileSource.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2007 Queen
Mary, University of London.
@@ -466,7 +466,7 @@ FileSource::initRemote()
// prevent decompression of .rg files by Qt with some servers that
// notice that an .rg file is really a .gz file and respond with
// "Content-Encoding: gzip". See the devel mailing list post by Tim
- // Munro 5/17/2014.
+ // Munro 5/17/2015.
req.setRawHeader("Accept-Encoding", "gzip, deflate");
}
diff --git a/src/gui/general/FileSource.h b/src/gui/general/FileSource.h
index 4b47acf..f657d97 100644
--- a/src/gui/general/FileSource.h
+++ b/src/gui/general/FileSource.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2007 Queen
Mary, University of London.
diff --git a/src/gui/general/GUIPalette.cpp b/src/gui/general/GUIPalette.cpp
index 3098f7d..ac4303d 100644
--- a/src/gui/general/GUIPalette.cpp
+++ b/src/gui/general/GUIPalette.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/GUIPalette.h b/src/gui/general/GUIPalette.h
index 41351a0..e4fa04a 100644
--- a/src/gui/general/GUIPalette.h
+++ b/src/gui/general/GUIPalette.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/HZoomable.cpp b/src/gui/general/HZoomable.cpp
index dbdce2e..940c65e 100644
--- a/src/gui/general/HZoomable.cpp
+++ b/src/gui/general/HZoomable.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/HZoomable.h b/src/gui/general/HZoomable.h
index f82c339..dac5a7d 100644
--- a/src/gui/general/HZoomable.h
+++ b/src/gui/general/HZoomable.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/IconLoader.cpp b/src/gui/general/IconLoader.cpp
index 76659f3..4a35918 100644
--- a/src/gui/general/IconLoader.cpp
+++ b/src/gui/general/IconLoader.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2007 Queen
Mary, University of London.
diff --git a/src/gui/general/IconLoader.h b/src/gui/general/IconLoader.h
index b2cf945..1c4fd12 100644
--- a/src/gui/general/IconLoader.h
+++ b/src/gui/general/IconLoader.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2007 Queen
Mary, University of London.
diff --git a/src/gui/general/LilyPondProcessor.cpp b/src/gui/general/LilyPondProcessor.cpp
index 871d270..4e42f05 100644
--- a/src/gui/general/LilyPondProcessor.cpp
+++ b/src/gui/general/LilyPondProcessor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/LilyPondProcessor.h b/src/gui/general/LilyPondProcessor.h
index 8101d80..76c0772 100644
--- a/src/gui/general/LilyPondProcessor.h
+++ b/src/gui/general/LilyPondProcessor.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ListEditView.cpp b/src/gui/general/ListEditView.cpp
index b77ba2d..18bef2a 100644
--- a/src/gui/general/ListEditView.cpp
+++ b/src/gui/general/ListEditView.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ListEditView.h b/src/gui/general/ListEditView.h
index 8e35784..80e8d73 100644
--- a/src/gui/general/ListEditView.h
+++ b/src/gui/general/ListEditView.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp
index 52c0b59..57db45e 100644
--- a/src/gui/general/MidiPitchLabel.cpp
+++ b/src/gui/general/MidiPitchLabel.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/MidiPitchLabel.h b/src/gui/general/MidiPitchLabel.h
index dc28a5b..6dcbae0 100644
--- a/src/gui/general/MidiPitchLabel.h
+++ b/src/gui/general/MidiPitchLabel.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/PixmapFunctions.cpp b/src/gui/general/PixmapFunctions.cpp
index 4950f7b..7d8f0db 100644
--- a/src/gui/general/PixmapFunctions.cpp
+++ b/src/gui/general/PixmapFunctions.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/PixmapFunctions.h b/src/gui/general/PixmapFunctions.h
index a1cd2c3..544e333 100644
--- a/src/gui/general/PixmapFunctions.h
+++ b/src/gui/general/PixmapFunctions.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/PresetElement.cpp b/src/gui/general/PresetElement.cpp
index a1d38af..c6c555f 100644
--- a/src/gui/general/PresetElement.cpp
+++ b/src/gui/general/PresetElement.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2006-2009
D. Michael McIntyre <dmmcintyr at users.sourceforge.net>
diff --git a/src/gui/general/PresetElement.h b/src/gui/general/PresetElement.h
index fca20d3..1d3639a 100644
--- a/src/gui/general/PresetElement.h
+++ b/src/gui/general/PresetElement.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2006-2009
D. Michael McIntyre <dmmcintyr at users.sourceforge.net>
diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp
index 37464e7..b94a3ff 100644
--- a/src/gui/general/PresetGroup.cpp
+++ b/src/gui/general/PresetGroup.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2006-2009
D. Michael McIntyre <dmmcintyr at users.sourceforge.net>
diff --git a/src/gui/general/PresetGroup.h b/src/gui/general/PresetGroup.h
index b815082..dda05fe 100644
--- a/src/gui/general/PresetGroup.h
+++ b/src/gui/general/PresetGroup.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2006-2009
D. Michael McIntyre <dmmcintyr at users.sourceforge.net>
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index c2b7bc8..c063ef4 100644
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h
index fad19a1..892879d 100644
--- a/src/gui/general/PresetHandlerDialog.h
+++ b/src/gui/general/PresetHandlerDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ProgressReporter.cpp b/src/gui/general/ProgressReporter.cpp
index 184e318..84c8f2b 100644
--- a/src/gui/general/ProgressReporter.cpp
+++ b/src/gui/general/ProgressReporter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ProgressReporter.h b/src/gui/general/ProgressReporter.h
index 59a31fb..2fe63ea 100644
--- a/src/gui/general/ProgressReporter.h
+++ b/src/gui/general/ProgressReporter.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ProjectPackager.cpp b/src/gui/general/ProjectPackager.cpp
index ed624bf..00aa48f 100644
--- a/src/gui/general/ProjectPackager.cpp
+++ b/src/gui/general/ProjectPackager.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ProjectPackager.h b/src/gui/general/ProjectPackager.h
index 1287e3c..05643c3 100644
--- a/src/gui/general/ProjectPackager.h
+++ b/src/gui/general/ProjectPackager.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/RecentFiles.cpp b/src/gui/general/RecentFiles.cpp
index 2961039..a1fc6d2 100644
--- a/src/gui/general/RecentFiles.cpp
+++ b/src/gui/general/RecentFiles.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file from Sonic Visualiser, copyright 2006 Chris Cannam.
diff --git a/src/gui/general/RecentFiles.h b/src/gui/general/RecentFiles.h
index b1c909b..dfa70e6 100644
--- a/src/gui/general/RecentFiles.h
+++ b/src/gui/general/RecentFiles.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file from Sonic Visualiser, copyright 2006 Chris Cannam.
diff --git a/src/gui/general/ResourceFinder.cpp b/src/gui/general/ResourceFinder.cpp
index f201f97..c958b7b 100644
--- a/src/gui/general/ResourceFinder.cpp
+++ b/src/gui/general/ResourceFinder.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/gui/general/ResourceFinder.h b/src/gui/general/ResourceFinder.h
index adeefa5..91827e0 100644
--- a/src/gui/general/ResourceFinder.h
+++ b/src/gui/general/ResourceFinder.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/gui/general/RosegardenScrollView.cpp b/src/gui/general/RosegardenScrollView.cpp
index 0680146..ed8929f 100644
--- a/src/gui/general/RosegardenScrollView.cpp
+++ b/src/gui/general/RosegardenScrollView.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -17,167 +17,138 @@
#define RG_MODULE_STRING "[RosegardenScrollView]"
-#include <QWheelEvent>
-#include <QDesktopWidget>
#include "RosegardenScrollView.h"
#include "misc/Debug.h"
-#include <QApplication>
+#include "gui/rulers/StandardRuler.h"
+
+//#include <QApplication>
#include <QCursor>
-#include <QPoint>
+#include <QDesktopWidget>
+#include <QMouseEvent>
#include <QRect>
#include <QScrollBar>
-#include <QAbstractScrollArea>
#include <QSizePolicy>
#include <QTimer>
+#include <QWheelEvent>
#include <QWidget>
+#include <algorithm> // std::swap(), std::min(), std::max()
+
+#include <math.h>
+
namespace Rosegarden
{
-// Smooth scroll checks
-//
-const int RosegardenScrollView::AutoscrollMargin = 16;
-const int RosegardenScrollView::InitialScrollTime = 30;
-const int RosegardenScrollView::InitialScrollShortcut = 5;
-const int RosegardenScrollView::MaxScrollDelta = 100; // max a.scroll speed
-const double RosegardenScrollView::ScrollShortcutValue = 1.04;// shortcuteration rate
+const int RosegardenScrollView::AutoScrollTimerInterval = 30; // msecs
+
-RosegardenScrollView::RosegardenScrollView(QWidget* parent)
+RosegardenScrollView::RosegardenScrollView(QWidget *parent)
: QAbstractScrollArea(parent),
-
- m_bottomWidget(0),
- m_currentBottomWidgetHeight( -1),
- m_smoothScroll(true),
- m_smoothScrollTimeInterval(DefaultSmoothScrollTimeInterval),
- m_minDeltaScroll(DefaultMinDeltaScroll),
- m_autoScrollTime(InitialScrollTime),
- m_autoScrollShortcut(InitialScrollShortcut),
- m_autoScrollXMargin(0),
- m_autoScrollYMargin(0),
- m_currentScrollDirection(None),
- m_scrollDirectionConstraint(NoFollow),
+
+ m_bottomRuler(0),
+ m_contentsWidth(0),
+ m_contentsHeight(0),
+ m_followMode(NoFollow),
m_autoScrolling(false)
{
+ // Turn off the frame which causes positioning issues.
+ // The rest of the code assumes there is no frame.
+ setFrameStyle(QFrame::NoFrame);
- setDragAutoScroll(true); //&&& could not find replacement
-
- connect( &m_autoScrollTimer, SIGNAL( timeout() ),
- this, SLOT( doAutoScroll() ) );
+ connect(&m_autoScrollTimer, SIGNAL(timeout()),
+ this, SLOT(slotOnAutoScrollTimer()));
}
-
-// convenience methods, added for qt4 support
-// they will either use (I'm not shure yet):
-// QRegion QWidget::visibleRegion ()
-// or
-// <QScrollArea*>this->horizontalScrollBar().value()
-// + <QScrollArea*>this->width()
-//
-int RosegardenScrollView::contentsX() //### todo: when GUI is ready: check the following code
+int RosegardenScrollView::contentsX()
{
- return this->horizontalScrollBar()->value();
+ return horizontalScrollBar()->value();
}
int RosegardenScrollView::contentsY()
{
- return this->verticalScrollBar()->value();
-}
-
-void RosegardenScrollView::setContentsPos(int posX, int posY)
-{
- this->horizontalScrollBar()->setValue(posX);
- this->verticalScrollBar()->setValue(posY);
- return;
-}
-
-int RosegardenScrollView::visibleWidth()
-{
- // These were converted by someone to contentsX + this->width() - didn't look right
- return this->viewport()->width();
-// return this->width();
+ return verticalScrollBar()->value();
}
-int RosegardenScrollView::visibleHeight()
+void RosegardenScrollView::resizeContents(int w, int h)
{
- return this->viewport()->height();
-// return this->height();
-}
-
-int RosegardenScrollView::contentsWidth()
-{
- return m_vwidth;
-}
+ // Code lifted from Q3ScrollView::resizeContents().
-int RosegardenScrollView::contentsHeight()
-{
- return m_vheight;
-}
+ // Hold on to the old values.
+ int ow = m_contentsWidth;
+ int oh = m_contentsHeight;
-void RosegardenScrollView::resizeContents(int w, int h) // Code lifted from Q3ScrollView
-{
- int ow = m_vwidth;
- int oh = m_vheight;
-
- m_vwidth = w;
- m_vheight = h;
+ // We need to set these before we do the swaps, otherwise we may be
+ // storing the wrong (post-swap) values.
+ m_contentsWidth = w;
+ m_contentsHeight = h;
-// d->scrollbar_timer.start(0, true); // This was necessary until I fixed the resizeEvent connection
+ // This was necessary until I fixed the resizeEvent connection
+ //d->scrollbar_timer.start(0, true);
-//### CJ - Don't think this is necessary - slightly confused as we're resizing the content, not the widget
-// if (d->children.isEmpty() && d->policy == Default)
-// setResizePolicy(Manual);
+ //### CJ - Don't think this is necessary - slightly confused as we're
+ // resizing the content, not the widget
+ //if (d->children.isEmpty() && d->policy == Default)
+ // setResizePolicy(Manual);
+ // Make sure "w" is the larger one.
+ // ??? This would be easier to read using minWidth and maxWidth for the
+ // smaller and the larger.
if (ow > w) {
- // Swap
- int t=w;
- w=ow;
- ow=t;
+ std::swap(w, ow);
}
- // Refresh area ow..w
- if (ow < visibleWidth() && w >= 0) {
+
+ // Refresh area ow..w (minWidth..maxWidth)
+ if (ow < viewport()->width() && w >= 0) {
if (ow < 0)
ow = 0;
- if (w > visibleWidth())
- w = visibleWidth();
- this->viewport()->update(contentsX()+ow, 0, w-ow, visibleHeight());
+ if (w > viewport()->width())
+ w = viewport()->width();
+ viewport()->update(contentsX()+ow, 0, w-ow, viewport()->height());
}
+ // Make sure "h" is the larger one.
+ // ??? This would be easier to read using minHeight and maxHeight for
+ // the smaller and the larger.
if (oh > h) {
- // Swap
- int t=h;
- h=oh;
- oh=t;
+ std::swap(h, oh);
}
- // Refresh area oh..h
- if (oh < visibleHeight() && h >= 0) {
+ // Refresh area oh..h (minHeight..maxHeight)
+ if (oh < viewport()->height() && h >= 0) {
if (oh < 0)
oh = 0;
- if (h > visibleHeight())
- h = visibleHeight();
- this->viewport()->update(0, contentsY()+oh, visibleWidth(), h-oh);
+ if (h > viewport()->height())
+ h = viewport()->height();
+ viewport()->update(0, contentsY()+oh, viewport()->width(), h-oh);
}
+
+ // Since the contents size has changed, make sure the
+ // scrollbars are updated.
+ updateScrollBars();
}
-void RosegardenScrollView::updateContents(int x, int y, int w, int h) // Code lifted from Q3ScrollView
+void RosegardenScrollView::updateContents(int x, int y, int w, int h)
{
+ // Code lifted from Q3ScrollView::updateContents().
+
if (!isVisible() || !updatesEnabled())
return;
-// RG_DEBUG << "RosegardenScrollView::updateContents" << endl;
- QWidget* vp = viewport();
+ //RG_DEBUG << "updateContents()";
- // Translate
+ // Translate contents coords to viewport coords.
x -= contentsX();
y -= contentsY();
+ // Cut off any portion left of the left edge.
if (x < 0) {
w += x;
x = 0;
}
+ // Cut off any portion above the top edge.
if (y < 0) {
h += y;
y = 0;
@@ -185,507 +156,288 @@ void RosegardenScrollView::updateContents(int x, int y, int w, int h) // Code l
if (w < 0 || h < 0)
return;
- if (x > visibleWidth() || y > visibleHeight())
+
+ // If x or y are beyond the viewport, bail.
+ if (x > viewport()->width() || y > viewport()->height())
return;
- if (w > visibleWidth())
- w = visibleWidth();
- if (h > visibleHeight())
- h = visibleHeight();
+ // No need to update more than can be seen.
+ if (w > viewport()->width())
+ w = viewport()->width();
+ if (h > viewport()->height())
+ h = viewport()->height();
//### CJ - I don't think we used a clipped_viewport on Q3ScrollView
//if (d->clipped_viewport) {
- //// Translate clipper() to viewport()
- //x -= d->clipped_viewport->x();
- //y -= d->clipped_viewport->y();
+ // // Translate clipper() to viewport()
+ // x -= d->clipped_viewport->x();
+ // y -= d->clipped_viewport->y();
//}
- vp->update(x, y, w, h);
-
- updateScrollBars();
+ viewport()->update(x, y, w, h);
}
-void RosegardenScrollView::updateContents(const QRect& r)
+void RosegardenScrollView::updateContents(const QRect &r)
{
updateContents(r.x(), r.y(), r.width(), r.height());
}
void RosegardenScrollView::updateContents()
{
- updateContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
+ viewport()->update();
}
void RosegardenScrollView::updateScrollBars()
{
- horizontalScrollBar()->setPageStep(visibleWidth());
-// horizontalScrollBar()->setLineStep(visibleWidth() / 10);
horizontalScrollBar()->setMaximum(
- std::max(contentsWidth()-visibleWidth(),0));
- verticalScrollBar()->setPageStep(visibleHeight());
-// verticalScrollBar()->setLineStep(visibleHeight() / 10);
- verticalScrollBar()->setMaximum(
- std::max(contentsHeight()-visibleHeight(),0));
-
-// RG_DEBUG << "RosegardenScrollView::updateScrollBars :" <<
-// " pagewidth - " << visibleWidth() <<
-// " pageheight - " << visibleHeight();
-}
+ std::max(m_contentsWidth - viewport()->width(), 0));
+ horizontalScrollBar()->setPageStep(viewport()->width());
+ horizontalScrollBar()->setSingleStep(viewport()->width() / 10);
-void RosegardenScrollView::paintEvent( QPaintEvent* event )
-{
- viewportPaintEvent( event );
+ verticalScrollBar()->setMaximum(
+ std::max(m_contentsHeight - viewport()->height(), 0));
+ verticalScrollBar()->setPageStep(viewport()->height());
+ // Note: The vertical scrollbar's single step is set to the track
+ // height in TrackEditor::init().
}
-QPoint RosegardenScrollView::viewportToContents(const QPoint& vp)
+QPoint RosegardenScrollView::viewportToContents(const QPoint &vp)
{
return QPoint(vp.x() + contentsX(),
vp.y() + contentsY());
}
-void RosegardenScrollView::viewportPaintEvent( QPaintEvent* /* event */ )
-{
-}
-
-void RosegardenScrollView::mousePressEvent( QMouseEvent* event )
-{
- viewportMousePressEvent( event );
-}
-
-void RosegardenScrollView::viewportMousePressEvent(QMouseEvent* e)
-{
- QMouseEvent ce(e->type(), viewportToContents(e->pos()),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- contentsMousePressEvent(&ce);
- if (!ce.isAccepted())
- e->ignore();
-}
-
-void RosegardenScrollView::contentsMousePressEvent( QMouseEvent* /* event */ )
-{
-}
-
-void RosegardenScrollView::mouseReleaseEvent( QMouseEvent* event )
-{
- viewportMouseReleaseEvent( event );
-}
-
-void RosegardenScrollView::viewportMouseReleaseEvent(QMouseEvent* e)
-{
- QMouseEvent ce(e->type(), viewportToContents(e->pos()),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- contentsMouseReleaseEvent(&ce);
- if (!ce.isAccepted())
- e->ignore();
-}
-
-void RosegardenScrollView::contentsMouseReleaseEvent( QMouseEvent* /* event */ )
+void RosegardenScrollView::setBottomRuler(StandardRuler *ruler)
{
+ m_bottomRuler = ruler;
+ if (m_bottomRuler) {
+ m_bottomRuler->setParent(this);
+ m_bottomRuler->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed));
+ // ??? Why do we have to add 1 to get enough room?
+ // - Are the viewport's limits being ignored? Is someone
+ // overdrawing the bottom by 1?
+ // - Is the bottom ruler expanding by 1? No. The hint is 25,
+ // we size it to 25, and it stays at 25.
+ // - Inclusive vs. exclusive math? Don't think so.
+ setViewportMargins( 0, 0, 0, m_bottomRuler->sizeHint().height() + 1 );
+ }
}
-void RosegardenScrollView::mouseMoveEvent( QMouseEvent* event )
+void RosegardenScrollView::startAutoScroll()
{
- viewportMouseMoveEvent( event );
-}
+ if (!m_autoScrollTimer.isActive()) {
+ m_autoScrollTimer.start(AutoScrollTimerInterval);
+ }
-void RosegardenScrollView::viewportMouseMoveEvent(QMouseEvent* e)
-{
- QMouseEvent ce(e->type(), viewportToContents(e->pos()),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- contentsMouseMoveEvent(&ce);
- if (!ce.isAccepted())
- e->ignore();
+ m_autoScrolling = true;
}
-void RosegardenScrollView::contentsMouseMoveEvent( QMouseEvent* /* event */ )
+void RosegardenScrollView::slotStartAutoScroll(int followMode)
{
+ setFollowMode(followMode);
+ startAutoScroll();
}
-void RosegardenScrollView::mouseDoubleClickEvent( QMouseEvent* event )
+void RosegardenScrollView::slotStopAutoScroll()
{
- viewportMouseDoubleClickEvent( event );
+ m_autoScrollTimer.stop();
+ m_autoScrolling = false;
}
-void RosegardenScrollView::viewportMouseDoubleClickEvent(QMouseEvent* e)
+double RosegardenScrollView::distanceToScrollRate(int distance)
{
- QMouseEvent ce(e->type(), viewportToContents(e->pos()),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- contentsMouseDoubleClickEvent(&ce);
- if (!ce.isAccepted())
- e->ignore();
-}
+ // We'll hit MaxScrollRate at this distance outside the viewport.
+ const double maxDistance = 40;
+ const double distanceNormalized = distance / maxDistance;
+ // Apply a curve to reduce the touchiness.
+ // Simple square curve. Something more pronounced might be better.
+ const double distanceWithCurve = distanceNormalized * distanceNormalized;
-void RosegardenScrollView::contentsMouseDoubleClickEvent( QMouseEvent* /* event */ )
-{
-}
+ const double minScrollRate = 1.2;
+ const double maxScrollRate = 100;
+ const double scrollRateRange = (maxScrollRate - minScrollRate);
-void RosegardenScrollView::setDragAutoScroll(bool)
-{
-}
+ const double scrollRate = distanceWithCurve * scrollRateRange + minScrollRate;
-void RosegardenScrollView::setBottomFixedWidget(QWidget* w)
-{
- m_bottomWidget = w;
- if (m_bottomWidget) {
- m_bottomWidget->setParent(this);
- m_bottomWidget->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed));
- setViewportMargins( 0, 0, 0, m_bottomWidget->sizeHint().height() );
- RG_DEBUG << "RosegardenScrollView::setBottomFixedWidget" << endl;
- }
+ return std::min(scrollRate, maxScrollRate);
}
-void RosegardenScrollView::startAutoScroll()
+void RosegardenScrollView::doAutoScroll()
{
- // RG_DEBUG << "RosegardenScrollView::startAutoScroll()\n";
-
- if ( !m_autoScrollTimer.isActive() ) {
- m_autoScrollTime = InitialScrollTime;
- m_autoScrollShortcut = InitialScrollShortcut;
- m_autoScrollTimer.start( m_autoScrollTime );
- }
-
- QPoint autoScrollStartPoint = viewport()->mapFromGlobal( QCursor::pos() );
- m_autoScrollYMargin = autoScrollStartPoint.y() / 10;
- m_autoScrollXMargin = autoScrollStartPoint.x() / 10;
-
- m_autoScrolling = true;
-}
+ const QPoint mousePos = viewport()->mapFromGlobal(QCursor::pos());
-void RosegardenScrollView::startAutoScroll(int directionConstraint)
-{
- setScrollDirectionConstraint(directionConstraint);
- startAutoScroll();
-}
+ m_autoScrollTimer.start(AutoScrollTimerInterval);
-void RosegardenScrollView::stopAutoScroll()
-{
- // RG_DEBUG << "RosegardenScrollView::stopAutoScroll()\n";
+ if (m_followMode & FollowHorizontal) {
- m_autoScrollTimer.stop();
- m_minDeltaScroll = DefaultMinDeltaScroll;
- m_currentScrollDirection = None;
+ // The following auto scroll behavior is patterned after Chromium,
+ // Eclipse, and the GIMP. Auto scroll will only happen if the
+ // mouse is outside the viewport. The auto scroll rate is
+ // proportional to how far outside the viewport the mouse is.
- m_autoScrolling = false;
-}
+ int scrollX = 0;
-void RosegardenScrollView::doAutoScroll()
-{
- // RG_DEBUG << "RosegardenScrollView::doAutoScroll()\n";
-
- QPoint p = viewport()->mapFromGlobal( QCursor::pos() );
- QPoint dp = p - m_previousP;
- m_previousP = p;
-
- m_autoScrollTimer.start( m_autoScrollTime );
- ScrollDirection scrollDirection = None;
-
- int dx = 0, dy = 0;
- if (m_scrollDirectionConstraint & FollowVertical) {
- if ( p.y() < m_autoScrollYMargin ) {
- dy = -(int(m_minDeltaScroll));
- scrollDirection = Top;
- } else if ( p.y() > visibleHeight() - m_autoScrollYMargin ) {
- dy = + (int(m_minDeltaScroll));
- scrollDirection = Bottom;
+ // If the mouse is to the left of the viewport
+ if (mousePos.x() < 0) {
+ // Set the scroll rate based on how far outside we are.
+ scrollX = lround(-distanceToScrollRate(-mousePos.x()));
}
- }
- bool startDecelerating = false;
- if (m_scrollDirectionConstraint & FollowHorizontal) {
-
- // RG_DEBUG << "p.x() : " << p.x() << " - visibleWidth : " << visibleWidth() << " - autoScrollXMargin : " << m_autoScrollXMargin << endl;
-
- if ( p.x() < m_autoScrollXMargin ) {
- if ( dp.x() > 0 ) {
- startDecelerating = true;
- m_minDeltaScroll /= ScrollShortcutValue;
- }
- dx = -(int(m_minDeltaScroll));
- scrollDirection = Left;
- } else if ( p.x() > visibleWidth() - m_autoScrollXMargin ) {
- if ( dp.x() < 0 ) {
- startDecelerating = true;
- m_minDeltaScroll /= ScrollShortcutValue;
- }
- dx = + (int(m_minDeltaScroll));
- scrollDirection = Right;
+
+ // If the mouse is to the right of the viewport
+ if (mousePos.x() > viewport()->width()) {
+ // Set the scroll rate based on how far outside we are.
+ scrollX = lround(distanceToScrollRate(mousePos.x() - viewport()->width()));
}
- }
- // RG_DEBUG << "dx: " << dx << ", dy: " << dy << endl;
-
- if ( (dx || dy) &&
- ((scrollDirection == m_currentScrollDirection) || (m_currentScrollDirection == None)) ) {
-
-// scroll(dx, dy);
- this->horizontalScrollBar()->setValue( this->horizontalScrollBar()->value() + dx );
- this->verticalScrollBar()->setValue( this->verticalScrollBar()->value() + dy );
-
- if ( startDecelerating )
- m_minDeltaScroll /= ScrollShortcutValue;
- else
- m_minDeltaScroll *= ScrollShortcutValue;
- if (m_minDeltaScroll > MaxScrollDelta )
- m_minDeltaScroll = MaxScrollDelta;
- m_currentScrollDirection = scrollDirection;
-
- } else {
- // Don't automatically stopAutoScroll() here, the mouse button
- // is presumably still pressed.
- m_minDeltaScroll = DefaultMinDeltaScroll;
- m_currentScrollDirection = None;
+ // Scroll if needed.
+ if (scrollX)
+ horizontalScrollBar()->setValue(horizontalScrollBar()->value() + scrollX);
}
-}
-
-const int RosegardenScrollView::DefaultSmoothScrollTimeInterval = 10;
-const double RosegardenScrollView::DefaultMinDeltaScroll = 1.2;
-
-bool RosegardenScrollView::isTimeForSmoothScroll()
-{
- // static int desktopWidth = QApplication::desktop()->width(),
- // desktopHeight = QApplication::desktop()->height();
-
- if (m_smoothScroll) {
- int ta = m_scrollShortcuterationTimer.elapsed();
- int t = m_scrollTimer.elapsed();
-
- RG_DEBUG << "t = " << t << ", ta = " << ta << ", int " << m_smoothScrollTimeInterval << ", delta " << m_minDeltaScroll << endl;
-
- if (t < m_smoothScrollTimeInterval) {
+ if (m_followMode & FollowVertical) {
- return false;
+ // This vertical auto scroll behavior is patterned after
+ // Audacity. Auto scroll will only happen if the mouse is
+ // outside the viewport. The auto scroll rate is fixed.
- } else {
+ int scrollY = 0;
- if (ta > 300) {
- // reset smoothScrollTimeInterval
- m_smoothScrollTimeInterval = DefaultSmoothScrollTimeInterval;
- m_minDeltaScroll = DefaultMinDeltaScroll;
- m_scrollShortcuterationTimer.restart();
- } else if (ta > 50) {
- // m_smoothScrollTimeInterval /= 2;
- m_minDeltaScroll *= 1.08;
- m_scrollShortcuterationTimer.restart();
- }
+ // If the mouse is above the viewport
+ if (mousePos.y() < 0) {
+ scrollY = -5;
+ }
- m_scrollTimer.restart();
- return true;
+ // If the mouse is below the viewport
+ if (mousePos.y() > viewport()->height()) {
+ scrollY = +5;
}
- }
- return true;
+ // Scroll if needed.
+ if (scrollY)
+ verticalScrollBar()->setValue(verticalScrollBar()->value() + scrollY);
+ }
}
-void RosegardenScrollView::slotScrollHoriz(int hpos)
+void RosegardenScrollView::slotOnAutoScrollTimer()
{
- QScrollBar* hbar = getMainHorizontalScrollBar();
- int currentContentYPos = contentsY();
-
- /* Lots of performance hitting debug
- RG_DEBUG << "RosegardenScrollView::slotScrollHoriz: hpos is " << hpos
- << ", contentsX is " << contentsX() << ", visibleWidth is "
- << visibleWidth() << endl;
- */
-
- if (hpos == 0) {
-
- // returning to zero
- // hbar->setValue(0);
- setContentsPos(0, currentContentYPos); //@@@
-
- // possible replacement: ??
- //this->widget()->move( 0, currentContentYPos )
-
-
- } else if (hpos > (contentsX() +
- visibleWidth() * 1.6) ||
- hpos < (contentsX() -
- visibleWidth() * 0.7)) {
-
- // miles off one side or the other
- // hbar->setValue(hpos - int(visibleWidth() * 0.4));
- setContentsPos(hpos - int(visibleWidth() * 0.4), currentContentYPos);
-
- } else if (hpos > (contentsX() +
- visibleWidth() * 0.9)) {
-
- // moving off the right hand side of the view
- // hbar->setValue(hbar->value() + int(visibleWidth() * 0.6));
- setContentsPos(hbar->value() + int(visibleWidth() * 0.6), currentContentYPos);
-
- } else if (hpos < (contentsX() +
- visibleWidth() * 0.1)) {
-
- // moving off the left
- // hbar->setValue(hbar->value() - int(visibleWidth() * 0.6));
- setContentsPos(hbar->value() - int(visibleWidth() * 0.6), currentContentYPos);
- }
+ doAutoScroll();
}
-void RosegardenScrollView::slotScrollHorizSmallSteps(int hpos)
+void RosegardenScrollView::scrollHoriz(int x)
{
- QScrollBar* hbar = getMainHorizontalScrollBar();
- int currentContentYPos = contentsY();
+ QScrollBar *hbar = horizontalScrollBar();
- int diff = 0;
+ const int contentsX = hbar->value();
- if (hpos == 0) {
+ if (x == 0) {
- // returning to zero
- // hbar->setValue(0);
- setContentsPos(0, currentContentYPos);
+ hbar->setValue(0);
- } else if ((diff = int(hpos - (contentsX() +
- visibleWidth() * 0.90))) > 0) {
+ } else if (x > (contentsX + viewport()->width() * 1.6) ||
+ x < (contentsX - viewport()->width() * 0.7)) {
+ // The requested x is relatively far away.
- // moving off the right hand side of the view
+ // Put it slightly to the left of center.
+ hbar->setValue(x - int(viewport()->width() * 0.4));
- int delta = diff / 6;
- int diff10 = std::min(diff, (int)m_minDeltaScroll);
- delta = std::max(delta, diff10);
+ } else if (x > (contentsX + viewport()->width() * 0.9)) {
+ // The requested x is slightly off to the right.
- // hbar->setValue(hbar->value() + delta);
- setContentsPos(hbar->value() + delta, currentContentYPos);
+ // Go right a little more than half of a page.
+ hbar->setValue(contentsX + int(viewport()->width() * 0.6));
- } else if ((diff = int(hpos - (contentsX() +
- visibleWidth() * 0.10))) < 0) {
- // moving off the left
-
- int delta = -diff / 6;
- int diff10 = std::min( -diff, (int)m_minDeltaScroll);
- delta = std::max(delta, diff10);
-
- // hbar->setValue(hbar->value() - delta);
- setContentsPos(hbar->value() - delta, currentContentYPos);
+ } else if (x < (contentsX + viewport()->width() * 0.1)) {
+ // The requested x is slightly off to the left.
+ // Go left a little more than half of a page.
+ hbar->setValue(contentsX - int(viewport()->width() * 0.6));
}
}
-void RosegardenScrollView::slotScrollVertSmallSteps(int vpos)
+void RosegardenScrollView::scrollVert(int y)
{
- QScrollBar* vbar = verticalScrollBar();
-
- // RG_DEBUG << "RosegardenCanvasView::slotScrollVertSmallSteps - Start: vpos is " << vpos << ", contentsY is " << contentsY() << ", visibleHeight is " << visibleHeight() << endl;
-
- // As a special case (or hack), ignore any request made before we've
- // actually been rendered and sized
- if (visibleHeight() <= 1)
- return ;
-
- int diff = 0;
-
- if (vpos == 0) {
-
- // returning to zero
- vbar->setValue(0);
-
- } else if ((diff = int(vpos - (contentsY() +
- visibleHeight() * 0.90))) > 0) {
+ // Ignore any request made before we've actually been rendered and sized.
+ if (viewport()->height() <= 1)
+ return;
- // moving off up
+ QScrollBar *vbar = verticalScrollBar();
- int delta = diff / 6;
- int diff10 = std::min(diff, (int)m_minDeltaScroll);
- delta = std::max(delta, diff10);
+ // One "line" (track) from the bottom.
+ int bottomMargin = contentsY() + viewport()->height() - vbar->singleStep();
- vbar->setValue(vbar->value() + diff);
+ // If the requested y is below the bottom margin.
+ if (y > bottomMargin) {
+ int scrollY = y - bottomMargin;
- } else if ((diff = int(vpos - (contentsY() +
- visibleHeight() * 0.10))) < 0) {
+ // Scroll to make sure the requested y is visible.
+ vbar->setValue(vbar->value() + scrollY);
- // moving off down
+ return;
+ }
- int delta = -diff / 6;
- int diff10 = std::min( -diff, (int)m_minDeltaScroll);
- delta = std::max(delta, diff10);
+ // If the requested y is above the top.
+ if (y < contentsY()) {
+ int scrollY = y - contentsY();
- vbar->setValue(vbar->value() - delta);
+ // Scroll to make sure the requested y is at the top.
+ vbar->setValue(vbar->value() + scrollY);
+ return;
}
}
-void RosegardenScrollView::slotScrollVertToTop(int vpos)
+void RosegardenScrollView::resizeEvent(QResizeEvent *e)
{
- QScrollBar* vbar = verticalScrollBar();
- if (vpos < visibleHeight() / 3)
- vbar->setValue(0);
- else
- vbar->setValue(vpos - visibleHeight() / 5);
-}
-
-void RosegardenScrollView::slotSetScrollPos(const QPoint &pos)
-{
- horizontalScrollBar()->setValue(pos.x());
- verticalScrollBar()->setValue(pos.y());
-}
+ RG_DEBUG << "resizeEvent()";
-void RosegardenScrollView::resizeEvent(QResizeEvent* e)
-{
QAbstractScrollArea::resizeEvent(e);
+
+ // Since the viewport size has changed, we need to update
+ // the scrollbars.
updateScrollBars();
-//### What was the purpose of this?
-// if (!horizontalScrollBar()->isVisible())
- updateBottomWidgetGeometry();
-}
-void RosegardenScrollView::setHBarGeometry(QScrollBar &/* hbar */, int /* x */, int /* y */, int /* w */, int /* h */)
-{
- ///@TODO Not available in QAbstractScrollArea - Q3ScrollView::setHBarGeometry(hbar, x, y, w, h);
-// hbar.setGeometry( x,y, w,h );
- updateBottomWidgetGeometry();
+ // Make sure the bottom ruler is where it needs to be.
+ updateBottomRulerGeometry();
+
+ // Let TrackEditor know so it can resize the TrackButtons to match.
+ emit viewportResize();
}
-void RosegardenScrollView::updateBottomWidgetGeometry()
+void RosegardenScrollView::updateBottomRulerGeometry()
{
- RG_DEBUG << "RosegardenScrollView::updateBottomWidgetGeometry" << endl;
- if (!m_bottomWidget)
- return ;
-
- int bottomWidgetHeight = m_bottomWidget->sizeHint().height();
-
- setContentsMargins(0, 0, 0, bottomWidgetHeight);
- QRect r = frameRect();
- int hScrollBarHeight = 0;
- if (horizontalScrollBar()->isVisible())
- hScrollBarHeight = horizontalScrollBar()->height() + 2; // + 2 offset needed to preserve border shadow
-
- int vScrollBarWidth = 0;
- if (verticalScrollBar()->isVisible())
- vScrollBarWidth = verticalScrollBar()->width();
-
- m_bottomWidget->setGeometry(r.x(),
- r.y() + r.height() - bottomWidgetHeight - hScrollBarHeight,
- r.width() - vScrollBarWidth,
- bottomWidgetHeight);
-
- if (bottomWidgetHeight != m_currentBottomWidgetHeight) {
- emit bottomWidgetHeightChanged(bottomWidgetHeight);
- m_currentBottomWidgetHeight = bottomWidgetHeight;
- }
+ RG_DEBUG << "updateBottomRulerGeometry()";
+
+ if (!m_bottomRuler)
+ return;
+ int bottomRulerHeight = m_bottomRuler->sizeHint().height();
+ // Since there's no margin (see the call to setFrameStyle() in
+ // the ctor), we can assume the viewport coords match up with
+ // the parent coords. No need to transform.
+ QRect viewportRect = viewport()->rect();
+
+ // Move the bottom ruler to below the viewport.
+ m_bottomRuler->setGeometry(
+ viewportRect.left(),
+ viewportRect.bottom() + 1, // +1 to be just under
+ viewportRect.width(),
+ bottomRulerHeight); // See the call to setViewportMargins().
}
void RosegardenScrollView::wheelEvent(QWheelEvent *e)
{
if (e->modifiers() & Qt::CTRL) {
- if (e->delta() > 0) emit zoomIn();
- else if (e->delta() < 0) emit zoomOut();
- return ;
+ if (e->delta() > 0)
+ emit zoomIn();
+ else if (e->delta() < 0)
+ emit zoomOut();
+
+ return;
}
- // For some reason that I don't understand, vertical scrolling
- // with the wheel in the main window is extremely slow. The
- // factor of 10 applied here is to compensate for that. No doubt
- // on someone else's machine it will turn out to have been fine
- // before this factor was applied, and unusable now...
-
- QWheelEvent w(e->pos(),
- e->globalPos(),
- e->delta() * 10,
- e->buttons(),
- e->modifiers(),
- e->orientation());
- QAbstractScrollArea::wheelEvent(&w);
+ QAbstractScrollArea::wheelEvent(e);
}
+
}
#include "RosegardenScrollView.moc"
diff --git a/src/gui/general/RosegardenScrollView.h b/src/gui/general/RosegardenScrollView.h
index 18d6ecc..7f5301f 100644
--- a/src/gui/general/RosegardenScrollView.h
+++ b/src/gui/general/RosegardenScrollView.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -18,198 +18,190 @@
#ifndef RG_ROSEGARDENSCROLLVIEW_H
#define RG_ROSEGARDENSCROLLVIEW_H
-#include <QPoint>
#include <QAbstractScrollArea>
#include <QDateTime>
+#include <QPoint>
#include <QTimer>
-class QWidget;
-class QWheelEvent;
-class QScrollBar;
+class QMouseEvent;
+class QPaintEvent;
+class QRect;
class QResizeEvent;
+class QScrollBar;
+class QWheelEvent;
+class QWidget;
namespace Rosegarden
{
+class StandardRuler;
+/// QAbstractScrollArea with auto-scroll and bottom ruler.
/**
- * A QScrollView with more elaborate auto-scrolling capabilities
- * and the ability to have a "fixed" (non-scrolling) widget at its bottom,
- * just above the bottom scrollbar.
+ * A QAbstractScrollArea with more elaborate auto-scrolling capabilities
+ * and the ability to have a vertically "fixed" StandardRuler at its
+ * bottom, just above the horizontal scrollbar.
+ *
+ * Some Q3ScrollView compatibility is provided to ease the transition
+ * from Q3ScrollView to QAbstractScrollArea.
+ *
+ * CompositionView derives from this class.
*/
class RosegardenScrollView : public QAbstractScrollArea
{
Q_OBJECT
+
public:
- RosegardenScrollView(QWidget* parent=0);
+ RosegardenScrollView(QWidget *parent);
+
+ /// Connect the bottom StandardRuler.
+ /**
+ * Sets the ruler widget which will be between the scrollable part of
+ * the view and the horizontal scrollbar.
+ *
+ * This is called by TrackEditor::init() to connect a StandardRuler
+ * instance.
+ */
+ void setBottomRuler(StandardRuler *);
+
+ /// X coordinate of the contents that are at the left edge of the viewport.
+ int contentsX();
+ /// Y coordinate of the contents that are at the top edge of the viewport.
+ int contentsY();
+
+ QPoint viewportToContents(const QPoint &);
+
+ void updateContents();
+
+ /// Follow Mode
/**
- * EditTool::handleMouseMove() returns a OR-ed combination of these
- * to indicate which direction to scroll to
+ * Derivers from SegmentTool override SegmentTool::handleMouseMove() and
+ * return an OR-ed combination of these to indicate the auto-scroll
+ * direction.
+ *
+ * See MatrixTool::FollowMode, NotationTool::FollowMode, and
+ * ControlTool::FollowMode.
+ *
+ * Would this make more sense in SegmentTool?
*/
- enum {
+ enum FollowMode {
NoFollow = 0x0,
FollowHorizontal = 0x1,
FollowVertical = 0x2
};
/**
- * Sets the canvas width to be exactly the width needed to show
- * all the items
+ * Called by TrackEditor::handleAutoScroll().
*/
-// void fitWidthToContents();
-
- // Functions that were missing from QAbstractScrollArea
- int contentsX(); //### todo: when GUI is ready: check the following code
- int contentsY();
- void setContentsPos(int, int ); //### JAS todo: when GUI is ready: check the following code
- int visibleWidth();
- int visibleHeight();
- int contentsWidth();
- int contentsHeight();
-
- void resizeContents(int, int);
- void updateContents(int, int, int, int);
- void updateContents(const QRect& r);
- void updateContents();
-
- void paintEvent( QPaintEvent* pe );
-
- void mousePressEvent( QMouseEvent* );
- void mouseReleaseEvent( QMouseEvent* );
- void mouseDoubleClickEvent( QMouseEvent* );
- void mouseMoveEvent( QMouseEvent* );
-
- QPoint viewportToContents( QPoint& );
-
- void setDragAutoScroll(bool);
+ void doAutoScroll();
+ bool isAutoScrolling() const { return m_autoScrolling; }
+ /// Playback scrolling.
/**
- * Sets the widget which will be between the scrollable part of the view
- * and the horizontal scrollbar
+ * Scroll horizontally to make the given contents position visible,
+ * paging so as to get some visibility of the next screenful
+ * (for playback etc)
*/
- void setBottomFixedWidget(QWidget*);
-
- void updateBottomWidgetGeometry();
-
- /// Map a point with the inverse world matrix
-// QPoint inverseMapPoint(const QPoint& p) { return inverseWorldMatrix().map(p); }
-
- void setSmoothScroll(bool s) { m_smoothScroll = s; }
-
- bool isTimeForSmoothScroll();
-
- void setScrollDirectionConstraint(int d) { m_scrollDirectionConstraint = d; }
-
- int getDeltaScroll() { return m_minDeltaScroll; }
-
- virtual void wheelEvent(QWheelEvent *);
+ void scrollHoriz(int x);
-public slots:
+ /// Track select scrolling.
/**
- * Scroll horizontally to make the given position visible,
- * paging to as to get some visibility of the next screenful
- * (for playback etc)
+ * Scroll vertically to make the given contents position visible.
+ *
+ * The main test case for this is selecting tracks with the
+ * arrow keys and making sure the view scrolls to show the
+ * selected track.
*/
- void slotScrollHoriz(int hpos);
+ void scrollVert(int y);
+public slots:
+ /// Handle top and bottom StandardRuler::startMouseMove() signals.
/**
- * Scroll horizontally to make the given position somewhat
- * nearer to visible, scrolling by only "a small distance"
- * at a time
+ * See enum FollowMode for valid mask values.
*/
- void slotScrollHorizSmallSteps(int hpos);
+ void slotStartAutoScroll(int followMode);
+ /// Handle top and bottom StandardRuler::stopMouseMove() signals.
+ void slotStopAutoScroll();
+signals:
+ /// Used by TrackEditor to keep TrackButtons the right size.
+ void viewportResize();
+
+ /// Emitted on Ctrl-Scroll Wheel Up.
/**
- * Scroll vertically to make the given position somewhat
- * nearer to visible, scrolling by only "a small distance"
- * at a time
+ * TrackEditor connects this to RosegardenMainWindow::slotZoomIn().
*/
- void slotScrollVertSmallSteps(int vpos);
-
+ void zoomIn();
+ /// Emitted on Ctrl-Scroll Wheel Down.
/**
- * Scroll vertically so as to place the given position
- * somewhere near the top of the viewport.
+ * TrackEditor connects this to RosegardenMainWindow::slotZoomOut().
*/
- void slotScrollVertToTop(int vpos);
+ void zoomOut();
+
+protected:
+ /// Sets the size of the contents area and updates the viewport accordingly.
/**
- * Set the x and y scrollbars to a particular position
+ * Q3ScrollView compatible function.
*/
- void slotSetScrollPos(const QPoint &);
+ void resizeContents(int width, int height);
+ /// Width of the contents area.
+ int contentsWidth() { return m_contentsWidth; }
+ /// Height of the contents area.
+ int contentsHeight() { return m_contentsHeight; }
+ void updateContents(const QRect &);
+
+ /// See enum FollowMode.
+ void setFollowMode(int followMode) { m_followMode = followMode; }
void startAutoScroll();
- void startAutoScroll(int directionConstraint);
- void stopAutoScroll();
- void doAutoScroll();
- bool isAutoScrolling() const { return m_autoScrolling; }
+ /// Viewport resize.
+ virtual void resizeEvent(QResizeEvent *);
- void updateScrollBars();
+ virtual void wheelEvent(QWheelEvent *);
-signals:
- void bottomWidgetHeightChanged(int);
+private slots:
- void zoomIn();
- void zoomOut();
+ /// Handler for m_autoScrollTimer.
+ void slotOnAutoScrollTimer();
-protected:
-
- virtual void viewportPaintEvent( QPaintEvent* );
+private:
- virtual void contentsMousePressEvent( QMouseEvent* );
- virtual void contentsMouseReleaseEvent( QMouseEvent* );
- virtual void contentsMouseMoveEvent( QMouseEvent* );
- virtual void contentsMouseDoubleClickEvent( QMouseEvent* );
+ StandardRuler *m_bottomRuler;
+ /// Make sure the bottom ruler stays in the proper place.
+ void updateBottomRulerGeometry();
- virtual void resizeEvent(QResizeEvent*);
- virtual void setHBarGeometry(QScrollBar &hbar, int x, int y, int w, int h);
-
- virtual QScrollBar* getMainHorizontalScrollBar() { return horizontalScrollBar(); }
+ int m_contentsWidth;
+ int m_contentsHeight;
- //--------------- Data members ---------------------------------
- enum ScrollDirection { None, Top, Bottom, Left, Right };
+ /// Calls update() on a rectangle defined by x, y, w, h, translated appropriately.
+ /**
+ * Q3ScrollView compatible function.
+ */
+ void updateContents(int x, int y, int width, int height);
+
+ /// Adjust the scrollbars' max and page step.
+ void updateScrollBars();
- QWidget* m_bottomWidget;
- int m_currentBottomWidgetHeight;
+ // *** Auto Scrolling
- bool m_smoothScroll;
- int m_smoothScrollTimeInterval;
- float m_minDeltaScroll;
- QTime m_scrollTimer;
- QTime m_scrollShortcuterationTimer;
+ /// Convert a distance outside the viewport into a scroll rate.
+ double distanceToScrollRate(int distance);
+ /// Calls slotOnAutoScrollTimer().
QTimer m_autoScrollTimer;
- int m_autoScrollTime;
- int m_autoScrollShortcut;
- QPoint m_previousP;
- int m_autoScrollXMargin;
- int m_autoScrollYMargin;
- ScrollDirection m_currentScrollDirection;
- int m_scrollDirectionConstraint;
- bool m_autoScrolling;
-
- static const int DefaultSmoothScrollTimeInterval;
- static const double DefaultMinDeltaScroll;
-
- static const int AutoscrollMargin;
- static const int InitialScrollTime;
- static const int InitialScrollShortcut;
- static const int MaxScrollDelta;
- static const double ScrollShortcutValue;
-
- int m_vwidth;
- int m_vheight;
-
-private:
- void viewportMousePressEvent( QMouseEvent* );
- void viewportMouseReleaseEvent( QMouseEvent* );
- void viewportMouseDoubleClickEvent( QMouseEvent* );
- void viewportMouseMoveEvent( QMouseEvent* );
- QPoint viewportToContents(const QPoint& vp);
+ /// m_autoScrollTimer interval.
+ static const int AutoScrollTimerInterval;
+
+ /// See enum FollowMode for valid mask values.
+ int m_followMode;
+ bool m_autoScrolling;
+
};
diff --git a/src/gui/general/SelectionManager.h b/src/gui/general/SelectionManager.h
index 26c0dce..bd37e2a 100644
--- a/src/gui/general/SelectionManager.h
+++ b/src/gui/general/SelectionManager.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/Spline.cpp b/src/gui/general/Spline.cpp
index 95e197f..ba1e589 100644
--- a/src/gui/general/Spline.cpp
+++ b/src/gui/general/Spline.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/Spline.h b/src/gui/general/Spline.h
index 732b8bf..664ae8a 100644
--- a/src/gui/general/Spline.h
+++ b/src/gui/general/Spline.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/TempDirectory.cpp b/src/gui/general/TempDirectory.cpp
index 99dd9ef..52cd2ce 100644
--- a/src/gui/general/TempDirectory.cpp
+++ b/src/gui/general/TempDirectory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2006 Chris
Cannam.
diff --git a/src/gui/general/TempDirectory.h b/src/gui/general/TempDirectory.h
index a1bdc17..80af0ee 100644
--- a/src/gui/general/TempDirectory.h
+++ b/src/gui/general/TempDirectory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2006 Chris
Cannam.
diff --git a/src/gui/general/ThornStyle.cpp b/src/gui/general/ThornStyle.cpp
index d67af70..22f5503 100644
--- a/src/gui/general/ThornStyle.cpp
+++ b/src/gui/general/ThornStyle.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/general/ThornStyle.h b/src/gui/general/ThornStyle.h
index 2560733..c480b38 100644
--- a/src/gui/general/ThornStyle.h
+++ b/src/gui/general/ThornStyle.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index 63c170d..3737b1b 100644
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ChordNameRuler.h b/src/gui/rulers/ChordNameRuler.h
index 2136960..8c9b45f 100644
--- a/src/gui/rulers/ChordNameRuler.h
+++ b/src/gui/rulers/ChordNameRuler.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlChangeCommand.cpp b/src/gui/rulers/ControlChangeCommand.cpp
index b399e13..d05e5b5 100644
--- a/src/gui/rulers/ControlChangeCommand.cpp
+++ b/src/gui/rulers/ControlChangeCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlChangeCommand.h b/src/gui/rulers/ControlChangeCommand.h
index 75adbf3..a194029 100644
--- a/src/gui/rulers/ControlChangeCommand.h
+++ b/src/gui/rulers/ControlChangeCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlEraser.cpp b/src/gui/rulers/ControlEraser.cpp
index 17d916a..cdc0dbf 100644
--- a/src/gui/rulers/ControlEraser.cpp
+++ b/src/gui/rulers/ControlEraser.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlEraser.h b/src/gui/rulers/ControlEraser.h
index fd2b800..33d2bf8 100644
--- a/src/gui/rulers/ControlEraser.h
+++ b/src/gui/rulers/ControlEraser.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlItem.cpp b/src/gui/rulers/ControlItem.cpp
index 1fe983e..5d09697 100644
--- a/src/gui/rulers/ControlItem.cpp
+++ b/src/gui/rulers/ControlItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlItem.h b/src/gui/rulers/ControlItem.h
index bd8f99c..0ebe2f9 100644
--- a/src/gui/rulers/ControlItem.h
+++ b/src/gui/rulers/ControlItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlMouseEvent.h b/src/gui/rulers/ControlMouseEvent.h
index 2aebe2c..86d287a 100644
--- a/src/gui/rulers/ControlMouseEvent.h
+++ b/src/gui/rulers/ControlMouseEvent.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlMover.cpp b/src/gui/rulers/ControlMover.cpp
index dea65ee..48f72ba 100644
--- a/src/gui/rulers/ControlMover.cpp
+++ b/src/gui/rulers/ControlMover.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,9 +23,6 @@
#include "base/Selection.h"
#include "base/SnapGrid.h"
#include "base/ViewElement.h"
-//#include "commands/matrix/MatrixModifyCommand.h"
-//#include "commands/matrix/MatrixInsertionCommand.h"
-//#include "commands/notation/NormalizeRestsCommand.h"
#include "document/CommandHistory.h"
#include "ControlItem.h"
#include "EventControlItem.h"
@@ -50,12 +47,6 @@ ControlMover::ControlMover(ControlRuler *parent, QString menuName) :
m_overCursor(Qt::OpenHandCursor),
m_notOverCursor(Qt::ArrowCursor)
{
-// createAction("select", SLOT(slotSelectSelected()));
-// createAction("draw", SLOT(slotDrawSelected()));
-// createAction("erase", SLOT(slotEraseSelected()));
-// createAction("resize", SLOT(slotResizeSelected()));
-//
-// createMenu();
}
void
@@ -64,7 +55,6 @@ ControlMover::handleLeftButtonPress(const ControlMouseEvent *e)
if (m_overItem) {
m_ruler->setCursor(Qt::BlankCursor);
- //for (std::vector<ControlItem*>::const_iterator it = e->itemList.begin(); it != e->itemList.end(); it++) {
std::vector<ControlItem*>::const_iterator it = e->itemList.begin();
if ((*it)->isSelected()) {
if (e->modifiers & (Qt::ShiftModifier))
@@ -111,8 +101,10 @@ ControlMover::handleMouseMove(const ControlMouseEvent *e)
float deltaX = (e->x-m_mouseStartX);
float deltaY = (e->y-m_mouseStartY);
- float dScreenX = deltaX/m_ruler->getXScale();
- float dScreenY = deltaY/m_ruler->getYScale();
+ double xscale = m_ruler->getXScale();
+ double yscale = m_ruler->getYScale();
+ float dScreenX = deltaX / xscale;
+ float dScreenY = deltaY / yscale;
if (e->modifiers & Qt::ControlModifier) {
// If the control key is held down, restrict movement to either horizontal or vertical
@@ -143,8 +135,10 @@ ControlMover::handleMouseMove(const ControlMouseEvent *e)
item = dynamic_cast <EventControlItem*> (*it);
float x = pIt->x()+deltaX;
- x = std::max(x,m_ruler->getXMin());
- x = std::min(x,m_ruler->getXMax());
+ float xmin = m_ruler->getXMin() * xscale;
+ float xmax = (m_ruler->getXMax() - 1) * xscale;
+ x = std::max(x,xmin);
+ x = std::min(x,xmax);
float y = pIt->y()+deltaY;
y = std::max(y,0.0f);
@@ -201,37 +195,12 @@ void ControlMover::ready()
{
m_ruler->setCursor(m_notOverCursor);
m_overItem = false;
-// connect(this, SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
-// m_widget, SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
-
-// m_widget->setCanvasCursor(Qt::sizeAllCursor);
-// setBasicContextHelp();
}
void ControlMover::stow()
{
-// disconnect(this, SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
-// m_widget, SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
}
-//void PropertyAdjuster::setBasicContextHelp(bool ctrlPressed)
-//{
-// EventSelection *selection = m_scene->getSelection();
-// if (!selection || selection->getAddedEvents() < 2) {
-// if (!ctrlPressed) {
-// setContextHelp(tr("Click and drag to move a note; hold Ctrl as well to copy it"));
-// } else {
-// setContextHelp(tr("Click and drag to copy a note"));
-// }
-// } else {
-// if (!ctrlPressed) {
-// setContextHelp(tr("Click and drag to move selected notes; hold Ctrl as well to copy"));
-// } else {
-// setContextHelp(tr("Click and drag to copy selected notes"));
-// }
-// }
-//}
-
const QString ControlMover::ToolName = "mover";
}
diff --git a/src/gui/rulers/ControlMover.h b/src/gui/rulers/ControlMover.h
index 276925b..272461e 100644
--- a/src/gui/rulers/ControlMover.h
+++ b/src/gui/rulers/ControlMover.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -19,8 +19,6 @@
#define RG_CONTROLMOVER_H
#include "ControlTool.h"
-//#include <QString>
-//#include "base/Event.h"
#include "ControlItem.h"
#include <QCursor>
@@ -45,22 +43,14 @@ public:
virtual FollowMode handleMouseMove(const ControlMouseEvent *);
virtual void handleMouseRelease(const ControlMouseEvent *);
- /**
- * Respond to an event being deleted -- it may be the one the tool
- * is remembering as the current event.
- */
-// virtual void handleEventRemoved(Event *event);
-
virtual void ready();
virtual void stow();
static const QString ToolName;
signals:
-// void hoveredOverNoteChanged(int evPitch, bool haveEvent, timeT evTime);
protected slots:
-// void slotMatrixScrolled(int x, int y); //!!! do we need this? probably not
protected:
void setCursor(const ControlMouseEvent *);
diff --git a/src/gui/rulers/ControlPainter.cpp b/src/gui/rulers/ControlPainter.cpp
index 316d695..5f60696 100644
--- a/src/gui/rulers/ControlPainter.cpp
+++ b/src/gui/rulers/ControlPainter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,9 +23,6 @@
#include "base/Selection.h"
#include "base/SnapGrid.h"
#include "base/ViewElement.h"
-//#include "commands/matrix/MatrixModifyCommand.h"
-//#include "commands/matrix/MatrixInsertionCommand.h"
-//#include "commands/notation/NormalizeRestsCommand.h"
#include "document/CommandHistory.h"
#include "ControlItem.h"
#include "ControlRuler.h"
@@ -42,16 +39,18 @@ namespace Rosegarden
ControlPainter::ControlPainter(ControlRuler *parent) :
ControlMover(parent, "ControlPainter")
{
- m_overCursor = Qt::OpenHandCursor;
+ // Bug #1452 "Control ruler hand cursor is obnoxious"
+ //
+ // After attempting to puzzle through the cursor switching logic and work
+ // out better logic or a more suitable alternative than Qt::OpenHandCursor,
+ // I concluded that using the cross in all cases feels just fine in
+ // practice. I decided to just set them the same and leave the switching
+ // logic in place, because it doesn't seem worth the effort to rip it all
+ // out.
+ m_overCursor = Qt::CrossCursor;
m_notOverCursor = Qt::CrossCursor;
m_controlLineOrigin.first = -1;
m_controlLineOrigin.second = -1;
-// createAction("select", SLOT(slotSelectSelected()));
-// createAction("draw", SLOT(slotDrawSelected()));
-// createAction("erase", SLOT(slotEraseSelected()));
-// createAction("resize", SLOT(slotResizeSelected()));
-//
-// createMenu();
}
void
@@ -72,6 +71,16 @@ ControlPainter::handleLeftButtonPress(const ControlMouseEvent *e)
ControllerEventsRuler* ruler = dynamic_cast <ControllerEventsRuler*>(m_ruler);
//if (ruler) ruler->insertControllerEvent(e->x,e->y);
if (ruler) {
+ double xscale = m_ruler->getXScale();
+ float xmin = m_ruler->getXMin() * xscale;
+ float xmax = (m_ruler->getXMax() - 1) * xscale;
+ float x = e->x;
+
+ if (x < xmin) {
+ x = xmin;
+ } else if (x > xmax) {
+ x = xmax;
+ }
// If shift was pressed, draw a line of controllers between the new
// control event and the previous one
@@ -82,15 +91,15 @@ ControlPainter::handleLeftButtonPress(const ControlMouseEvent *e)
// if no origin point was set, do not draw a line
if (m_controlLineOrigin.first != -1 && m_controlLineOrigin.second != -1) {
- ruler->addControlLine(m_controlLineOrigin.first,
+ ruler->addControlLine(m_controlLineOrigin.first / xscale,
m_controlLineOrigin.second,
- e->x,
+ x / xscale,
e->y,
eraseExistingControllers);
}
} else {
- ControlItem *item = ruler->addControlItem(e->x,e->y);
+ ControlItem *item = ruler->addControlItem(x,e->y);
ControlMouseEvent *newevent = new ControlMouseEvent(e);
newevent->itemList.push_back(item);
m_overItem = true;
@@ -98,7 +107,7 @@ ControlPainter::handleLeftButtonPress(const ControlMouseEvent *e)
}
// Save these coordinates for next time
- m_controlLineOrigin.first = e->x;
+ m_controlLineOrigin.first = x;
m_controlLineOrigin.second = e->y;
}
}
diff --git a/src/gui/rulers/ControlPainter.h b/src/gui/rulers/ControlPainter.h
index 3dba690..070f5f8 100644
--- a/src/gui/rulers/ControlPainter.h
+++ b/src/gui/rulers/ControlPainter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 3559ee6..9cfedf5 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -25,8 +25,6 @@
#include "document/Command.h"
#include "commands/notation/NormalizeRestsCommand.h"
#include "gui/editors/notation/NotationStaff.h"
-//#include "base/Segment.h"
-//#include "base/Selection.h"
#include "ControlMouseEvent.h"
#include "ControlItem.h"
#include "ControlSelector.h"
@@ -34,11 +32,7 @@
#include "ControlToolBox.h"
#include "ControlChangeCommand.h"
#include "DefaultVelocityColour.h"
-//#include "ElementAdapter.h"
-//#include "gui/general/EditViewBase.h"
-//#include "gui/general/RosegardenScrollView.h"
#include "document/CommandHistory.h"
-//#include "gui/widgets/TextFloat.h"
#include <algorithm>
#include <cfloat>
@@ -48,8 +42,6 @@
#include <QPolygonF>
#include <QPolygon>
#include <QMenu>
-//#include <QScrollBar>
-//#include <QScrollArea>
#include <QString>
#include <QWidget>
#include <QMouseEvent>
@@ -66,24 +58,22 @@ const int ControlRuler::MinItemHeight = 5;
const int ControlRuler::MaxItemHeight = 64 + 5;
const int ControlRuler::ItemHeightRange = 64;
- ControlRuler::ControlRuler(ViewSegment */*viewsegment*/,
+ ControlRuler::ControlRuler(ViewSegment * /*viewsegment*/,
RulerScale* rulerScale,
- QWidget* parent
- ) :
+ QWidget* parent) :
QWidget(parent),
m_rulerScale(rulerScale),
m_eventSelection(0),
m_viewSegment(0),
m_notationStaff(0),
m_segment(0),
-// m_assignedEventSelection(0),
m_firstVisibleItem(m_controlItemMap.end()),
m_lastVisibleItem(m_controlItemMap.end()),
m_nextItemLeft(m_controlItemMap.end()),
m_currentIndex(0),
m_currentTool(0),
- m_xScale(0),
- m_yScale(0),
+ m_xScale(1.0),
+ m_yScale(1.0),
m_maxItemValue(127),
m_minItemValue(0),
m_viewSegmentOffset(0),
@@ -94,13 +84,10 @@ const int ControlRuler::ItemHeightRange = 64;
m_selectionRect(0),
m_menu(0)
{
-// setViewSegment(viewsegment);
setFixedHeight(sizeHint().height());
setMouseTracking(true);
-///TODO connect(this, SIGNAL(stateChange(const QString&, bool)),
- // m_parentEditView, SLOT(slotStateChanged(const QString&, bool)));
m_toolBox = new ControlToolBox(this);
emit stateChange("have_controller_item_selected", false);
@@ -108,12 +95,6 @@ const int ControlRuler::ItemHeightRange = 64;
ControlRuler::~ControlRuler()
{
-// if(m_assignedEventSelection)
-// m_assignedEventSelection->removeObserver(this);
-//
-// if (m_viewSegment) {
-// m_viewSegment->removeObserver(this);
-// }
}
void ControlRuler::setSegment(Segment *segment)
@@ -151,8 +132,6 @@ ControlItemMap::iterator ControlRuler::findControlItem(const Event *event)
ControlItemMap::iterator it;
std::pair <ControlItemMap::iterator,ControlItemMap::iterator> ret;
-// ret = m_controlItemMap.equal_range(xstart);
-// for (it = ret.first; it != ret.second; it++) {
for (it = m_controlItemMap.begin(); it != m_controlItemMap.end(); ++it) {
if (it->second->getEvent() == event) break;
}
@@ -185,8 +164,6 @@ void ControlRuler::addControlItem(ControlItem* item)
addCheckVisibleLimits(it);
if (it->second->isSelected()) m_selectedItems.push_back(it->second);
-// m_controlItemEnd.insert(std::pair<double,ControlItemList::iterator>
-// (item->xEnd(),--m_controlItemList.end()));
}
void ControlRuler::addCheckVisibleLimits(ControlItemMap::iterator it)
@@ -227,11 +204,9 @@ void ControlRuler::addCheckVisibleLimits(ControlItemMap::iterator it)
void ControlRuler::removeControlItem(ControlItem* item)
{
-// // Remove control item by item pointer
-// // No search by Value provided for std::multimap so find items with the requested item's
-// // xstart position and sweep these for the correct entry
-// double xstart = item->xStart();
-//
+ // Remove control item by item pointer
+ // No search by Value provided for std::multimap so find items with the requested item's
+ // xstart position and sweep these for the correct entry
ControlItemMap::iterator it = findControlItem(item);
if (it != m_controlItemMap.end()) removeControlItem(it);
@@ -346,13 +321,11 @@ int ControlRuler::visiblePosition(ControlItem* item)
float ControlRuler::getXMax()
{
return (m_rulerScale->getXForTime(m_segment->getEndTime()));
-// return (std::min(m_rulerScale->getXForTime(m_segment->getEndTime()), m_pannedRect.right()));
}
float ControlRuler::getXMin()
{
return (m_rulerScale->getXForTime(m_segment->getStartTime()));
-// return (std::max(m_rulerScale->getXForTime(m_segment->getStartTime()), m_pannedRect.left()));
}
void ControlRuler::updateSegment()
@@ -367,7 +340,6 @@ void ControlRuler::updateSegment()
// Either run through the ruler's EventSelection, updating from each item
// or, if there isn't one, go through m_selectedItems
timeT start,end;
- // bool segmentModified = false;
QString commandLabel = "Adjust control/property";
@@ -404,7 +376,6 @@ void ControlRuler::updateSegment()
commandLabel = "Add control";
macro->setName(commandLabel);
- // segmentModified = true;
} else {
// Check for movement in time here and delete events if necessary
if (start != m_eventSelection->getStartTime() || end != m_eventSelection->getEndTime()) {
@@ -415,7 +386,6 @@ void ControlRuler::updateSegment()
start = std::min(start,m_eventSelection->getStartTime());
end = std::max(end,m_eventSelection->getEndTime());
- // segmentModified = true;
}
}
@@ -473,7 +443,7 @@ void ControlRuler::notationLayoutUpdated(timeT startTime, timeT /*endTime*/)
update();
}
-void ControlRuler::paintEvent(QPaintEvent */*event*/)
+void ControlRuler::paintEvent(QPaintEvent * /*event*/)
{
RG_DEBUG << "ControlRuler::paintEvent: width()=" << width() << " height()=" << height();
QPainter painter(this);
@@ -493,7 +463,7 @@ void ControlRuler::paintEvent(QPaintEvent */*event*/)
double xstart = m_rulerScale->getXForTime(m_segment->getStartTime());
double xend = m_rulerScale->getXForTime(m_segment->getEndTime());
- xstart = mapXToWidget(xstart);
+ xstart = mapXToWidget(xstart*m_xScale);
xend = mapXToWidget(xend*m_xScale);
RG_DEBUG << "ControlRuler::paintEvent: xstart=" << xstart;
@@ -534,8 +504,6 @@ QRect ControlRuler::mapItemToWidget(QRectF *rect)
QPolygon ControlRuler::mapItemToWidget(QPolygonF *poly)
{
-// double xscale = width() / m_pannedRect.width();
-// double yscale = height();
QPolygon newpoly;
QPoint newpoint;
@@ -550,8 +518,6 @@ QPolygon ControlRuler::mapItemToWidget(QPolygonF *poly)
QPointF ControlRuler::mapWidgetToItem(QPoint *point)
{
-// double xscale = (double) m_pannedRect.width() / (double) width();
-// double yscale = 1.0f / (double) height();
QPointF newpoint;
newpoint.setX(m_xScale*(point->x()) + m_pannedRect.left() - m_xOffset);
@@ -561,38 +527,38 @@ QPointF ControlRuler::mapWidgetToItem(QPoint *point)
void ControlRuler::slotSetPannedRect(QRectF pr)
{
- m_pannedRect = pr;
- m_xScale = (double) m_pannedRect.width() / (double) width();
- m_yScale = 1.0f / (double) height();
+ m_pannedRect = pr;
+ m_xScale = (double) m_pannedRect.width() / (double) width();
+ m_yScale = 1.0f / (double) height();
- // Create the visible items list
- ///TODO Improve efficiency using xstart and xstop ordered lists of control items
- m_visibleItems.clear();
- bool anyVisibleYet = false;
+ // Create the visible items list
+ ///TODO Improve efficiency using xstart and xstop ordered lists of control items
+ m_visibleItems.clear();
+ bool anyVisibleYet = false;
- m_nextItemLeft = m_controlItemMap.end();
+ m_nextItemLeft = m_controlItemMap.end();
m_firstVisibleItem = m_controlItemMap.end();
m_lastVisibleItem = m_controlItemMap.end();
ControlItemMap::iterator it;
- for (it = m_controlItemMap.begin();it != m_controlItemMap.end(); ++it) {
- int visPos = visiblePosition(it->second);
-
- if (visPos == -1) m_nextItemLeft = it;
-
- if (visPos == 0) {
- if (!anyVisibleYet) {
- m_firstVisibleItem = it;
- anyVisibleYet = true;
- }
-
- m_visibleItems.push_back(it->second);
- m_lastVisibleItem = it;
- }
-
- if (visPos == 1) break;
- }
-
+ for (it = m_controlItemMap.begin();it != m_controlItemMap.end(); ++it) {
+ int visPos = visiblePosition(it->second);
+
+ if (visPos == -1) m_nextItemLeft = it;
+
+ if (visPos == 0) {
+ if (!anyVisibleYet) {
+ m_firstVisibleItem = it;
+ anyVisibleYet = true;
+ }
+
+ m_visibleItems.push_back(it->second);
+ m_lastVisibleItem = it;
+ }
+
+ if (visPos == 1) break;
+ }
+
RG_DEBUG << "ControlRuler::slotSetPannedRect - visible items: " << m_visibleItems.size();
}
@@ -661,7 +627,7 @@ void ControlRuler::mouseMoveEvent(QMouseEvent* e)
}
void
-ControlRuler::wheelEvent(QWheelEvent */*e*/)
+ControlRuler::wheelEvent(QWheelEvent * /*e*/)
{
// not sure what to do yet
@@ -687,9 +653,8 @@ void ControlRuler::createMenu()
QMainWindow* parentMainWindow = dynamic_cast<QMainWindow*>(topLevelWidget());
- if (parentMainWindow ) { // parentMainWindow->factory()) {
-// m_menu = static_cast<QMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow));
- m_menu = parentMainWindow->findChild<QMenu*>(m_menuName);
+ if (parentMainWindow ) { // parentMainWindow->factory()) {
+ m_menu = parentMainWindow->findChild<QMenu*>(m_menuName);
if (!m_menu) {
RG_DEBUG << "ControlRuler::createMenu() failed\n";
@@ -775,6 +740,8 @@ float ControlRuler::valueToY(long val)
long ControlRuler::yToValue(float y)
{
+ // NOTE: while debugging #1451 I had debug output here and it confirmed that
+ // value is returning very reasonable numbers, which get mangled elsewhere
long value = (long)(y*(getMaxItemValue()-getMinItemValue()))+getMinItemValue();
return value;
}
diff --git a/src/gui/rulers/ControlRuler.h b/src/gui/rulers/ControlRuler.h
index b7a1c4e..382d857 100644
--- a/src/gui/rulers/ControlRuler.h
+++ b/src/gui/rulers/ControlRuler.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlRulerEventEraseCommand.cpp b/src/gui/rulers/ControlRulerEventEraseCommand.cpp
index 1794da1..2e00828 100644
--- a/src/gui/rulers/ControlRulerEventEraseCommand.cpp
+++ b/src/gui/rulers/ControlRulerEventEraseCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlRulerEventEraseCommand.h b/src/gui/rulers/ControlRulerEventEraseCommand.h
index db8bbd6..c5e8a11 100644
--- a/src/gui/rulers/ControlRulerEventEraseCommand.h
+++ b/src/gui/rulers/ControlRulerEventEraseCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlRulerEventInsertCommand.cpp b/src/gui/rulers/ControlRulerEventInsertCommand.cpp
index 638b1a2..73954ad 100644
--- a/src/gui/rulers/ControlRulerEventInsertCommand.cpp
+++ b/src/gui/rulers/ControlRulerEventInsertCommand.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlRulerEventInsertCommand.h b/src/gui/rulers/ControlRulerEventInsertCommand.h
index cdab696..e12c4be 100644
--- a/src/gui/rulers/ControlRulerEventInsertCommand.h
+++ b/src/gui/rulers/ControlRulerEventInsertCommand.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlRulerTabBar.cpp b/src/gui/rulers/ControlRulerTabBar.cpp
index 63ac678..cb8d424 100644
--- a/src/gui/rulers/ControlRulerTabBar.cpp
+++ b/src/gui/rulers/ControlRulerTabBar.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlRulerTabBar.h b/src/gui/rulers/ControlRulerTabBar.h
index 0e4a895..b837c5e 100644
--- a/src/gui/rulers/ControlRulerTabBar.h
+++ b/src/gui/rulers/ControlRulerTabBar.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlRulerWidget.cpp b/src/gui/rulers/ControlRulerWidget.cpp
index 19bcf03..2643bd3 100644
--- a/src/gui/rulers/ControlRulerWidget.cpp
+++ b/src/gui/rulers/ControlRulerWidget.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -306,6 +306,7 @@ ControlRulerWidget::slotAddControlRuler(const ControlParameter &controlParameter
this, SLOT(slotChildRulerSelectionChanged(EventSelection *)));
addRuler(controlruler,QString::fromStdString(controlParameter.getName()));
+ controlruler->setViewSegment(m_viewSegment);
}
void
@@ -314,6 +315,10 @@ ControlRulerWidget::slotAddPropertyRuler(const PropertyName &propertyName)
if (!m_viewSegment) return;
PropertyControlRuler *controlruler = new PropertyControlRuler(propertyName, m_viewSegment, m_scale, this);
+
+ connect(controlruler, SIGNAL(rulerSelectionChanged(EventSelection *)),
+ this, SLOT(slotChildRulerSelectionChanged(EventSelection *)));
+
controlruler->setXOffset(m_gutter);
controlruler->updateSelection(&m_selectedElements);
@@ -324,6 +329,8 @@ ControlRulerWidget::slotAddPropertyRuler(const PropertyName &propertyName)
QString name = QString::fromStdString(propertyName.getName());
if (name == "velocity") name = tr("Velocity");
addRuler(controlruler, name);
+ // Update selection drawing in matrix view.
+ emit childRulerSelectionChanged(0);
}
void
diff --git a/src/gui/rulers/ControlRulerWidget.h b/src/gui/rulers/ControlRulerWidget.h
index d2d575c..4e26e76 100644
--- a/src/gui/rulers/ControlRulerWidget.h
+++ b/src/gui/rulers/ControlRulerWidget.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlSelector.cpp b/src/gui/rulers/ControlSelector.cpp
index 463f6cc..04755b4 100644
--- a/src/gui/rulers/ControlSelector.cpp
+++ b/src/gui/rulers/ControlSelector.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlSelector.h b/src/gui/rulers/ControlSelector.h
index 658ed18..ed3c3ac 100644
--- a/src/gui/rulers/ControlSelector.h
+++ b/src/gui/rulers/ControlSelector.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlTool.cpp b/src/gui/rulers/ControlTool.cpp
index ee21828..0bd5e06 100644
--- a/src/gui/rulers/ControlTool.cpp
+++ b/src/gui/rulers/ControlTool.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlTool.h b/src/gui/rulers/ControlTool.h
index 9649b3e..ebdecc7 100644
--- a/src/gui/rulers/ControlTool.h
+++ b/src/gui/rulers/ControlTool.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlToolBox.cpp b/src/gui/rulers/ControlToolBox.cpp
index 77f3b09..f59c9df 100644
--- a/src/gui/rulers/ControlToolBox.cpp
+++ b/src/gui/rulers/ControlToolBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControlToolBox.h b/src/gui/rulers/ControlToolBox.h
index 954ae6d..2fd3fef 100644
--- a/src/gui/rulers/ControlToolBox.h
+++ b/src/gui/rulers/ControlToolBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControllerEventAdapter.cpp b/src/gui/rulers/ControllerEventAdapter.cpp
index 898c11f..cfc9ed6 100644
--- a/src/gui/rulers/ControllerEventAdapter.cpp
+++ b/src/gui/rulers/ControllerEventAdapter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControllerEventAdapter.h b/src/gui/rulers/ControllerEventAdapter.h
index ef83bf2..9eabe80 100644
--- a/src/gui/rulers/ControllerEventAdapter.h
+++ b/src/gui/rulers/ControllerEventAdapter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index 906ce84..0537ba7 100644
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -79,12 +79,7 @@ ControllerEventsRuler::ControllerEventsRuler(ViewSegment *segment,
m_controller = 0;
}
- // This is necessary to run the overloaded method, the base method has already run
- setViewSegment(segment);
-
setMenuName("controller_events_ruler_menu");
-// drawBackground(); Now in paintEvent
-// init();
RG_DEBUG << "ControllerEventsRuler::ControllerEventsRuler - " << controller->getName();
RG_DEBUG << "Segment from " << segment->getSegment().getStartTime() << " to " << segment->getSegment().getEndTime();
@@ -180,8 +175,6 @@ void ControllerEventsRuler::paintEvent(QPaintEvent *event)
QBrush brush(GUIPalette::getColour(GUIPalette::ControlItem),Qt::SolidPattern);
-// QPen highlightPen(GUIPalette::getColour(GUIPalette::SelectedElement),
-// 2, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
QPen pen(GUIPalette::getColour(GUIPalette::MatrixElementBorder),
0.5, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
@@ -189,12 +182,10 @@ void ControllerEventsRuler::paintEvent(QPaintEvent *event)
painter.setPen(pen);
QString str;
-// str = QString::fromStdString(m_controller->getName());
-// painter.drawText(10,20,str.toUpper());
ControlItemMap::iterator mapIt;
float lastX, lastY;
- lastX = m_rulerScale->getXForTime(m_segment->getStartTime());
+ lastX = m_rulerScale->getXForTime(m_segment->getStartTime())*m_xScale;
if (m_nextItemLeft != m_controlItemMap.end()) {
EventControlItem *item = static_cast<EventControlItem*> (m_nextItemLeft->second);
@@ -224,7 +215,7 @@ void ControllerEventsRuler::paintEvent(QPaintEvent *event)
mapYToWidget(lastY));
// Use a fast vector list to record selected items that are currently visible so that they
- // can be drawn last - can't use m_selectedItems as this covers all selected, visible or not
+ // can be drawn last - can't use m_selectedItems as this covers all selected, visible or not
std::vector<ControlItem*> selectedvector;
for (ControlItemList::iterator it = m_visibleItems.begin(); it != m_visibleItems.end(); ++it) {
@@ -235,7 +226,6 @@ void ControllerEventsRuler::paintEvent(QPaintEvent *event)
}
}
-// painter.setBrush(brush);
pen.setColor(GUIPalette::getColour(GUIPalette::SelectedElement));
pen.setWidthF(2.0);
painter.setPen(pen);
@@ -250,7 +240,13 @@ void ControllerEventsRuler::paintEvent(QPaintEvent *event)
// For selected items, draw the value in text alongside the marker
// By preference, this should sit on top of the new line that represents this value change
- str = QString::number(yToValue((*it)->y())-m_controller->getDefault());
+
+ // Any controller that has a default of 64 is presumed to be or behave
+ // like pan, and display a working range of -64 to 64, centered on 0,
+ // rather than the usual 0 to 127. Note, the == 64 is hard coded
+ // elsewhere, so one more won't hurt. Fixes #1451.
+ int offsetFactor = (m_controller->getDefault() == 64 ? 64 : 0);
+ str = QString::number(yToValue((*it)->y()) - offsetFactor);
int x = mapXToWidget((*it)->xStart())+0.4*fontOffset;
int y = std::max(mapYToWidget((*it)->y())-0.2f*fontHeight,float(fontHeight));
@@ -348,10 +344,6 @@ ControlItem* ControllerEventsRuler::addControlItem(float x, float y)
EventControlItem *item = new EventControlItem(this, new ControllerEventAdapter(0), QPolygonF());
item->reconfigure(x,y);
item->setSelected(true);
-// m_selectedItems.push_back(item);
-// if (isVisible(item)) {
-// m_visibleItems.push_back(item);
-// }
ControlRuler::addControlItem(item);
return item;
@@ -460,7 +452,11 @@ ControllerEventsRuler::addControlLine(float x1, float y1, float x2, float y2, bo
*ei,
collapseRests));
}
+ }
+ if (macro->haveCommands()) {
+ CommandHistory::getInstance()->addCommand(macro);
+ macro = new MacroCommand(tr("Insert Line of Controllers"));
}
for (float i = originTime; i <= destinationTime; i += step) {
@@ -548,7 +544,6 @@ void ControllerEventsRuler::slotSetTool(const QString &matrixtoolname)
if (m_currentTool) m_currentTool->stow();
m_currentTool = tool;
m_currentTool->ready();
-// emit toolChanged(name);
}
Event *ControllerEventsRuler::insertEvent(float x, float y)
@@ -580,8 +575,6 @@ Event *ControllerEventsRuler::insertEvent(float x, float y)
bool ok = false;
QIntValidator intValidator(0, 128, this);
-// QString res = KLineEditDlg::getText(tr("Controller Event Number"), "0",
-// &ok, this, &intValidator);
QString res = InputDialog::getText(this, "", tr("Controller Event Number"),
LineEdit::Normal, "0", &ok);
@@ -589,6 +582,10 @@ Event *ControllerEventsRuler::insertEvent(float x, float y)
number = res.toULong();
}
+ //NOTE: while debugging #1451 I determined that the pan controller sets
+ // values 0 to 127 like anything else, and the difference in interpretation
+ // (improperly applied to volume and expression) is happening at a more
+ // superficial level; all of this code here is working logically
if (m_controller->getType() == Rosegarden::Controller::EventType)
{
controllerEvent->set<Rosegarden::Int>(Rosegarden::Controller::VALUE, initialValue);
@@ -608,12 +605,6 @@ Event *ControllerEventsRuler::insertEvent(float x, float y)
m_moddingSegment = false;
return controllerEvent;
-// ControlRulerEventInsertCommand* command =
-// new ControlRulerEventInsertCommand(m_controller->getType(),
-// insertTime, number,
-// initialValue, *m_segment);
-//
-// CommandHistory::getInstance()->addCommand(command);
}
void ControllerEventsRuler::eraseEvent(Event *event)
diff --git a/src/gui/rulers/ControllerEventsRuler.h b/src/gui/rulers/ControllerEventsRuler.h
index df6df13..91eb71c 100644
--- a/src/gui/rulers/ControllerEventsRuler.h
+++ b/src/gui/rulers/ControllerEventsRuler.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -33,7 +33,6 @@ namespace Rosegarden
class Segment;
class RulerScale;
class Event;
-//class EditViewBase;
class ControlParameter;
class ControlItem;
@@ -48,7 +47,7 @@ public:
RulerScale*,
QWidget* parent=0,
const ControlParameter *controller = 0,
- const char* name=0 ); //, WFlags f=0);
+ const char* name=0 );
virtual ~ControllerEventsRuler();
@@ -64,11 +63,8 @@ public:
virtual void setSegment(Segment *);
// SegmentObserver interface
-// virtual void elementAdded(const ViewSegment *, ViewElement*);
virtual void eventAdded(const Segment *, Event *);
-// virtual void elementRemoved(const ViewSegment *, ViewElement*);
virtual void eventRemoved(const Segment *, Event *);
-// virtual void viewSegmentDeleted(const ViewSegment *);
virtual void segmentDeleted(const Segment *);
virtual ControlItem* addControlItem(float, float);
@@ -96,8 +92,6 @@ public:
virtual Event * insertEvent(float,float);
virtual void eraseEvent(Event *event);
virtual void eraseControllerEvent();
-// virtual void clearControllerEvents();
-// virtual void startControlLine();
ControlParameter* getControlParameter() { return m_controller; }
diff --git a/src/gui/rulers/DefaultVelocityColour.cpp b/src/gui/rulers/DefaultVelocityColour.cpp
index e140409..bca2bed 100644
--- a/src/gui/rulers/DefaultVelocityColour.cpp
+++ b/src/gui/rulers/DefaultVelocityColour.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/DefaultVelocityColour.h b/src/gui/rulers/DefaultVelocityColour.h
index ecca296..af62366 100644
--- a/src/gui/rulers/DefaultVelocityColour.h
+++ b/src/gui/rulers/DefaultVelocityColour.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ElementAdapter.h b/src/gui/rulers/ElementAdapter.h
index a8a81a7..846faeb 100644
--- a/src/gui/rulers/ElementAdapter.h
+++ b/src/gui/rulers/ElementAdapter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/EventControlItem.cpp b/src/gui/rulers/EventControlItem.cpp
index 5857f8b..1279aa7 100644
--- a/src/gui/rulers/EventControlItem.cpp
+++ b/src/gui/rulers/EventControlItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -57,8 +57,9 @@ void EventControlItem::updateFromEvent()
long value = 0;
m_eventAdapter->getValue(value);
- reconfigure(m_controlRuler->getRulerScale()->getXForTime(m_eventAdapter->getTime()),
- m_controlRuler->valueToY(value));
+ double xscale = m_controlRuler->getXScale();
+ reconfigure(m_controlRuler->getRulerScale()->getXForTime(m_eventAdapter->getTime())*xscale,
+ m_controlRuler->valueToY(value));
}
void EventControlItem::setY(float y)
diff --git a/src/gui/rulers/EventControlItem.h b/src/gui/rulers/EventControlItem.h
index 73ea476..1d5c18e 100644
--- a/src/gui/rulers/EventControlItem.h
+++ b/src/gui/rulers/EventControlItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index 343e65c..375342b 100644
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/LoopRuler.h b/src/gui/rulers/LoopRuler.h
index 86919f1..7a5e632 100644
--- a/src/gui/rulers/LoopRuler.h
+++ b/src/gui/rulers/LoopRuler.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index 193a078..5dd0239 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h
index 31ce8d7..bbf90b1 100644
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PercussionPitchRuler.cpp b/src/gui/rulers/PercussionPitchRuler.cpp
index 8f85d3d..8318bfa 100644
--- a/src/gui/rulers/PercussionPitchRuler.cpp
+++ b/src/gui/rulers/PercussionPitchRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PercussionPitchRuler.h b/src/gui/rulers/PercussionPitchRuler.h
index fb1bc18..25375dc 100644
--- a/src/gui/rulers/PercussionPitchRuler.h
+++ b/src/gui/rulers/PercussionPitchRuler.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PitchRuler.cpp b/src/gui/rulers/PitchRuler.cpp
index bb5d9ad..c87aa43 100644
--- a/src/gui/rulers/PitchRuler.cpp
+++ b/src/gui/rulers/PitchRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PitchRuler.h b/src/gui/rulers/PitchRuler.h
index 3e6afd0..bce8d77 100644
--- a/src/gui/rulers/PitchRuler.h
+++ b/src/gui/rulers/PitchRuler.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PropertyAdjuster.cpp b/src/gui/rulers/PropertyAdjuster.cpp
index 086239c..cdaf73b 100644
--- a/src/gui/rulers/PropertyAdjuster.cpp
+++ b/src/gui/rulers/PropertyAdjuster.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -51,17 +51,11 @@ void
PropertyAdjuster::handleLeftButtonPress(const ControlMouseEvent *e)
{
if (m_canSelect) {
- if (e->itemList.size()) {
- ControlItem *item = *(e->itemList.begin());
- if (item->isSelected()) {
-
- } else {
- if (!(e->modifiers & (Qt::ShiftModifier | Qt::ControlModifier))) {
- m_ruler->clearSelectedItems();
- }
-
- m_ruler->addToSelection(item);
- }
+ unsigned int items = e->itemList.size();
+ if (m_ruler->getSelectedItems()->empty() && items > 0) {
+ // If there aren't selected items, we select the last of
+ // the mouse click items because it is over the others.
+ m_ruler->addToSelection(e->itemList[items-1]);
}
}
diff --git a/src/gui/rulers/PropertyAdjuster.h b/src/gui/rulers/PropertyAdjuster.h
index cad3a32..e6b9e01 100644
--- a/src/gui/rulers/PropertyAdjuster.h
+++ b/src/gui/rulers/PropertyAdjuster.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PropertyBox.cpp b/src/gui/rulers/PropertyBox.cpp
index 664896c..840a379 100644
--- a/src/gui/rulers/PropertyBox.cpp
+++ b/src/gui/rulers/PropertyBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PropertyBox.h b/src/gui/rulers/PropertyBox.h
index bd3305d..464a3df 100644
--- a/src/gui/rulers/PropertyBox.h
+++ b/src/gui/rulers/PropertyBox.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PropertyControlItem.cpp b/src/gui/rulers/PropertyControlItem.cpp
index cddd759..b081675 100644
--- a/src/gui/rulers/PropertyControlItem.cpp
+++ b/src/gui/rulers/PropertyControlItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PropertyControlItem.h b/src/gui/rulers/PropertyControlItem.h
index eec576c..f6f87b0 100644
--- a/src/gui/rulers/PropertyControlItem.h
+++ b/src/gui/rulers/PropertyControlItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PropertyControlRuler.cpp b/src/gui/rulers/PropertyControlRuler.cpp
index 20cee88..e43db0f 100644
--- a/src/gui/rulers/PropertyControlRuler.cpp
+++ b/src/gui/rulers/PropertyControlRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/PropertyControlRuler.h b/src/gui/rulers/PropertyControlRuler.h
index d547987..58e97b3 100644
--- a/src/gui/rulers/PropertyControlRuler.h
+++ b/src/gui/rulers/PropertyControlRuler.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/RawNoteRuler.cpp b/src/gui/rulers/RawNoteRuler.cpp
index ee4a860..2c6636e 100644
--- a/src/gui/rulers/RawNoteRuler.cpp
+++ b/src/gui/rulers/RawNoteRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/RawNoteRuler.h b/src/gui/rulers/RawNoteRuler.h
index 42a2cdc..964376b 100644
--- a/src/gui/rulers/RawNoteRuler.h
+++ b/src/gui/rulers/RawNoteRuler.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/StandardRuler.cpp b/src/gui/rulers/StandardRuler.cpp
index 58f34bf..0661ee5 100644
--- a/src/gui/rulers/StandardRuler.cpp
+++ b/src/gui/rulers/StandardRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/StandardRuler.h b/src/gui/rulers/StandardRuler.h
index bdaa9d3..5ca66e1 100644
--- a/src/gui/rulers/StandardRuler.h
+++ b/src/gui/rulers/StandardRuler.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/TempoColour.cpp b/src/gui/rulers/TempoColour.cpp
index 4477ad9..4e5ce9c 100644
--- a/src/gui/rulers/TempoColour.cpp
+++ b/src/gui/rulers/TempoColour.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/TempoColour.h b/src/gui/rulers/TempoColour.h
index c270a7e..3f7e05b 100644
--- a/src/gui/rulers/TempoColour.h
+++ b/src/gui/rulers/TempoColour.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index f6880c9..1e4a631 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -419,7 +419,7 @@ TempoRuler::mouseMoveEvent(QMouseEvent *e)
int bar, beat, fraction, remainder;
m_composition->getMusicalTimeForAbsoluteTime(tc.first, bar, beat,
fraction, remainder);
- RG_DEBUG << "Tempo change: tempo " << m_composition->getTempoQpm(tc.second) << " at " << bar << ":" << beat << ":" << fraction << ":" << remainder << endl;
+ //RG_DEBUG << "Tempo change: tempo " << m_composition->getTempoQpm(tc.second) << " at " << bar << ":" << beat << ":" << fraction << ":" << remainder << endl;
m_illuminate = tcn;
m_illuminatePoint = false;
diff --git a/src/gui/rulers/TempoRuler.h b/src/gui/rulers/TempoRuler.h
index af69366..3a7654e 100644
--- a/src/gui/rulers/TempoRuler.h
+++ b/src/gui/rulers/TempoRuler.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/TextRuler.cpp b/src/gui/rulers/TextRuler.cpp
index e3e274c..9239ea8 100644
--- a/src/gui/rulers/TextRuler.cpp
+++ b/src/gui/rulers/TextRuler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/TextRuler.h b/src/gui/rulers/TextRuler.h
index e6ba861..d1e822f 100644
--- a/src/gui/rulers/TextRuler.h
+++ b/src/gui/rulers/TextRuler.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/VelocityColour.cpp b/src/gui/rulers/VelocityColour.cpp
index 80b7aa4..9abd874 100644
--- a/src/gui/rulers/VelocityColour.cpp
+++ b/src/gui/rulers/VelocityColour.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/VelocityColour.h b/src/gui/rulers/VelocityColour.h
index ca8078d..dfe813c 100644
--- a/src/gui/rulers/VelocityColour.h
+++ b/src/gui/rulers/VelocityColour.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ViewElementAdapter.cpp b/src/gui/rulers/ViewElementAdapter.cpp
index 7cd6e07..db063bb 100644
--- a/src/gui/rulers/ViewElementAdapter.cpp
+++ b/src/gui/rulers/ViewElementAdapter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/rulers/ViewElementAdapter.h b/src/gui/rulers/ViewElementAdapter.h
index 8c214bc..84eb961 100644
--- a/src/gui/rulers/ViewElementAdapter.h
+++ b/src/gui/rulers/ViewElementAdapter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/AudioSegmentMapper.cpp b/src/gui/seqmanager/AudioSegmentMapper.cpp
index 9a52d23..26352f7 100644
--- a/src/gui/seqmanager/AudioSegmentMapper.cpp
+++ b/src/gui/seqmanager/AudioSegmentMapper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/AudioSegmentMapper.h b/src/gui/seqmanager/AudioSegmentMapper.h
index c63f7e2..b180f76 100644
--- a/src/gui/seqmanager/AudioSegmentMapper.h
+++ b/src/gui/seqmanager/AudioSegmentMapper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/ChannelManager.cpp b/src/gui/seqmanager/ChannelManager.cpp
index 923bdb3..1a53a6e 100644
--- a/src/gui/seqmanager/ChannelManager.cpp
+++ b/src/gui/seqmanager/ChannelManager.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,10 +23,13 @@
#include "base/Instrument.h"
#include "base/MidiTypes.h"
#include "misc/Debug.h"
+#include "misc/ConfigGroups.h"
#include "sound/MappedEvent.h"
#include "sound/MappedInserterBase.h"
#include "sound/Midi.h"
+#include <QSettings>
+
namespace Rosegarden
{
@@ -99,17 +102,14 @@ setControllers(ChannelId channel, Instrument *instrument,
RealTime reftime, RealTime insertTime,
Callbacks *callbacks, int trackId)
{
-#if 0
- // This was the old logic, but it's not clear that it is still
- // desirable.
+ // This is still desirable for some users.
QSettings settings;
settings.beginGroup(SequencerOptionsConfigGroup);
- bool sendControllers = qStrToBool(settings.value("alwayssendcontrollers", "false")) ;
+ bool sendControllers = settings.value("alwayssendcontrollers", "false").toBool();
settings.endGroup();
if (instrument->hasFixedChannel() &&
!sendControllers) { return; }
-#endif
// In case some controllers are on that we don't know about, turn
// all controllers off.
@@ -348,7 +348,10 @@ setChannelIdDirectly(void)
if (m_instrument->getType() == Instrument::Midi) {
// !!! Stopgap measure. If we ever share allocators between
// MIDI devices, this will have to become smarter.
- if (m_instrument->isPercussion()) { channel = 9; }
+ if (m_instrument->isPercussion()) {
+ channel = (m_instrument->hasFixedChannel() ?
+ m_instrument->getNaturalChannel() : 9);
+ }
}
m_channel.setChannelId(channel);
}
diff --git a/src/gui/seqmanager/ChannelManager.h b/src/gui/seqmanager/ChannelManager.h
index 7cd365f..c16943a 100644
--- a/src/gui/seqmanager/ChannelManager.h
+++ b/src/gui/seqmanager/ChannelManager.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/CompositionMapper.cpp b/src/gui/seqmanager/CompositionMapper.cpp
index fe4e118..829c7a7 100644
--- a/src/gui/seqmanager/CompositionMapper.cpp
+++ b/src/gui/seqmanager/CompositionMapper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/CompositionMapper.h b/src/gui/seqmanager/CompositionMapper.h
index 0a7a4ce..f49398b 100644
--- a/src/gui/seqmanager/CompositionMapper.h
+++ b/src/gui/seqmanager/CompositionMapper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/InternalSegmentMapper.cpp b/src/gui/seqmanager/InternalSegmentMapper.cpp
index 968fbde..827b4af 100644
--- a/src/gui/seqmanager/InternalSegmentMapper.cpp
+++ b/src/gui/seqmanager/InternalSegmentMapper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -259,8 +259,10 @@ void InternalSegmentMapper::fillBuffer()
e.setPitch(e.getPitch() +
m_segment->getTranspose());
}
- enqueueNoteoff(playTime + playDuration,
- e.getPitch());
+ if (e.getType() != MappedEvent::MidiNoteOneShot) {
+ enqueueNoteoff(playTime + playDuration,
+ e.getPitch());
+ }
}
mapAnEvent(&e);
} else {}
@@ -338,18 +340,14 @@ void
InternalSegmentMapper::
enqueueNoteoff(timeT time, int pitch)
{
- typedef NoteoffContainer::iterator iterator;
- // Remove any existing pending noteoff of that pitch. Since
- // remove_if doesn't work on std::map, we use this written-out
- // equivalent.
- iterator iter = m_noteOffs.begin();
- while(iter != m_noteOffs.end()) {
- if (iter->second == pitch) {
- iterator tmp = iter;
- ++iter;
- m_noteOffs.erase(tmp);
- } else {
- ++iter;
+ for (NoteoffContainer::iterator i = m_noteOffs.begin();
+ i != m_noteOffs.end(); ++i) {
+ if (i->second == pitch) {
+#ifdef DEBUG_INTERNAL_SEGMENT_MAPPER
+ SEQMAN_DEBUG << "duplicated NOTE OFF pitch: " << pitch
+ << " at " << time << std::endl;
+#endif
+ break;
}
}
diff --git a/src/gui/seqmanager/InternalSegmentMapper.h b/src/gui/seqmanager/InternalSegmentMapper.h
index f314cfb..46b7732 100644
--- a/src/gui/seqmanager/InternalSegmentMapper.h
+++ b/src/gui/seqmanager/InternalSegmentMapper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/MappedEventBuffer.cpp b/src/gui/seqmanager/MappedEventBuffer.cpp
index 3ed96d3..03a2044 100644
--- a/src/gui/seqmanager/MappedEventBuffer.cpp
+++ b/src/gui/seqmanager/MappedEventBuffer.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/MappedEventBuffer.h b/src/gui/seqmanager/MappedEventBuffer.h
index fb2a3a1..89d5193 100644
--- a/src/gui/seqmanager/MappedEventBuffer.h
+++ b/src/gui/seqmanager/MappedEventBuffer.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/MarkerMapper.cpp b/src/gui/seqmanager/MarkerMapper.cpp
index 12f0a27..b122b04 100644
--- a/src/gui/seqmanager/MarkerMapper.cpp
+++ b/src/gui/seqmanager/MarkerMapper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/MarkerMapper.h b/src/gui/seqmanager/MarkerMapper.h
index a7931ae..9f4591a 100644
--- a/src/gui/seqmanager/MarkerMapper.h
+++ b/src/gui/seqmanager/MarkerMapper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/MetronomeMapper.cpp b/src/gui/seqmanager/MetronomeMapper.cpp
index 58c4f35..2b2d40f 100644
--- a/src/gui/seqmanager/MetronomeMapper.cpp
+++ b/src/gui/seqmanager/MetronomeMapper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/MetronomeMapper.h b/src/gui/seqmanager/MetronomeMapper.h
index 0902829..e11f3cb 100644
--- a/src/gui/seqmanager/MetronomeMapper.h
+++ b/src/gui/seqmanager/MetronomeMapper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/MidiFilterDialog.cpp b/src/gui/seqmanager/MidiFilterDialog.cpp
index a704a13..c911e29 100644
--- a/src/gui/seqmanager/MidiFilterDialog.cpp
+++ b/src/gui/seqmanager/MidiFilterDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/MidiFilterDialog.h b/src/gui/seqmanager/MidiFilterDialog.h
index 8adb607..20d331b 100644
--- a/src/gui/seqmanager/MidiFilterDialog.h
+++ b/src/gui/seqmanager/MidiFilterDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/SegmentMapper.cpp b/src/gui/seqmanager/SegmentMapper.cpp
index ed43bbc..c5e5427 100644
--- a/src/gui/seqmanager/SegmentMapper.cpp
+++ b/src/gui/seqmanager/SegmentMapper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/SegmentMapper.h b/src/gui/seqmanager/SegmentMapper.h
index 946959d..98c1ae9 100644
--- a/src/gui/seqmanager/SegmentMapper.h
+++ b/src/gui/seqmanager/SegmentMapper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/SegmentMapperFactory.cpp b/src/gui/seqmanager/SegmentMapperFactory.cpp
index c28be7f..01bdace 100644
--- a/src/gui/seqmanager/SegmentMapperFactory.cpp
+++ b/src/gui/seqmanager/SegmentMapperFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/SegmentMapperFactory.h b/src/gui/seqmanager/SegmentMapperFactory.h
index 75ce89e..0114018 100644
--- a/src/gui/seqmanager/SegmentMapperFactory.h
+++ b/src/gui/seqmanager/SegmentMapperFactory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp
index ad59072..5a1af13 100644
--- a/src/gui/seqmanager/SequenceManager.cpp
+++ b/src/gui/seqmanager/SequenceManager.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -669,15 +669,17 @@ punchin:
// what files it needs to write to.
m_doc->addRecordMIDISegment(*i);
- // Get the channel based on the instrument number. E.g.
- // MIDI Instrument #1 is channel 0.
- int channel = inst->getNaturalChannel();
+ if (inst->getType() == Instrument::Midi) {
+ // Get the channel based on the instrument number. E.g.
+ // MIDI Instrument #1 is channel 0.
+ int channel = inst->getNaturalChannel();
- // Send Program Changes on recording tracks like 11.11.42
- // used to. Fix for bug #1356 "Wrong instrument when
- // recording on multiple tracks/channels". This is a
- // simple way to support multiple MIDI controllers.
- StudioControl::sendChannelSetup(inst, channel);
+ // Send Program Changes on recording tracks like 11.11.42
+ // used to. Fix for bug #1356 "Wrong instrument when
+ // recording on multiple tracks/channels". This is a
+ // simple way to support multiple MIDI controllers.
+ StudioControl::sendChannelSetup(inst, channel);
+ }
}
}
}
diff --git a/src/gui/seqmanager/SequenceManager.h b/src/gui/seqmanager/SequenceManager.h
index 4970a3f..bd6f7f9 100644
--- a/src/gui/seqmanager/SequenceManager.h
+++ b/src/gui/seqmanager/SequenceManager.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/SpecialSegmentMapper.cpp b/src/gui/seqmanager/SpecialSegmentMapper.cpp
index e13c835..f19c531 100644
--- a/src/gui/seqmanager/SpecialSegmentMapper.cpp
+++ b/src/gui/seqmanager/SpecialSegmentMapper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/SpecialSegmentMapper.h b/src/gui/seqmanager/SpecialSegmentMapper.h
index ad479d7..ff56986 100644
--- a/src/gui/seqmanager/SpecialSegmentMapper.h
+++ b/src/gui/seqmanager/SpecialSegmentMapper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/TempoSegmentMapper.cpp b/src/gui/seqmanager/TempoSegmentMapper.cpp
index 5617f0d..32b5995 100644
--- a/src/gui/seqmanager/TempoSegmentMapper.cpp
+++ b/src/gui/seqmanager/TempoSegmentMapper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/TempoSegmentMapper.h b/src/gui/seqmanager/TempoSegmentMapper.h
index 2f1b509..4392198 100644
--- a/src/gui/seqmanager/TempoSegmentMapper.h
+++ b/src/gui/seqmanager/TempoSegmentMapper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/TimeSigSegmentMapper.cpp b/src/gui/seqmanager/TimeSigSegmentMapper.cpp
index 1956f8b..d826fdb 100644
--- a/src/gui/seqmanager/TimeSigSegmentMapper.cpp
+++ b/src/gui/seqmanager/TimeSigSegmentMapper.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/seqmanager/TimeSigSegmentMapper.h b/src/gui/seqmanager/TimeSigSegmentMapper.h
index e493974..5a2535b 100644
--- a/src/gui/seqmanager/TimeSigSegmentMapper.h
+++ b/src/gui/seqmanager/TimeSigSegmentMapper.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index 9100c06..7f0381e 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -32,6 +32,7 @@
#include "base/Composition.h"
#include "base/Device.h"
#include "base/Instrument.h"
+#include "base/InstrumentStaticSignals.h"
#include "base/MidiProgram.h"
#include "base/Studio.h"
#include "document/RosegardenDocument.h"
@@ -195,6 +196,14 @@ AudioMixerWindow::AudioMixerWindow(QWidget *parent,
// returned to normal after I implemented Rosegarden::PluginPushButton. Oh
// well.)
populate();
+
+ // Hold on to this to make sure it stays around as long as we do.
+ m_instrumentStaticSignals = Instrument::getStaticSignals();
+
+ connect(m_instrumentStaticSignals.data(),
+ SIGNAL(changed(Instrument *)),
+ this,
+ SLOT(slotInstrumentChanged(Instrument *)));
}
AudioMixerWindow::~AudioMixerWindow()
@@ -433,14 +442,6 @@ AudioMixerWindow::populate()
updateStereoButton((*i)->getId());
updatePluginButtons((*i)->getId());
- if (rec.m_input) {
- connect(rec.m_input, SIGNAL(changed()),
- this, SLOT(slotInputChanged()));
- }
-
- connect(rec.m_output, SIGNAL(changed()),
- this, SLOT(slotOutputChanged()));
-
connect(rec.m_fader, SIGNAL(faderChanged(float)),
this, SLOT(slotFaderLevelChanged(float)));
@@ -605,9 +606,14 @@ AudioMixerWindow::slotTrackAssignmentsChanged()
}
void
-AudioMixerWindow::slotUpdateInstrument(InstrumentId id)
+AudioMixerWindow::slotInstrumentChanged(Instrument *instrument)
{
- RG_DEBUG << "AudioMixerWindow::slotUpdateInstrument(" << id << ")" << endl;
+ if (!instrument)
+ return;
+
+ InstrumentId id = instrument->getId();
+
+ RG_DEBUG << "AudioMixerWindow::slotInstrumentChanged(): id = " << id;
blockSignals(true);
@@ -652,7 +658,7 @@ AudioMixerWindow::slotPluginSelected(InstrumentId id,
//!!! Hacky. We still rely on the old "colour" property to figure
// out the state, instead of doing something far more pleasant and
// intelligible three years from now. (Remember this when you wince
- // in 2014. Kind of like that photo of you wearing nothing but a
+ // in 2015. Kind of like that photo of you wearing nothing but a
// sock and an electric guitar, drunk off your ass, innit?)
QColor pluginBgColour = Qt::blue; // anything random will do
@@ -948,32 +954,6 @@ AudioMixerWindow::slotSelectPlugin()
}
void
-AudioMixerWindow::slotInputChanged()
-{
- const QObject *s = sender();
-
- for (FaderMap::iterator i = m_faders.begin();
- i != m_faders.end(); ++i) {
-
- if (i->second.m_input == s)
- emit instrumentParametersChanged(i->first);
- }
-}
-
-void
-AudioMixerWindow::slotOutputChanged()
-{
- const QObject *s = sender();
-
- for (FaderMap::iterator i = m_faders.begin();
- i != m_faders.end(); ++i) {
-
- if (i->second.m_output == s)
- emit instrumentParametersChanged(i->first);
- }
-}
-
-void
AudioMixerWindow::sendControllerRefresh()
{
//!!! really want some notification of whether we have an external controller!
@@ -1065,12 +1045,12 @@ AudioMixerWindow::slotFaderLevelChanged(float dB)
m_studio->getInstrumentById(i->first);
if (instrument) {
- StudioControl::setStudioObjectProperty
- (MappedObjectId
- (instrument->getMappedId()),
- MappedAudioFader::FaderLevel,
- MappedObjectValue(dB));
+ StudioControl::setStudioObjectProperty(
+ MappedObjectId(instrument->getMappedId()),
+ MappedAudioFader::FaderLevel,
+ MappedObjectValue(dB));
instrument->setLevel(dB);
+ instrument->changed();
}
// send out to external controllers as well.
@@ -1086,8 +1066,6 @@ AudioMixerWindow::slotFaderLevelChanged(float dB)
mE.setRecordedDevice(Device::CONTROL_DEVICE);
StudioControl::sendMappedEvent(mE);
}
-
- emit instrumentParametersChanged(i->first);
}
++controllerChannel;
@@ -1131,11 +1109,12 @@ AudioMixerWindow::slotPanChanged(float pan)
m_studio->getInstrumentById(i->first);
if (instrument) {
- StudioControl::setStudioObjectProperty
- (instrument->getMappedId(),
- MappedAudioFader::Pan,
- MappedObjectValue(pan));
+ StudioControl::setStudioObjectProperty(
+ instrument->getMappedId(),
+ MappedAudioFader::Pan,
+ MappedObjectValue(pan));
instrument->setPan(MidiByte(pan + 100.0));
+ instrument->changed();
}
// send out to external controllers as well.
@@ -1154,8 +1133,6 @@ AudioMixerWindow::slotPanChanged(float pan)
mE.setRecordedDevice(Device::CONTROL_DEVICE);
StudioControl::sendMappedEvent(mE);
}
-
- emit instrumentParametersChanged(i->first);
}
++controllerChannel;
@@ -1181,12 +1158,12 @@ AudioMixerWindow::slotChannelsChanged()
m_studio->getInstrumentById(i->first);
if (instrument) {
- instrument->setAudioChannels
- ((instrument->getAudioChannels() > 1) ? 1 : 2);
+ instrument->setAudioChannels(
+ (instrument->getAudioChannels() > 1) ? 1 : 2);
updateStereoButton(instrument->getId());
updateRouteButtons(instrument->getId());
- emit instrumentParametersChanged(i->first);
+ instrument->changed();
return ;
}
@@ -1337,8 +1314,10 @@ AudioMixerWindow::slotControllerDeviceEventReceived(MappedEvent *e,
const void *preferredCustomer)
{
if (preferredCustomer != this)
- return ;
- RG_DEBUG << "AudioMixerWindow::slotControllerDeviceEventReceived: this one's for me" << endl;
+ return;
+
+ RG_DEBUG << "slotControllerDeviceEventReceived(): this one's for me";
+
raise();
// get channel number n from event
@@ -1394,8 +1373,9 @@ AudioMixerWindow::slotControllerDeviceEventReceived(MappedEvent *e,
break;
}
- slotUpdateInstrument(i->first);
- emit instrumentParametersChanged(i->first);
+ // Inform everyone of the change. Note that this will also call
+ // slotInstrumentChanged() to update the fader.
+ instrument->changed();
break;
}
diff --git a/src/gui/studio/AudioMixerWindow.h b/src/gui/studio/AudioMixerWindow.h
index 85528d7..d68d3e0 100644
--- a/src/gui/studio/AudioMixerWindow.h
+++ b/src/gui/studio/AudioMixerWindow.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -25,6 +25,7 @@
#include "gui/widgets/PluginPushButton.h"
#include <QPixmap>
+#include <QSharedPointer>
#include <vector>
#include <map>
@@ -46,6 +47,8 @@ class Fader;
class AudioVUMeter;
class AudioRouteMenu;
class PluginPushButton;
+class Instrument;
+class InstrumentStaticSignals;
class AudioMixerWindow : public MixerWindow, public ActionFileClient
@@ -60,8 +63,13 @@ public:
void updateMonitorMeters();
public slots:
+ /// Handle events from the external controller port.
+ /**
+ * @see RosegardenMainViewWidget::slotControllerDeviceEventReceived()
+ * @see MidiMixerWindow::slotControllerDeviceEventReceived()
+ */
void slotControllerDeviceEventReceived(MappedEvent *,
- const void *);
+ const void *preferredCustomer);
signals:
void selectPlugin(QWidget *, InstrumentId id, int index);
@@ -75,14 +83,9 @@ signals:
void record();
void panic();
- // to be redirected to the instrument parameter box if necessary
- void instrumentParametersChanged(InstrumentId);
-
protected slots:
void slotFaderLevelChanged(float level);
void slotPanChanged(float value);
- void slotInputChanged();
- void slotOutputChanged();
void slotChannelsChanged();
void slotSoloChanged();
void slotMuteChanged();
@@ -91,7 +94,7 @@ protected slots:
void slotRepopulate();
// to be called if something changes in an instrument parameter box
- void slotUpdateInstrument(InstrumentId);
+ void slotInstrumentChanged(Instrument *);
void slotTrackAssignmentsChanged();
@@ -183,6 +186,8 @@ private:
QPixmap m_stereoPixmap;
void setRewFFwdToAutoRepeat();
+
+ QSharedPointer<InstrumentStaticSignals> m_instrumentStaticSignals;
};
diff --git a/src/gui/studio/AudioPlugin.cpp b/src/gui/studio/AudioPlugin.cpp
index 99c40e9..0e32910 100644
--- a/src/gui/studio/AudioPlugin.cpp
+++ b/src/gui/studio/AudioPlugin.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioPlugin.h b/src/gui/studio/AudioPlugin.h
index 3099bac..0c4bb85 100644
--- a/src/gui/studio/AudioPlugin.h
+++ b/src/gui/studio/AudioPlugin.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioPluginClipboard.cpp b/src/gui/studio/AudioPluginClipboard.cpp
index 393ca56..5f80765 100644
--- a/src/gui/studio/AudioPluginClipboard.cpp
+++ b/src/gui/studio/AudioPluginClipboard.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioPluginClipboard.h b/src/gui/studio/AudioPluginClipboard.h
index f1a23e3..3eb510e 100644
--- a/src/gui/studio/AudioPluginClipboard.h
+++ b/src/gui/studio/AudioPluginClipboard.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioPluginManager.cpp b/src/gui/studio/AudioPluginManager.cpp
index 4e5aac7..219d7da 100644
--- a/src/gui/studio/AudioPluginManager.cpp
+++ b/src/gui/studio/AudioPluginManager.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioPluginManager.h b/src/gui/studio/AudioPluginManager.h
index ab87601..ba37528 100644
--- a/src/gui/studio/AudioPluginManager.h
+++ b/src/gui/studio/AudioPluginManager.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioPluginOSCGUI.cpp b/src/gui/studio/AudioPluginOSCGUI.cpp
index fd1a192..7cb1e0c 100644
--- a/src/gui/studio/AudioPluginOSCGUI.cpp
+++ b/src/gui/studio/AudioPluginOSCGUI.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioPluginOSCGUI.h b/src/gui/studio/AudioPluginOSCGUI.h
index 6ad17e7..bd878ed 100644
--- a/src/gui/studio/AudioPluginOSCGUI.h
+++ b/src/gui/studio/AudioPluginOSCGUI.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp
index a6ab892..6d0a67f 100644
--- a/src/gui/studio/AudioPluginOSCGUIManager.cpp
+++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/AudioPluginOSCGUIManager.h b/src/gui/studio/AudioPluginOSCGUIManager.h
index de751ed..a5abaae 100644
--- a/src/gui/studio/AudioPluginOSCGUIManager.h
+++ b/src/gui/studio/AudioPluginOSCGUIManager.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index bf69392..f7a369f 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -1185,11 +1185,17 @@ BankEditorDialog::slotDelete()
// Copy across all programs that aren't in the doomed bank
//
- ProgramList::iterator it;
- ProgramList tempList;
- for (it = m_programList.begin(); it != m_programList.end(); ++it)
- if (!(it->getBank() == bank))
- tempList.push_back(*it);
+ ProgramList newProgramList;
+ for (ProgramList::iterator it = m_programList.begin();
+ it != m_programList.end();
+ ++it) {
+ // If this program isn't in the bank that is being deleted,
+ // add it to the new program list. We use partialCompare()
+ // because the MidiBank objects in the program list do not
+ // have their name fields filled in.
+ if (!it->getBank().partialCompare(bank))
+ newProgramList.push_back(*it);
+ }
// Erase the bank and repopulate
//
@@ -1197,7 +1203,7 @@ BankEditorDialog::slotDelete()
m_bankList.begin();
er += currentBank;
m_bankList.erase(er);
- m_programList = tempList;
+ m_programList = newProgramList;
keepBankListForNextPopulate();
// the listview automatically selects a new current item
@@ -1697,7 +1703,7 @@ BankEditorDialog::slotEditPaste()
// Remove programs that will be overwritten
//
for (it = m_programList.begin(); it != m_programList.end(); ++it) {
- if (!(it->getBank() == m_lastBank))
+ if (!(it->getBank().partialCompare(m_lastBank)))
tempProg.push_back(*it);
}
m_programList = tempProg;
@@ -1710,7 +1716,7 @@ BankEditorDialog::slotEditPaste()
// Add the new programs
//
for (it = tempProg.begin(); it != tempProg.end(); ++it) {
- if (it->getBank() == sourceBank) {
+ if (it->getBank().partialCompare(sourceBank)) {
// Insert with new MSB and LSB
//
MidiProgram copyProgram(m_lastBank,
diff --git a/src/gui/studio/BankEditorDialog.h b/src/gui/studio/BankEditorDialog.h
index b1a9992..af01857 100644
--- a/src/gui/studio/BankEditorDialog.h
+++ b/src/gui/studio/BankEditorDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/ControlEditorDialog.cpp b/src/gui/studio/ControlEditorDialog.cpp
index 29dfd70..4c60c53 100644
--- a/src/gui/studio/ControlEditorDialog.cpp
+++ b/src/gui/studio/ControlEditorDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/ControlEditorDialog.h b/src/gui/studio/ControlEditorDialog.h
index cdbfd70..e7f4ff4 100644
--- a/src/gui/studio/ControlEditorDialog.h
+++ b/src/gui/studio/ControlEditorDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/ControlParameterEditDialog.cpp b/src/gui/studio/ControlParameterEditDialog.cpp
index 6e894c3..927b899 100644
--- a/src/gui/studio/ControlParameterEditDialog.cpp
+++ b/src/gui/studio/ControlParameterEditDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/ControlParameterEditDialog.h b/src/gui/studio/ControlParameterEditDialog.h
index 9e1bc18..01ba0b0 100644
--- a/src/gui/studio/ControlParameterEditDialog.h
+++ b/src/gui/studio/ControlParameterEditDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/ControlParameterItem.cpp b/src/gui/studio/ControlParameterItem.cpp
index f5dbfbc..15d6b48 100644
--- a/src/gui/studio/ControlParameterItem.cpp
+++ b/src/gui/studio/ControlParameterItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/ControlParameterItem.h b/src/gui/studio/ControlParameterItem.h
index 8121aea..dcfc3c9 100644
--- a/src/gui/studio/ControlParameterItem.h
+++ b/src/gui/studio/ControlParameterItem.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 276bf69..01709e5 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -31,7 +31,6 @@
#include "base/MidiTypes.h"
#include "base/Studio.h"
#include "commands/studio/CreateOrDeleteDeviceCommand.h"
-#include "commands/studio/ModifyDeviceCommand.h"
#include "commands/studio/ReconnectDeviceCommand.h"
#include "commands/studio/RenameDeviceCommand.h"
#include "document/CommandHistory.h"
@@ -122,23 +121,14 @@ DeviceManagerDialog::show()
}
void
-DeviceManagerDialog::closeEvent(QCloseEvent *e)
+DeviceManagerDialog::slotCloseButtonPress()
{
- emit closing();
- QMainWindow::closeEvent(e);
-}
-
-void
-DeviceManagerDialog::slotClose()
-{
- RG_DEBUG << "DeviceManagerDialog::slotClose()" << endl;
/*
if (m_doc) {
//CommandHistory::getInstance()->detachView(actionCollection()); //&&&
m_doc = 0;
}
*/
- emit closing();
close();
}
@@ -961,7 +951,7 @@ DeviceManagerDialog::slotDeviceItemChanged(QTreeWidgetItem * twItem,
(new RenameDeviceCommand(m_studio, mdev->getId(),
qstrtostr(devName)));
emit deviceNameChanged(mdev->getId());
- RG_DEBUG << "DeviceManagerDialog::slotDeviceItemChanged emitting deviceNamesChanged()" << endl;
+ RG_DEBUG << "DeviceManagerDialog::slotDeviceItemChanged emitting deviceNamesChanged()" << endl;
emit deviceNamesChanged();
}
}
@@ -1057,7 +1047,7 @@ DeviceManagerDialog::connectSignalsToSlots()
// connect close button
QPushButton *pbClose;
pbClose = bbox->button(QDialogButtonBox::Close);
- connect(pbClose, SIGNAL(clicked()), this, SLOT(slotClose()));
+ connect(pbClose, SIGNAL(clicked()), this, SLOT(slotCloseButtonPress()));
// buttons
connect(pushButton_newPlaybackDevice, SIGNAL(clicked()), this,
diff --git a/src/gui/studio/DeviceManagerDialog.h b/src/gui/studio/DeviceManagerDialog.h
index 30700ca..7230c52 100644
--- a/src/gui/studio/DeviceManagerDialog.h
+++ b/src/gui/studio/DeviceManagerDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -107,8 +107,6 @@ signals:
void deviceNameChanged(DeviceId);
void deviceNamesChanged();
- void closing();
-
public slots:
void slotOutputPortClicked(QTreeWidgetItem * item, int column);
void slotPlaybackDeviceSelected();
@@ -137,15 +135,11 @@ public slots:
void slotEditControllerDefinitions();
void show();
- void slotClose();
void slotHelpRequested();
void slotResyncDevicesReceived();
protected:
- virtual void closeEvent(QCloseEvent *);
-
- //
RosegardenDocument *m_doc;
Studio *m_studio;
@@ -156,6 +150,9 @@ protected:
int m_UserRole_DeviceId; // = Qt::UserRole + 1;
QString m_noPortName;
+
+private slots:
+ void slotCloseButtonPress();
};
diff --git a/src/gui/studio/MidiBankTreeWidgetItem.cpp b/src/gui/studio/MidiBankTreeWidgetItem.cpp
index 147dd9e..293b20b 100644
--- a/src/gui/studio/MidiBankTreeWidgetItem.cpp
+++ b/src/gui/studio/MidiBankTreeWidgetItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiBankTreeWidgetItem.h b/src/gui/studio/MidiBankTreeWidgetItem.h
index 9e28119..7110650 100644
--- a/src/gui/studio/MidiBankTreeWidgetItem.h
+++ b/src/gui/studio/MidiBankTreeWidgetItem.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiDeviceTreeWidgetItem.cpp b/src/gui/studio/MidiDeviceTreeWidgetItem.cpp
index 67a5177..16ad423 100644
--- a/src/gui/studio/MidiDeviceTreeWidgetItem.cpp
+++ b/src/gui/studio/MidiDeviceTreeWidgetItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiDeviceTreeWidgetItem.h b/src/gui/studio/MidiDeviceTreeWidgetItem.h
index 1bae0ea..45ef674 100644
--- a/src/gui/studio/MidiDeviceTreeWidgetItem.h
+++ b/src/gui/studio/MidiDeviceTreeWidgetItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiKeyMapTreeWidgetItem.cpp b/src/gui/studio/MidiKeyMapTreeWidgetItem.cpp
index e2b5e19..d1bcac6 100644
--- a/src/gui/studio/MidiKeyMapTreeWidgetItem.cpp
+++ b/src/gui/studio/MidiKeyMapTreeWidgetItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiKeyMapTreeWidgetItem.h b/src/gui/studio/MidiKeyMapTreeWidgetItem.h
index 1d08b49..d67ab35 100644
--- a/src/gui/studio/MidiKeyMapTreeWidgetItem.h
+++ b/src/gui/studio/MidiKeyMapTreeWidgetItem.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiKeyMappingEditor.cpp b/src/gui/studio/MidiKeyMappingEditor.cpp
index 1eef5d3..8217ab6 100644
--- a/src/gui/studio/MidiKeyMappingEditor.cpp
+++ b/src/gui/studio/MidiKeyMappingEditor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiKeyMappingEditor.h b/src/gui/studio/MidiKeyMappingEditor.h
index 984b26c..1b36f50 100644
--- a/src/gui/studio/MidiKeyMappingEditor.h
+++ b/src/gui/studio/MidiKeyMappingEditor.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiMixerVUMeter.cpp b/src/gui/studio/MidiMixerVUMeter.cpp
index 40171fd..d7d3732 100644
--- a/src/gui/studio/MidiMixerVUMeter.cpp
+++ b/src/gui/studio/MidiMixerVUMeter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiMixerVUMeter.h b/src/gui/studio/MidiMixerVUMeter.h
index 7cd1290..80ddb39 100644
--- a/src/gui/studio/MidiMixerVUMeter.h
+++ b/src/gui/studio/MidiMixerVUMeter.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index 50f7615..2cbd584 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -17,6 +17,9 @@
#define RG_MODULE_STRING "[MidiMixerWindow]"
+// Disable RG_DEBUG output. Must be defined prior to including Debug.h.
+#define RG_NO_DEBUG_PRINT
+
#include "MidiMixerWindow.h"
#include "sound/Midi.h"
@@ -25,6 +28,7 @@
#include "base/Colour.h"
#include "base/Device.h"
#include "base/Instrument.h"
+#include "base/InstrumentStaticSignals.h"
#include "base/MidiDevice.h"
#include "base/MidiProgram.h"
#include "base/Studio.h"
@@ -86,6 +90,14 @@ MidiMixerWindow::MidiMixerWindow(QWidget *parent,
createGUI("midimixer.rc");
setRewFFwdToAutoRepeat();
+
+ // Hold on to this to make sure it stays around as long as we do.
+ m_instrumentStaticSignals = Instrument::getStaticSignals();
+
+ connect(m_instrumentStaticSignals.data(),
+ SIGNAL(changed(Instrument *)),
+ this,
+ SLOT(slotInstrumentChanged(Instrument *)));
}
void
@@ -257,7 +269,7 @@ MidiMixerWindow::setupTabs()
// Update all the faders and controllers
//
- slotUpdateInstrument((*iIt)->getId());
+ slotInstrumentChanged(*iIt);
// Increment counters
//
@@ -285,20 +297,22 @@ MidiMixerWindow::slotFaderLevelChanged(float value)
{
const QObject *s = sender();
+ // For each fader
+ // ??? Wouldn't QSignalMapper be better?
for (FaderVector::const_iterator it = m_faders.begin();
it != m_faders.end(); ++it) {
if ((*it)->m_volumeFader == s) {
- Instrument *instr = m_studio->
+ Instrument *instrument = m_studio->
getInstrumentById((*it)->m_id);
- if (instr) {
+ if (instrument) {
- instr->setControllerValue(MIDI_CONTROLLER_VOLUME, MidiByte(value));
+ instrument->setControllerValue(MIDI_CONTROLLER_VOLUME, MidiByte(value));
+ instrument->changed();
- if (instr->hasFixedChannel())
+ if (instrument->hasFixedChannel())
{
- // send out to external controllers as well if the
- // affected instrument is on a fixed channel.
+ // Send out the external controller port as well.
//!!! really want some notification of whether we have any!
int tabIndex = m_tabWidget->currentIndex();
@@ -314,16 +328,16 @@ MidiMixerWindow::slotFaderLevelChanged(float value)
++i;
continue;
}
- RG_DEBUG << "slotFaderLevelChanged: device id = " << instr->getDevice()->getId() << ", visible device id " << (*dit)->getId() << endl;
- if (instr->getDevice()->getId() == (*dit)->getId()) {
- RG_DEBUG << "slotFaderLevelChanged: sending control device mapped event for channel " << instr->getNaturalChannel() << endl;
+ RG_DEBUG << "slotFaderLevelChanged: device id = " << instrument->getDevice()->getId() << ", visible device id " << (*dit)->getId() << endl;
+ if (instrument->getDevice()->getId() == (*dit)->getId()) {
+ RG_DEBUG << "slotFaderLevelChanged: sending control device mapped event for channel " << instrument->getNaturalChannel() << endl;
MappedEvent mE((*it)->m_id,
MappedEvent::MidiController,
MIDI_CONTROLLER_VOLUME,
MidiByte(value));
- mE.setRecordedChannel(instr->getNaturalChannel());
+ mE.setRecordedChannel(instrument->getNaturalChannel());
mE.setRecordedDevice(Device::CONTROL_DEVICE);
StudioControl::sendMappedEvent(mE);
}
@@ -332,7 +346,6 @@ MidiMixerWindow::slotFaderLevelChanged(float value)
}
}
- emit instrumentParametersChanged((*it)->m_id);
return ;
}
}
@@ -344,6 +357,8 @@ MidiMixerWindow::slotControllerChanged(float value)
const QObject *s = sender();
size_t i = 0, j = 0;
+ // For each fader
+ // ??? Wouldn't QSignalMapper be better?
for (i = 0; i < m_faders.size(); ++i) {
for (j = 0; j < m_faders[i]->m_controllerRotaries.size(); ++j) {
if (m_faders[i]->m_controllerRotaries[j].second == s)
@@ -364,19 +379,23 @@ MidiMixerWindow::slotControllerChanged(float value)
//RG_DEBUG << "MidiMixerWindow::slotControllerChanged - found a controller"
//<< endl;
- Instrument *instr = m_studio->getInstrumentById(
+ Instrument *instrument = m_studio->getInstrumentById(
m_faders[i]->m_id);
- if (instr) {
+ if (instrument) {
//RG_DEBUG << "MidiMixerWindow::slotControllerChanged - "
//<< "got instrument to change" << endl;
- instr->setControllerValue(m_faders[i]->
- m_controllerRotaries[j].first,
- MidiByte(value));
+ instrument->setControllerValue(
+ m_faders[i]->m_controllerRotaries[j].first,
+ MidiByte(value));
+ instrument->changed();
+
+ if (instrument->hasFixedChannel()) {
+
+ // Send out the external controller port as well.
- if (instr->hasFixedChannel()) {
int tabIndex = m_tabWidget->currentIndex();
if (tabIndex < 0)
tabIndex = 0;
@@ -390,119 +409,99 @@ MidiMixerWindow::slotControllerChanged(float value)
++k;
continue;
}
- RG_DEBUG << "slotControllerChanged: device id = " << instr->getDevice()->getId() << ", visible device id " << (*dit)->getId() << endl;
- if (instr->getDevice()->getId() == (*dit)->getId()) {
- RG_DEBUG << "slotControllerChanged: sending control device mapped event for channel " << instr->getNaturalChannel() << endl;
+ RG_DEBUG << "slotControllerChanged: device id = " << instrument->getDevice()->getId() << ", visible device id " << (*dit)->getId() << endl;
+ if (instrument->getDevice()->getId() == (*dit)->getId()) {
+ RG_DEBUG << "slotControllerChanged: sending control device mapped event for channel " << instrument->getNaturalChannel() << endl;
// send out to external controllers as well.
//!!! really want some notification of whether we have any!
MappedEvent mE(m_faders[i]->m_id,
MappedEvent::MidiController,
m_faders[i]->m_controllerRotaries[j].first,
MidiByte(value));
- mE.setRecordedChannel(instr->getNaturalChannel());
+ mE.setRecordedChannel(instrument->getNaturalChannel());
mE.setRecordedDevice(Device::CONTROL_DEVICE);
StudioControl::sendMappedEvent(mE);
}
}
}
- emit instrumentParametersChanged(m_faders[i]->m_id);
}
}
void
-MidiMixerWindow::slotUpdateInstrument(InstrumentId id)
+MidiMixerWindow::slotInstrumentChanged(Instrument *instrument)
{
- //RG_DEBUG << "MidiMixerWindow::slotUpdateInstrument - id = " << id << endl;
+ //RG_DEBUG << "slotUpdateInstrument(): Instrument ID = " << instrument->getId();
- DeviceListConstIterator it;
- MidiDevice *dev = 0;
- InstrumentList instruments;
- InstrumentList::const_iterator iIt;
int count = 0;
- blockSignals(true);
+ // For each device in the Studio
+ for (DeviceListConstIterator it = m_studio->begin(); it != m_studio->end(); ++it) {
+ MidiDevice *dev = dynamic_cast<MidiDevice *>(*it);
- for (it = m_studio->begin(); it != m_studio->end(); ++it) {
- dev = dynamic_cast<MidiDevice*>(*it);
+ // If this isn't a MidiDevice, try the next.
+ if (!dev)
+ continue;
- if (dev) {
- instruments = dev->getPresentationInstruments();
- ControlList controls = getIPBForMidiMixer(dev);
+ InstrumentList instruments = dev->getPresentationInstruments();
- for (iIt = instruments.begin(); iIt != instruments.end(); ++iIt) {
- // Match and set
+ // For each Instrument in the Device
+ for (InstrumentList::const_iterator iIt = instruments.begin();
+ iIt != instruments.end(); ++iIt) {
+ // Match and set
+ //
+ if ((*iIt)->getId() == instrument->getId()) {
+ // Set Volume fader
//
- if ((*iIt)->getId() == id) {
- // Set Volume fader
- //
- m_faders[count]->m_volumeFader->blockSignals(true);
- MidiByte volumeValue;
- try {
- volumeValue = (*iIt)->
- getControllerValue(MIDI_CONTROLLER_VOLUME);
- } catch (std::string s) {
- // This should never get called.
- volumeValue = (*iIt)->getVolume();
- }
-
- m_faders[count]->m_volumeFader->setFader(float(volumeValue));
- m_faders[count]->m_volumeFader->blockSignals(false);
+ MidiByte volumeValue;
+ try {
+ volumeValue = (*iIt)->
+ getControllerValue(MIDI_CONTROLLER_VOLUME);
+ } catch (std::string s) {
+ // This should never get called.
+ volumeValue = (*iIt)->getVolume();
+ }
- /*
- StaticControllers &staticControls =
- (*iIt)->getStaticControllers();
- RG_DEBUG << "STATIC CONTROLS SIZE = "
- << staticControls.size() << endl;
- */
+ // setFader() emits a signal. If we don't block it, we crash
+ // due to an endless loop.
+ // ??? Need to examine more closely and see if we can redesign
+ // things to avoid this crash and remove the
+ // blockSignals() calls around every call to setFader().
+ m_faders[count]->m_volumeFader->blockSignals(true);
+ m_faders[count]->m_volumeFader->setFader(float(volumeValue));
+ m_faders[count]->m_volumeFader->blockSignals(false);
- // Set all controllers for this Instrument
- //
- for (size_t i = 0; i < controls.size(); ++i) {
- float value = 0.0;
-
- m_faders[count]->m_controllerRotaries[i].second->blockSignals(true);
-
- // The ControllerValues might not yet be set on
- // the actual Instrument so don't always expect
- // to find one. There might be a hole here for
- // deleted Controllers to hang around on
- // Instruments..
- //
- try {
- value = float((*iIt)->getControllerValue
- (controls[i].getControllerValue()));
- } catch (std::string s) {
- /*
- RG_DEBUG <<
- "MidiMixerWindow::slotUpdateInstrument - "
- << "can't match controller "
- << int(controls[i].
- getControllerValue()) << " - \""
- << s << "\"" << endl;
- */
- continue;
- }
+ //RG_DEBUG << "STATIC CONTROLS SIZE = " << (*iIt)->getStaticControllers().size();
- /*
- RG_DEBUG << "MidiMixerWindow::slotUpdateInstrument"
- << " - MATCHED "
- << int(controls[i].getControllerValue())
- << endl;
- */
+ ControlList controls = getIPBForMidiMixer(dev);
- m_faders[count]->m_controllerRotaries[i].
- second->setPosition(value);
+ // Set all controllers for this Instrument
+ //
+ for (size_t i = 0; i < controls.size(); ++i) {
+ float value = 0.0;
- m_faders[count]->m_controllerRotaries[i].second->blockSignals(false);
+ // The ControllerValues might not yet be set on
+ // the actual Instrument so don't always expect
+ // to find one. There might be a hole here for
+ // deleted Controllers to hang around on
+ // Instruments..
+ //
+ try {
+ value = float((*iIt)->getControllerValue
+ (controls[i].getControllerValue()));
+ } catch (std::string s) {
+ //RG_DEBUG << "slotUpdateInstrument - can't match controller " << int(controls[i].getControllerValue()) << " - \"" << s << "\"";
+ continue;
}
+
+ //RG_DEBUG << "MidiMixerWindow::slotUpdateInstrument - MATCHED " << int(controls[i].getControllerValue());
+
+ m_faders[count]->m_controllerRotaries[i].second->setPosition(value);
}
- count++;
}
+ count++;
}
}
-
- blockSignals(false);
}
void
@@ -535,7 +534,9 @@ MidiMixerWindow::slotControllerDeviceEventReceived(MappedEvent *e,
{
if (preferredCustomer != this)
return ;
- RG_DEBUG << "MidiMixerWindow::slotControllerDeviceEventReceived: this one's for me" << endl;
+
+ RG_DEBUG << "slotControllerDeviceEventReceived(): this one's for me";
+
raise();
// get channel number n from event
@@ -574,18 +575,16 @@ MidiMixerWindow::slotControllerDeviceEventReceived(MappedEvent *e,
if (instrument->getNaturalChannel() != channel)
continue;
- ControlList cl = dev->getIPBControlParameters();
- for (ControlList::const_iterator i = cl.begin();
- i != cl.end(); ++i) {
- if ((*i).getControllerValue() == controller) {
- RG_DEBUG << "Setting controller " << controller << " for instrument " << instrument->getId() << " to " << value << endl;
+ ControlList cl = dev->getControlParameters();
+ for (ControlList::const_iterator controlIter = cl.begin();
+ controlIter != cl.end(); ++controlIter) {
+ if ((*controlIter).getControllerValue() == controller) {
+ RG_DEBUG << "slotControllerDeviceEventReceived(): Setting controller " << controller << " for instrument " << instrument->getId() << " to " << value;
instrument->setControllerValue(controller, value);
+ instrument->changed();
break;
}
}
-
- slotUpdateInstrument(instrument->getId());
- emit instrumentParametersChanged(instrument->getId());
}
break;
diff --git a/src/gui/studio/MidiMixerWindow.h b/src/gui/studio/MidiMixerWindow.h
index ece3b63..72ea17c 100644
--- a/src/gui/studio/MidiMixerWindow.h
+++ b/src/gui/studio/MidiMixerWindow.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -22,6 +22,7 @@
#include "base/MidiDevice.h"
#include "gui/general/ActionFileClient.h"
#include "MixerWindow.h"
+#include <QSharedPointer>
#include <vector>
@@ -39,6 +40,7 @@ class RosegardenDocument;
class MidiMixerVUMeter;
class MappedEvent;
class Fader;
+class InstrumentStaticSignals;
class MidiMixerWindow : public MixerWindow, public ActionFileClient
@@ -62,8 +64,13 @@ public:
public slots:
void slotSynchronise(); // synchronise with updated studio
+ /// Handle events from the external controller port.
+ /**
+ * @see RosegardenMainViewWidget::slotControllerDeviceEventReceived()
+ * @see AudioMixerWindow::slotControllerDeviceEventReceived()
+ */
void slotControllerDeviceEventReceived(MappedEvent *,
- const void *);
+ const void *preferredCustomer);
void slotCurrentTabChanged(QWidget *);
void slotHelpRequested();
@@ -79,11 +86,8 @@ signals:
void record();
void panic();
- // to be redirected to the instrument parameter box if necessary
- void instrumentParametersChanged(InstrumentId);
-
protected slots:
- void slotUpdateInstrument(InstrumentId);
+ void slotInstrumentChanged(Instrument *);
//void slotPanChanged(float);
void slotFaderLevelChanged(float);
@@ -117,6 +121,7 @@ protected:
// Grab IPB controls and remove Volume.
ControlList getIPBForMidiMixer(MidiDevice *) const;
+ QSharedPointer<InstrumentStaticSignals> m_instrumentStaticSignals;
};
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 2557528..012218b 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -127,7 +127,7 @@ MidiProgramsEditor::getBankSubset(const MidiBank &bank)
ProgramList::iterator it;
for (it = m_programList.begin(); it != m_programList.end(); ++it) {
- if (it->getBank() == bank)
+ if (it->getBank().partialCompare(bank))
program.push_back(*it);
}
@@ -147,7 +147,7 @@ MidiProgramsEditor::modifyCurrentPrograms(const MidiBank &oldBank,
ProgramList::iterator it;
for (it = m_programList.begin(); it != m_programList.end(); ++it) {
- if (it->getBank() == oldBank) {
+ if (it->getBank().partialCompare(oldBank)) {
*it = MidiProgram(newBank, it->getProgram(), it->getName());
}
}
@@ -624,14 +624,15 @@ MidiProgramsEditor::ensureUniqueLSB(int lsb, bool ascending)
bool
MidiProgramsEditor::banklistContains(const MidiBank &bank)
{
- BankList::iterator it;
-
- MidiBank bankNotPercussion = MidiBank(!bank.isPercussion(),
- bank.getMSB(), bank.getLSB());
-
- for (it = m_bankList.begin(); it != m_bankList.end(); ++it)
- if (*it == bank || *it == bankNotPercussion)
+ // For each bank
+ for (BankList::iterator it = m_bankList.begin();
+ it != m_bankList.end();
+ ++it)
+ {
+ // Just compare the MSB/LSB.
+ if (it->getMSB() == bank.getMSB() && it->getLSB() == bank.getLSB())
return true;
+ }
return false;
}
@@ -642,7 +643,9 @@ MidiProgramsEditor::getProgram(const MidiBank &bank, int programNo)
ProgramList::iterator it = m_programList.begin();
for (; it != m_programList.end(); ++it) {
- if (it->getBank() == bank && it->getProgram() == programNo) {
+ if (it->getBank().partialCompare(bank) &&
+ it->getProgram() == programNo) {
+
//Only show hits to avoid overflow of console.
RG_DEBUG << "it->getBank() " << "== bank" << endl;
return &(*it);
diff --git a/src/gui/studio/MidiProgramsEditor.h b/src/gui/studio/MidiProgramsEditor.h
index 2b82402..c82236d 100644
--- a/src/gui/studio/MidiProgramsEditor.h
+++ b/src/gui/studio/MidiProgramsEditor.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MixerWindow.cpp b/src/gui/studio/MixerWindow.cpp
index 421cf2f..5e93f70 100644
--- a/src/gui/studio/MixerWindow.cpp
+++ b/src/gui/studio/MixerWindow.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/MixerWindow.h b/src/gui/studio/MixerWindow.h
index e257cb3..5f3c3b8 100644
--- a/src/gui/studio/MixerWindow.h
+++ b/src/gui/studio/MixerWindow.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index 83789d7..62c8fe3 100644
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/NameSetEditor.h b/src/gui/studio/NameSetEditor.h
index 3f7c123..40b0114 100644
--- a/src/gui/studio/NameSetEditor.h
+++ b/src/gui/studio/NameSetEditor.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/OSCMessage.cpp b/src/gui/studio/OSCMessage.cpp
index 2639193..be1cc78 100644
--- a/src/gui/studio/OSCMessage.cpp
+++ b/src/gui/studio/OSCMessage.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/OSCMessage.h b/src/gui/studio/OSCMessage.h
index 514e40d..f96e86d 100644
--- a/src/gui/studio/OSCMessage.h
+++ b/src/gui/studio/OSCMessage.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/RemapInstrumentDialog.cpp b/src/gui/studio/RemapInstrumentDialog.cpp
index f9dc56a..14f488e 100644
--- a/src/gui/studio/RemapInstrumentDialog.cpp
+++ b/src/gui/studio/RemapInstrumentDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/RemapInstrumentDialog.h b/src/gui/studio/RemapInstrumentDialog.h
index 7e7cf2c..9b160a2 100644
--- a/src/gui/studio/RemapInstrumentDialog.h
+++ b/src/gui/studio/RemapInstrumentDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/StudioControl.cpp b/src/gui/studio/StudioControl.cpp
index 5026d34..a0b48e7 100644
--- a/src/gui/studio/StudioControl.cpp
+++ b/src/gui/studio/StudioControl.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/StudioControl.h b/src/gui/studio/StudioControl.h
index a21b26a..1e6dde7 100644
--- a/src/gui/studio/StudioControl.h
+++ b/src/gui/studio/StudioControl.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index 738a1d7..d590000 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/SynthPluginManagerDialog.h b/src/gui/studio/SynthPluginManagerDialog.h
index f1bf7d4..3379c34 100644
--- a/src/gui/studio/SynthPluginManagerDialog.h
+++ b/src/gui/studio/SynthPluginManagerDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/TimerCallbackAssistant.cpp b/src/gui/studio/TimerCallbackAssistant.cpp
index c5e311a..f4da831 100644
--- a/src/gui/studio/TimerCallbackAssistant.cpp
+++ b/src/gui/studio/TimerCallbackAssistant.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/studio/TimerCallbackAssistant.h b/src/gui/studio/TimerCallbackAssistant.h
index 18ad3ed..2b8deed 100644
--- a/src/gui/studio/TimerCallbackAssistant.h
+++ b/src/gui/studio/TimerCallbackAssistant.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp
index b443736..48a444d 100644
--- a/src/gui/widgets/AudioFaderBox.cpp
+++ b/src/gui/widgets/AudioFaderBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/AudioFaderBox.h b/src/gui/widgets/AudioFaderBox.h
index ce10e22..f834dac 100644
--- a/src/gui/widgets/AudioFaderBox.h
+++ b/src/gui/widgets/AudioFaderBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/AudioListItem.h b/src/gui/widgets/AudioListItem.h
index 3d6a8d4..54cbd2e 100644
--- a/src/gui/widgets/AudioListItem.h
+++ b/src/gui/widgets/AudioListItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/AudioListView.cpp b/src/gui/widgets/AudioListView.cpp
index a72880f..6093efd 100644
--- a/src/gui/widgets/AudioListView.cpp
+++ b/src/gui/widgets/AudioListView.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/AudioListView.h b/src/gui/widgets/AudioListView.h
index 5a36780..3faad94 100644
--- a/src/gui/widgets/AudioListView.h
+++ b/src/gui/widgets/AudioListView.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/AudioRouteMenu.cpp b/src/gui/widgets/AudioRouteMenu.cpp
index f75b9f7..ae6cbd5 100644
--- a/src/gui/widgets/AudioRouteMenu.cpp
+++ b/src/gui/widgets/AudioRouteMenu.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -365,6 +365,8 @@ AudioRouteMenu::slotEntrySelected(int i)
m_instrument->setAudioInputToRecord(newInput, newChannel);
}
+ m_instrument->changed();
+
break;
}
@@ -387,6 +389,8 @@ AudioRouteMenu::slotEntrySelected(int i)
(m_instrument->getMappedId(), newBuss->getMappedId());
m_instrument->setAudioOutput(i);
+ m_instrument->changed();
+
break;
}
}
diff --git a/src/gui/widgets/AudioRouteMenu.h b/src/gui/widgets/AudioRouteMenu.h
index 1b64afa..cc57f34 100644
--- a/src/gui/widgets/AudioRouteMenu.h
+++ b/src/gui/widgets/AudioRouteMenu.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/AudioVUMeter.cpp b/src/gui/widgets/AudioVUMeter.cpp
index 27a59bc..301cea5 100644
--- a/src/gui/widgets/AudioVUMeter.cpp
+++ b/src/gui/widgets/AudioVUMeter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/AudioVUMeter.h b/src/gui/widgets/AudioVUMeter.h
index 0dc1a5f..a515e55 100644
--- a/src/gui/widgets/AudioVUMeter.h
+++ b/src/gui/widgets/AudioVUMeter.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/BaseTextFloat.cpp b/src/gui/widgets/BaseTextFloat.cpp
index bad4605..4ab714f 100755
--- a/src/gui/widgets/BaseTextFloat.cpp
+++ b/src/gui/widgets/BaseTextFloat.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/BaseTextFloat.h b/src/gui/widgets/BaseTextFloat.h
index d609340..92445dc 100755
--- a/src/gui/widgets/BaseTextFloat.h
+++ b/src/gui/widgets/BaseTextFloat.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/BigArrowButton.h b/src/gui/widgets/BigArrowButton.h
index 5836186..f6f91e4 100644
--- a/src/gui/widgets/BigArrowButton.h
+++ b/src/gui/widgets/BigArrowButton.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/CheckButton.cpp b/src/gui/widgets/CheckButton.cpp
index 528f514..c851847 100644
--- a/src/gui/widgets/CheckButton.cpp
+++ b/src/gui/widgets/CheckButton.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/CheckButton.h b/src/gui/widgets/CheckButton.h
index f29580f..493e965 100644
--- a/src/gui/widgets/CheckButton.h
+++ b/src/gui/widgets/CheckButton.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index e096f9f..730415d 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/CollapsingFrame.h b/src/gui/widgets/CollapsingFrame.h
index 9f4d752..3fe3d11 100644
--- a/src/gui/widgets/CollapsingFrame.h
+++ b/src/gui/widgets/CollapsingFrame.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ColourTable.cpp b/src/gui/widgets/ColourTable.cpp
index 8e10e0c..c4d3c9a 100644
--- a/src/gui/widgets/ColourTable.cpp
+++ b/src/gui/widgets/ColourTable.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ColourTable.h b/src/gui/widgets/ColourTable.h
index 7e6b8fe..a9ec641 100644
--- a/src/gui/widgets/ColourTable.h
+++ b/src/gui/widgets/ColourTable.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Portions of this file Copyright 2003
Mark Hymers <markh at linuxfromscratch.org>
diff --git a/src/gui/widgets/ColourTableItem.cpp b/src/gui/widgets/ColourTableItem.cpp
index 701eff5..3ca7d25 100644
--- a/src/gui/widgets/ColourTableItem.cpp
+++ b/src/gui/widgets/ColourTableItem.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ColourTableItem.h b/src/gui/widgets/ColourTableItem.h
index af6ec58..ce60b41 100644
--- a/src/gui/widgets/ColourTableItem.h
+++ b/src/gui/widgets/ColourTableItem.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/CurrentProgressDialog.cpp b/src/gui/widgets/CurrentProgressDialog.cpp
index eccdd7b..837e8fc 100644
--- a/src/gui/widgets/CurrentProgressDialog.cpp
+++ b/src/gui/widgets/CurrentProgressDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/CurrentProgressDialog.h b/src/gui/widgets/CurrentProgressDialog.h
index b1caec2..048dc58 100644
--- a/src/gui/widgets/CurrentProgressDialog.h
+++ b/src/gui/widgets/CurrentProgressDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/DeferScrollArea.cpp b/src/gui/widgets/DeferScrollArea.cpp
index e326a90..de22e18 100644
--- a/src/gui/widgets/DeferScrollArea.cpp
+++ b/src/gui/widgets/DeferScrollArea.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/DeferScrollArea.h b/src/gui/widgets/DeferScrollArea.h
index d5df308..b4148b7 100644
--- a/src/gui/widgets/DeferScrollArea.h
+++ b/src/gui/widgets/DeferScrollArea.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -23,12 +23,15 @@
namespace Rosegarden
{
+/// QScrollArea that emits a signal on wheel events.
/**
+ * This class allows for a connection between wheel scrolling events
+ * in the TrackButtons and scrolling in the CompositionView.
+ *
* Replaces QDeferScrollView
*
* \author Chris J. Fryer
*/
-
class DeferScrollArea : public QScrollArea
{
Q_OBJECT
diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp
index 50cf0f5..5a777ae 100644
--- a/src/gui/widgets/DiatonicPitchChooser.cpp
+++ b/src/gui/widgets/DiatonicPitchChooser.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/DiatonicPitchChooser.h b/src/gui/widgets/DiatonicPitchChooser.h
index 92feb05..d492c6f 100644
--- a/src/gui/widgets/DiatonicPitchChooser.h
+++ b/src/gui/widgets/DiatonicPitchChooser.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp
index 2f1d518..fc05981 100644
--- a/src/gui/widgets/Fader.cpp
+++ b/src/gui/widgets/Fader.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -50,6 +50,7 @@ Fader::Fader(AudioLevel::FaderType type,
m_vertical(h > w),
m_min(0),
m_max(0),
+ m_default(0),
m_type(type),
m_clickMousePos( -1)
{
@@ -74,6 +75,7 @@ Fader::Fader(AudioLevel::FaderType type,
calculateGroovePixmap();
setFader(0.0);
+ emit faderChanged(m_value);
}
Fader::Fader(int min, int max, int deflt,
@@ -83,6 +85,7 @@ Fader::Fader(int min, int max, int deflt,
m_vertical(h > w),
m_min(min),
m_max(max),
+ m_default(deflt),
m_clickMousePos( -1)
{
// setBackgroundMode(Qt::NoBackground);
@@ -106,6 +109,7 @@ Fader::Fader(int min, int max, int deflt,
calculateGroovePixmap();
setFader(deflt);
+ emit faderChanged(m_value);
}
Fader::Fader(int min, int max, int deflt,
@@ -115,6 +119,7 @@ Fader::Fader(int min, int max, int deflt,
m_vertical(vertical),
m_min(min),
m_max(max),
+ m_default(deflt),
m_clickMousePos( -1)
{
// setBackgroundMode(Qt::NoBackground);
@@ -132,6 +137,7 @@ Fader::Fader(int min, int max, int deflt,
calculateGroovePixmap();
setFader(deflt);
+ emit faderChanged(m_value);
}
Fader::~Fader()
@@ -178,8 +184,10 @@ Fader::getFaderLevel() const
void
Fader::setFader(float value)
{
+ if (m_value == value)
+ return;
+
m_value = value;
- emit faderChanged(value);
update();
}
@@ -337,6 +345,7 @@ Fader::mousePressEvent(QMouseEvent *e)
if (e->type() == QEvent::MouseButtonDblClick) {
setFader(0);
+ emit faderChanged(m_value);
return ;
}
@@ -351,7 +360,14 @@ Fader::mousePressEvent(QMouseEvent *e)
showFloatText();
}
}
+ } else if (e->button() == Qt::MidButton) { // reset to centre position
+ setFader((m_max + m_min) / 2.0);
+ emit faderChanged(m_value);
+ } else if (e->button() == Qt::RightButton) { // reset to default
+ setFader(m_default);
+ emit faderChanged(m_value);
}
+
}
void
@@ -375,6 +391,7 @@ Fader::mouseMoveEvent(QMouseEvent *e)
buttonPosition = m_sliderMax - m_sliderMin;
}
setFader(position_to_value(buttonPosition));
+ emit faderChanged(m_value);
showFloatText();
}
}
@@ -397,6 +414,7 @@ Fader::wheelEvent(QWheelEvent *e)
}
RG_DEBUG << "Fader::wheelEvent - button position = " << buttonPosition << endl;
setFader(position_to_value(buttonPosition));
+ emit faderChanged(m_value);
RG_DEBUG << "Fader::wheelEvent - value = " << m_value << endl;
showFloatText();
diff --git a/src/gui/widgets/Fader.h b/src/gui/widgets/Fader.h
index 0aaa704..1f9af45 100644
--- a/src/gui/widgets/Fader.h
+++ b/src/gui/widgets/Fader.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -98,6 +98,7 @@ protected:
int m_min;
int m_max;
+ int m_default;
AudioLevel::FaderType m_type;
int m_clickMousePos;
diff --git a/src/gui/widgets/FileDialog.cpp b/src/gui/widgets/FileDialog.cpp
index 55df6f3..900fa20 100644
--- a/src/gui/widgets/FileDialog.cpp
+++ b/src/gui/widgets/FileDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/FileDialog.h b/src/gui/widgets/FileDialog.h
index 2002216..00d090b 100644
--- a/src/gui/widgets/FileDialog.h
+++ b/src/gui/widgets/FileDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/FontRequester.cpp b/src/gui/widgets/FontRequester.cpp
index da4abe4..a4a77e0 100644
--- a/src/gui/widgets/FontRequester.cpp
+++ b/src/gui/widgets/FontRequester.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/FontRequester.h b/src/gui/widgets/FontRequester.h
index b94d212..97b5edb 100644
--- a/src/gui/widgets/FontRequester.h
+++ b/src/gui/widgets/FontRequester.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/IconButton.cpp b/src/gui/widgets/IconButton.cpp
index 5270b99..698661a 100644
--- a/src/gui/widgets/IconButton.cpp
+++ b/src/gui/widgets/IconButton.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/IconButton.h b/src/gui/widgets/IconButton.h
index 4426e95..31c511f 100644
--- a/src/gui/widgets/IconButton.h
+++ b/src/gui/widgets/IconButton.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/IconStackedWidget.cpp b/src/gui/widgets/IconStackedWidget.cpp
index 93208a8..375b07e 100644
--- a/src/gui/widgets/IconStackedWidget.cpp
+++ b/src/gui/widgets/IconStackedWidget.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/IconStackedWidget.h b/src/gui/widgets/IconStackedWidget.h
index 2efe751..de2c759 100644
--- a/src/gui/widgets/IconStackedWidget.h
+++ b/src/gui/widgets/IconStackedWidget.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/InputDialog.cpp b/src/gui/widgets/InputDialog.cpp
index db719d1..b5d691b 100644
--- a/src/gui/widgets/InputDialog.cpp
+++ b/src/gui/widgets/InputDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/InputDialog.h b/src/gui/widgets/InputDialog.h
index 764b069..bff9a87 100644
--- a/src/gui/widgets/InputDialog.h
+++ b/src/gui/widgets/InputDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/InstrumentAliasButton.cpp b/src/gui/widgets/InstrumentAliasButton.cpp
index f128d60..6f64c73 100644
--- a/src/gui/widgets/InstrumentAliasButton.cpp
+++ b/src/gui/widgets/InstrumentAliasButton.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/InstrumentAliasButton.h b/src/gui/widgets/InstrumentAliasButton.h
index 8bd8340..9d1f1d3 100644
--- a/src/gui/widgets/InstrumentAliasButton.h
+++ b/src/gui/widgets/InstrumentAliasButton.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Label.cpp b/src/gui/widgets/Label.cpp
index 3b2f08e..c25a023 100644
--- a/src/gui/widgets/Label.cpp
+++ b/src/gui/widgets/Label.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Label.h b/src/gui/widgets/Label.h
index 9e91ee7..aa082e1 100644
--- a/src/gui/widgets/Label.h
+++ b/src/gui/widgets/Label.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Led.cpp b/src/gui/widgets/Led.cpp
index d90469d..e1ce334 100644
--- a/src/gui/widgets/Led.cpp
+++ b/src/gui/widgets/Led.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is based on KLed from the KDE libraries
Copyright (C) 1998 Jörg Habenicht (j.habenicht at europemail.com)
diff --git a/src/gui/widgets/Led.h b/src/gui/widgets/Led.h
index 39cd08c..8ce00d0 100644
--- a/src/gui/widgets/Led.h
+++ b/src/gui/widgets/Led.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is based on KLed from the KDE libraries
Copyright (C) 1998 Jörg Habenicht (j.habenicht at europemail.com)
diff --git a/src/gui/widgets/LedButton.cpp b/src/gui/widgets/LedButton.cpp
index fb3db9b..e51f30b 100644
--- a/src/gui/widgets/LedButton.cpp
+++ b/src/gui/widgets/LedButton.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file based on code from KMix
Copyright (C) 2000 Stefan Schimanski <1Stein at gmx.de>.
diff --git a/src/gui/widgets/LedButton.h b/src/gui/widgets/LedButton.h
index 9cde148..3cce315 100644
--- a/src/gui/widgets/LedButton.h
+++ b/src/gui/widgets/LedButton.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file based on code from KMix
Copyright (C) 2000 Stefan Schimanski <1Stein at gmx.de>.
diff --git a/src/gui/widgets/LilyVersionAwareCheckBox.cpp b/src/gui/widgets/LilyVersionAwareCheckBox.cpp
index 7cf649e..06a3397 100644
--- a/src/gui/widgets/LilyVersionAwareCheckBox.cpp
+++ b/src/gui/widgets/LilyVersionAwareCheckBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/LilyVersionAwareCheckBox.h b/src/gui/widgets/LilyVersionAwareCheckBox.h
index d6ba795..4252812 100644
--- a/src/gui/widgets/LilyVersionAwareCheckBox.h
+++ b/src/gui/widgets/LilyVersionAwareCheckBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/LineEdit.cpp b/src/gui/widgets/LineEdit.cpp
index 78a74c3..88ca425 100644
--- a/src/gui/widgets/LineEdit.cpp
+++ b/src/gui/widgets/LineEdit.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/LineEdit.h b/src/gui/widgets/LineEdit.h
index b268b0d..bea776c 100644
--- a/src/gui/widgets/LineEdit.h
+++ b/src/gui/widgets/LineEdit.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/MidiFaderWidget.cpp b/src/gui/widgets/MidiFaderWidget.cpp
index 49a856d..8612015 100644
--- a/src/gui/widgets/MidiFaderWidget.cpp
+++ b/src/gui/widgets/MidiFaderWidget.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/MidiFaderWidget.h b/src/gui/widgets/MidiFaderWidget.h
index 1ab2b0a..b9f47ac 100644
--- a/src/gui/widgets/MidiFaderWidget.h
+++ b/src/gui/widgets/MidiFaderWidget.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Panned.cpp b/src/gui/widgets/Panned.cpp
index 1292b42..cce9a70 100644
--- a/src/gui/widgets/Panned.cpp
+++ b/src/gui/widgets/Panned.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Panned.h b/src/gui/widgets/Panned.h
index 8994861..81e6c60 100644
--- a/src/gui/widgets/Panned.h
+++ b/src/gui/widgets/Panned.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Panner.cpp b/src/gui/widgets/Panner.cpp
index 60fce36..e9fdc28 100644
--- a/src/gui/widgets/Panner.cpp
+++ b/src/gui/widgets/Panner.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Panner.h b/src/gui/widgets/Panner.h
index 1f4232e..380e3bb 100644
--- a/src/gui/widgets/Panner.h
+++ b/src/gui/widgets/Panner.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/PitchChooser.cpp b/src/gui/widgets/PitchChooser.cpp
index 5ad23ff..61c11fd 100644
--- a/src/gui/widgets/PitchChooser.cpp
+++ b/src/gui/widgets/PitchChooser.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/PitchChooser.h b/src/gui/widgets/PitchChooser.h
index b0674e7..b39d43e 100644
--- a/src/gui/widgets/PitchChooser.h
+++ b/src/gui/widgets/PitchChooser.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/PitchDragLabel.cpp b/src/gui/widgets/PitchDragLabel.cpp
index db5f775..80585af 100644
--- a/src/gui/widgets/PitchDragLabel.cpp
+++ b/src/gui/widgets/PitchDragLabel.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/PitchDragLabel.h b/src/gui/widgets/PitchDragLabel.h
index 6a3a48a..0f20bda 100644
--- a/src/gui/widgets/PitchDragLabel.h
+++ b/src/gui/widgets/PitchDragLabel.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp
index 9048af2..dc9499f 100644
--- a/src/gui/widgets/PluginControl.cpp
+++ b/src/gui/widgets/PluginControl.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/PluginControl.h b/src/gui/widgets/PluginControl.h
index f71cf37..2d3a6a5 100644
--- a/src/gui/widgets/PluginControl.h
+++ b/src/gui/widgets/PluginControl.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/PluginPushButton.cpp b/src/gui/widgets/PluginPushButton.cpp
index 3880677..538852a 100644
--- a/src/gui/widgets/PluginPushButton.cpp
+++ b/src/gui/widgets/PluginPushButton.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/PluginPushButton.h b/src/gui/widgets/PluginPushButton.h
index dbba381..df762ac 100644
--- a/src/gui/widgets/PluginPushButton.h
+++ b/src/gui/widgets/PluginPushButton.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ProgressBar.cpp b/src/gui/widgets/ProgressBar.cpp
index b35a1c2..9c3b6ec 100644
--- a/src/gui/widgets/ProgressBar.cpp
+++ b/src/gui/widgets/ProgressBar.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ProgressBar.h b/src/gui/widgets/ProgressBar.h
index e4187b0..5e6ce24 100644
--- a/src/gui/widgets/ProgressBar.h
+++ b/src/gui/widgets/ProgressBar.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ProgressDialog.cpp b/src/gui/widgets/ProgressDialog.cpp
index 17f098c..f70b3d9 100644
--- a/src/gui/widgets/ProgressDialog.cpp
+++ b/src/gui/widgets/ProgressDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ProgressDialog.h b/src/gui/widgets/ProgressDialog.h
index bdd7846..19b778c 100644
--- a/src/gui/widgets/ProgressDialog.h
+++ b/src/gui/widgets/ProgressDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index fed7c71..12005ab 100644
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -19,6 +19,7 @@
#include "QuantizeParameters.h"
#include "misc/Strings.h"
+#include "misc/ConfigGroups.h"
#include "base/NotationTypes.h"
#include "base/Quantizer.h"
#include "base/BasicQuantizer.h"
@@ -50,13 +51,12 @@ namespace Rosegarden
QuantizeParameters::QuantizeParameters(QWidget *parent,
QuantizerType defaultQuantizer,
- bool showNotationOption,
- QString configCategory) :
+ bool showNotationOption) :
QFrame(parent),
- m_configCategory(configCategory),
- m_standardQuantizations
- (BasicQuantizer::getStandardQuantizations())
+ m_standardQuantizations(BasicQuantizer::getStandardQuantizations())
{
+ m_inNotation = (defaultQuantizer == Notation);
+
m_mainLayout = new QVBoxLayout;
m_mainLayout->setSpacing(5);
setContentsMargins(5, 5, 5, 5);
@@ -166,59 +166,37 @@ QuantizeParameters::QuantizeParameters(QWidget *parent,
timeT defaultUnit =
Note(Note::Demisemiquaver).getDuration();
- if (!m_configCategory.isEmpty()) {
- if (defaultQuantizer == Notation)
- m_configCategory = "Quantize Dialog Notation";
- else
- m_configCategory = "Quantize Dialog Grid";
- }
-
int defaultSwing = 0;
int defaultIterate = 100;
- if (!m_configCategory.isEmpty()) {
- QSettings settings;
- settings.beginGroup( m_configCategory );
-
- defaultType = settings.value("quantizetype", (defaultQuantizer == Notation)
- ? 2 : (defaultQuantizer == Legato) ? 1 : 0).toInt();
- defaultUnit = settings.value("quantizeunit", static_cast<unsigned long long>(defaultUnit)).toInt();
- defaultSwing = settings.value("quantizeswing", defaultSwing).toInt();
- defaultIterate = settings.value("quantizeiterate", defaultIterate).toInt();
- m_notationTarget->setChecked(qStrToBool(settings.value
- ("quantizenotationonly", (defaultQuantizer == Notation))));
- m_durationCheckBox->setChecked(qStrToBool(settings.value
- ("quantizedurations", "false")));
- m_simplicityCombo->setCurrentIndex(settings.value
- ("quantizesimplicity", 13).toInt() - 11);
- m_maxTuplet->setCurrentIndex(settings.value
- ("quantizemaxtuplet", 3).toInt() - 1);
- m_counterpoint->setChecked(qStrToBool(settings.value
- ("quantizecounterpoint", "false" )));
- m_rebeam->setChecked(qStrToBool(settings.value
- ("quantizerebeam", "true")));
- m_makeViable->setChecked(qStrToBool(settings.value
- ("quantizemakeviable", "false")));
- m_deCounterpoint->setChecked(qStrToBool(settings.value
- ("quantizedecounterpoint", "false")));
- m_articulate->setChecked(qStrToBool(settings.value
- ("quantizearticulate", "true")));
-
- settings.endGroup();
- } else {
- defaultType =
- (defaultQuantizer == Notation) ? 2 :
- (defaultQuantizer == Legato) ? 1 : 0;
- m_notationTarget->setChecked(defaultQuantizer == Notation);
- m_durationCheckBox->setChecked(false);
- m_simplicityCombo->setCurrentIndex(2);
- m_maxTuplet->setCurrentIndex(2);
- m_counterpoint->setChecked(false);
- m_rebeam->setChecked(true);
- m_makeViable->setChecked(defaultQuantizer == Notation);
- m_deCounterpoint->setChecked(defaultQuantizer == Notation);
- m_articulate->setChecked(true);
- }
+ QSettings settings;
+ settings.beginGroup(m_inNotation ? NotationQuantizeConfigGroup : GridQuantizeConfigGroup);
+
+ defaultType = settings.value("quantizetype", (defaultQuantizer == Notation)
+ ? 2 : (defaultQuantizer == Legato) ? 1 : 0).toInt();
+ defaultUnit = settings.value("quantizeunit", static_cast<unsigned long long>(defaultUnit)).toInt();
+ defaultSwing = settings.value("quantizeswing", defaultSwing).toInt();
+ defaultIterate = settings.value("quantizeiterate", defaultIterate).toInt();
+ m_notationTarget->setChecked(qStrToBool(settings.value
+ ("quantizenotationonly", (defaultQuantizer == Notation))));
+ m_durationCheckBox->setChecked(qStrToBool(settings.value
+ ("quantizedurations", "false")));
+ m_simplicityCombo->setCurrentIndex(settings.value
+ ("quantizesimplicity", 13).toInt() - 11);
+ m_maxTuplet->setCurrentIndex(settings.value
+ ("quantizemaxtuplet", 3).toInt() - 1);
+ m_counterpoint->setChecked(qStrToBool(settings.value
+ ("quantizecounterpoint", "false" )));
+ m_rebeam->setChecked(qStrToBool(settings.value
+ ("quantizerebeam", "true")));
+ m_makeViable->setChecked(qStrToBool(settings.value
+ ("quantizemakeviable", "false")));
+ m_deCounterpoint->setChecked(qStrToBool(settings.value
+ ("quantizedecounterpoint", "false")));
+ m_articulate->setChecked(qStrToBool(settings.value
+ ("quantizearticulate", "true")));
+
+ settings.endGroup();
m_postProcessingBox->show();
@@ -360,35 +338,33 @@ QuantizeParameters::getQuantizer() const
quantizer = nq;
}
- if (!m_configCategory.isEmpty()) {
- QSettings settings;
- settings.beginGroup( m_configCategory );
-
- settings.setValue("quantizetype", type);
- settings.setValue("quantizeunit", static_cast<unsigned long long>(unit));
- settings.setValue("quantizeswing", swing);
- settings.setValue("quantizeiterate", iterate);
- settings.setValue("quantizenotationonly",
- m_notationTarget->isChecked());
- if (type == 0) {
- settings.setValue("quantizedurations",
- m_durationCheckBox->isChecked());
- } else {
- settings.setValue("quantizesimplicity",
- m_simplicityCombo->currentIndex() + 11);
- settings.setValue("quantizemaxtuplet",
- m_maxTuplet->currentIndex() + 1);
- settings.setValue("quantizecounterpoint",
- m_counterpoint->isChecked());
- settings.setValue("quantizearticulate",
- m_articulate->isChecked());
- }
- settings.setValue("quantizerebeam", m_rebeam->isChecked());
- settings.setValue("quantizemakeviable", m_makeViable->isChecked());
- settings.setValue("quantizedecounterpoint", m_deCounterpoint->isChecked());
+ QSettings settings;
+ settings.beginGroup(m_inNotation ? NotationQuantizeConfigGroup : GridQuantizeConfigGroup);
- settings.endGroup();
+ settings.setValue("quantizetype", type);
+ settings.setValue("quantizeunit", static_cast<unsigned long long>(unit));
+ settings.setValue("quantizeswing", swing);
+ settings.setValue("quantizeiterate", iterate);
+ settings.setValue("quantizenotationonly",
+ m_notationTarget->isChecked());
+ if (type == 0) {
+ settings.setValue("quantizedurations",
+ m_durationCheckBox->isChecked());
+ } else {
+ settings.setValue("quantizesimplicity",
+ m_simplicityCombo->currentIndex() + 11);
+ settings.setValue("quantizemaxtuplet",
+ m_maxTuplet->currentIndex() + 1);
+ settings.setValue("quantizecounterpoint",
+ m_counterpoint->isChecked());
+ settings.setValue("quantizearticulate",
+ m_articulate->isChecked());
}
+ settings.setValue("quantizerebeam", m_rebeam->isChecked());
+ settings.setValue("quantizemakeviable", m_makeViable->isChecked());
+ settings.setValue("quantizedecounterpoint", m_deCounterpoint->isChecked());
+
+ settings.endGroup();
return quantizer;
}
diff --git a/src/gui/widgets/QuantizeParameters.h b/src/gui/widgets/QuantizeParameters.h
index 7f1cbd2..cb1fd05 100644
--- a/src/gui/widgets/QuantizeParameters.h
+++ b/src/gui/widgets/QuantizeParameters.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -48,12 +48,10 @@ public:
QuantizeParameters(QWidget *parent,
QuantizerType defaultQuantizer,
- bool showNotationOption,
- QString configCategory);
+ bool showNotationOption);
/**
* Returned quantizer object is on heap -- caller must delete.
- * Also writes values to KConfig if so requested in constructor.
*/
Quantizer *getQuantizer() const;
@@ -68,9 +66,8 @@ public slots:
void slotTypeChanged(int);
protected:
- QString m_configCategory;
-
std::vector<timeT> m_standardQuantizations;
+ bool m_inNotation;
QVBoxLayout *m_mainLayout;
diff --git a/src/gui/widgets/RosegardenPopupMenu.h b/src/gui/widgets/RosegardenPopupMenu.h
index 62a6146..d403d4a 100644
--- a/src/gui/widgets/RosegardenPopupMenu.h
+++ b/src/gui/widgets/RosegardenPopupMenu.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp
index ee83c57..db5cbcc 100644
--- a/src/gui/widgets/Rotary.cpp
+++ b/src/gui/widgets/Rotary.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -443,15 +443,13 @@ Rotary::mousePressEvent(QMouseEvent *e)
m_buttonPressed = true;
m_lastY = e->y();
m_lastX = e->x();
- } else if (e->button() == Qt::MidButton) // reset to default
- {
- m_position = m_initialPosition;
+ } else if (e->button() == Qt::MidButton) { // reset to centre position
+ m_position = (m_maximum + m_minimum) / 2.0;
snapPosition();
update();
emit valueChanged(m_snapPosition);
- } else if (e->button() == Qt::RightButton) // reset to centre position
- {
- m_position = (m_maximum + m_minimum) / 2.0;
+ } else if (e->button() == Qt::RightButton) { // reset to default
+ m_position = m_initialPosition;
snapPosition();
update();
emit valueChanged(m_snapPosition);
diff --git a/src/gui/widgets/Rotary.h b/src/gui/widgets/Rotary.h
index 0ad3992..199897a 100644
--- a/src/gui/widgets/Rotary.h
+++ b/src/gui/widgets/Rotary.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -83,10 +83,19 @@ public:
void setKnobColour(const QColor &colour);
QColor getKnobColour() const { return m_knobColour; }
- // Centered status
- //
- bool getCentered() const { return m_centred; }
+ /// Set "distance from center" mode.
+ /**
+ * In centered mode, the rotary shows the distance from the
+ * center (12 o'clock) around the outside. This is useful for
+ * pan and eq controls where the 12 o'clock position is the default.
+ *
+ * When not in centered mode, the distance from minimum is shown
+ * around the outside of the rotary. This is appropriate for
+ * volume.
+ */
void setCentered(bool centred);
+ /// Are we in "distance from center" mode?
+ bool getCentered() const { return m_centred; }
signals:
void valueChanged(float);
diff --git a/src/gui/widgets/ScrollBox.cpp b/src/gui/widgets/ScrollBox.cpp
index d3b6952..6ac344b 100644
--- a/src/gui/widgets/ScrollBox.cpp
+++ b/src/gui/widgets/ScrollBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is based on code from KGhostView, Copyright 1997-2002
Markkhu Hihnala <mah at ee.oulu.fi>
diff --git a/src/gui/widgets/ScrollBox.h b/src/gui/widgets/ScrollBox.h
index f9646a7..7729407 100644
--- a/src/gui/widgets/ScrollBox.h
+++ b/src/gui/widgets/ScrollBox.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is based on code from KGhostView, Copyright 1997-2002
Markkhu Hihnala <mah at ee.oulu.fi>
diff --git a/src/gui/widgets/ScrollBoxDialog.cpp b/src/gui/widgets/ScrollBoxDialog.cpp
index 50d6824..39f5e29 100644
--- a/src/gui/widgets/ScrollBoxDialog.cpp
+++ b/src/gui/widgets/ScrollBoxDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ScrollBoxDialog.h b/src/gui/widgets/ScrollBoxDialog.h
index 44e5df6..a7c8435 100644
--- a/src/gui/widgets/ScrollBoxDialog.h
+++ b/src/gui/widgets/ScrollBoxDialog.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/SqueezedLabel.cpp b/src/gui/widgets/SqueezedLabel.cpp
index a8d1dd6..f6e780d 100644
--- a/src/gui/widgets/SqueezedLabel.cpp
+++ b/src/gui/widgets/SqueezedLabel.cpp
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/widgets/SqueezedLabel.h b/src/gui/widgets/SqueezedLabel.h
index 45674bd..6a069f2 100644
--- a/src/gui/widgets/SqueezedLabel.h
+++ b/src/gui/widgets/SqueezedLabel.h
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/widgets/StartupLogo.cpp b/src/gui/widgets/StartupLogo.cpp
index 7f91df1..578596f 100644
--- a/src/gui/widgets/StartupLogo.cpp
+++ b/src/gui/widgets/StartupLogo.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file contains code borrowed from KDevelop 2.0
diff --git a/src/gui/widgets/StartupLogo.h b/src/gui/widgets/StartupLogo.h
index cbb8468..48e2f83 100644
--- a/src/gui/widgets/StartupLogo.h
+++ b/src/gui/widgets/StartupLogo.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This file contains code borrowed from KDevelop 2.0
diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp
index a355898..3e2a596 100644
--- a/src/gui/widgets/TextFloat.cpp
+++ b/src/gui/widgets/TextFloat.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/TextFloat.h b/src/gui/widgets/TextFloat.h
index a308c29..8345093 100644
--- a/src/gui/widgets/TextFloat.h
+++ b/src/gui/widgets/TextFloat.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/Thumbwheel.cpp b/src/gui/widgets/Thumbwheel.cpp
index 942b3c9..680d3d1 100644
--- a/src/gui/widgets/Thumbwheel.cpp
+++ b/src/gui/widgets/Thumbwheel.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2007 Queen
Mary, University of London.
diff --git a/src/gui/widgets/Thumbwheel.h b/src/gui/widgets/Thumbwheel.h
index e2fb495..aa4ee07 100644
--- a/src/gui/widgets/Thumbwheel.h
+++ b/src/gui/widgets/Thumbwheel.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file originally from Sonic Visualiser, copyright 2007 Queen
Mary, University of London.
diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp
index e381d28..166baf6 100644
--- a/src/gui/widgets/TimeWidget.cpp
+++ b/src/gui/widgets/TimeWidget.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/TimeWidget.h b/src/gui/widgets/TimeWidget.h
index 26e1ff1..92df700 100644
--- a/src/gui/widgets/TimeWidget.h
+++ b/src/gui/widgets/TimeWidget.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/TmpStatusMsg.cpp b/src/gui/widgets/TmpStatusMsg.cpp
index 133bbcd..b837ac6 100644
--- a/src/gui/widgets/TmpStatusMsg.cpp
+++ b/src/gui/widgets/TmpStatusMsg.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/widgets/TmpStatusMsg.h b/src/gui/widgets/TmpStatusMsg.h
index 91f231f..ec6c886 100644
--- a/src/gui/widgets/TmpStatusMsg.h
+++ b/src/gui/widgets/TmpStatusMsg.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/gui/widgets/TristateCheckBox.cpp b/src/gui/widgets/TristateCheckBox.cpp
index cf86fe6..1c7ff32 100644
--- a/src/gui/widgets/TristateCheckBox.cpp
+++ b/src/gui/widgets/TristateCheckBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/TristateCheckBox.h b/src/gui/widgets/TristateCheckBox.h
index 4306087..fdc3114 100644
--- a/src/gui/widgets/TristateCheckBox.h
+++ b/src/gui/widgets/TristateCheckBox.h
@@ -4,7 +4,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/VUMeter.cpp b/src/gui/widgets/VUMeter.cpp
index 672b69d..95a5439 100644
--- a/src/gui/widgets/VUMeter.cpp
+++ b/src/gui/widgets/VUMeter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/VUMeter.h b/src/gui/widgets/VUMeter.h
index 904c7f4..29e6cdc 100644
--- a/src/gui/widgets/VUMeter.h
+++ b/src/gui/widgets/VUMeter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/WarningDialog.cpp b/src/gui/widgets/WarningDialog.cpp
index 680691b..5b54ec0 100644
--- a/src/gui/widgets/WarningDialog.cpp
+++ b/src/gui/widgets/WarningDialog.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/WarningDialog.h b/src/gui/widgets/WarningDialog.h
index 41fe57b..075d6a8 100644
--- a/src/gui/widgets/WarningDialog.h
+++ b/src/gui/widgets/WarningDialog.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/WarningGroupBox.cpp b/src/gui/widgets/WarningGroupBox.cpp
index f7fc6b1..8d1b5a2 100644
--- a/src/gui/widgets/WarningGroupBox.cpp
+++ b/src/gui/widgets/WarningGroupBox.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/WarningGroupBox.h b/src/gui/widgets/WarningGroupBox.h
index 12ddf1f..aebfee1 100644
--- a/src/gui/widgets/WarningGroupBox.h
+++ b/src/gui/widgets/WarningGroupBox.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/WarningWidget.cpp b/src/gui/widgets/WarningWidget.cpp
index 909373c..757c3cd 100644
--- a/src/gui/widgets/WarningWidget.cpp
+++ b/src/gui/widgets/WarningWidget.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/WarningWidget.h b/src/gui/widgets/WarningWidget.h
index 56177dd..ee78d40 100644
--- a/src/gui/widgets/WarningWidget.h
+++ b/src/gui/widgets/WarningWidget.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/WheelyButton.cpp b/src/gui/widgets/WheelyButton.cpp
index 9a1934f..7bc2c01 100644
--- a/src/gui/widgets/WheelyButton.cpp
+++ b/src/gui/widgets/WheelyButton.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/WheelyButton.h b/src/gui/widgets/WheelyButton.h
index 1436903..1110b0e 100644
--- a/src/gui/widgets/WheelyButton.h
+++ b/src/gui/widgets/WheelyButton.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ZoomSlider.cpp b/src/gui/widgets/ZoomSlider.cpp
index dad7faa..0a6db43 100644
--- a/src/gui/widgets/ZoomSlider.cpp
+++ b/src/gui/widgets/ZoomSlider.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/gui/widgets/ZoomSlider.h b/src/gui/widgets/ZoomSlider.h
index df5aea2..ff64ffd 100644
--- a/src/gui/widgets/ZoomSlider.h
+++ b/src/gui/widgets/ZoomSlider.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/misc/AppendLabel.cpp b/src/misc/AppendLabel.cpp
index a257297..8bf3d26 100644
--- a/src/misc/AppendLabel.cpp
+++ b/src/misc/AppendLabel.cpp
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/misc/AppendLabel.h b/src/misc/AppendLabel.h
index 96de2ee..731655d 100644
--- a/src/misc/AppendLabel.h
+++ b/src/misc/AppendLabel.h
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/misc/ConfigGroups.cpp b/src/misc/ConfigGroups.cpp
index 6c0fed0..6df041a 100644
--- a/src/misc/ConfigGroups.cpp
+++ b/src/misc/ConfigGroups.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -57,4 +57,6 @@ namespace Rosegarden
const char* const PitchBendSequenceConfigGroup = "PitchBendSequence";
const char* const CheckButtonConfigGroup = "CheckButton_Memory";
const char* const SelectDialogConfigGroup = "SelectDialog_Memory";
+ const char* const GridQuantizeConfigGroup = "Grid_Quantize_Parameters_Memory";
+ const char* const NotationQuantizeConfigGroup = "Notation_Quantize_Parameters_Memory";
}
diff --git a/src/misc/ConfigGroups.h b/src/misc/ConfigGroups.h
index fa699b8..512fca1 100644
--- a/src/misc/ConfigGroups.h
+++ b/src/misc/ConfigGroups.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -60,6 +60,8 @@ namespace Rosegarden
extern const char* const PitchBendSequenceConfigGroup;
extern const char* const CheckButtonConfigGroup;
extern const char* const SelectDialogConfigGroup;
+ extern const char* const GridQuantizeConfigGroup;
+ extern const char* const NotationQuantizeConfigGroup;
}
#endif
diff --git a/src/misc/Debug.cpp b/src/misc/Debug.cpp
index b9f7206..104a3ed 100644
--- a/src/misc/Debug.cpp
+++ b/src/misc/Debug.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/misc/Debug.h b/src/misc/Debug.h
index 11fd792..58758e2 100644
--- a/src/misc/Debug.h
+++ b/src/misc/Debug.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/misc/Strings.cpp b/src/misc/Strings.cpp
index 8d57f63..c70c7db 100644
--- a/src/misc/Strings.cpp
+++ b/src/misc/Strings.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/misc/Strings.h b/src/misc/Strings.h
index 601c024..333fd3e 100644
--- a/src/misc/Strings.h
+++ b/src/misc/Strings.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/misc/TempDir.cpp b/src/misc/TempDir.cpp
new file mode 100644
index 0000000..e0947b2
--- /dev/null
+++ b/src/misc/TempDir.cpp
@@ -0,0 +1,44 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
+
+/*
+ Rosegarden
+ A MIDI and audio sequencer and musical notation editor.
+ Copyright 2000-2015 the Rosegarden development team.
+
+ Other copyrights also apply to some parts of this work. Please
+ see the AUTHORS file and individual file headers for details.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version. See the file
+ COPYING included with this distribution for more information.
+*/
+
+#define RG_MODULE_STRING "[TempDir]"
+
+#include "TempDir.h"
+
+#include <QDir>
+
+namespace Rosegarden
+{
+
+
+QString TempDir::path()
+{
+ QString tempPath = QDir::tempPath() + "/rosegarden/";
+
+ // Make sure the path exists.
+ static bool made = false;
+ if (!made) {
+ QDir dir;
+ dir.mkpath(tempPath);
+ made = true;
+ }
+
+ return tempPath;
+}
+
+
+} // namespace Rosegarden
diff --git a/src/document/GzipFile.h b/src/misc/TempDir.h
similarity index 69%
copy from src/document/GzipFile.h
copy to src/misc/TempDir.h
index abdecea..7ea17e3 100644
--- a/src/document/GzipFile.h
+++ b/src/misc/TempDir.h
@@ -3,11 +3,11 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
-
+ Copyright 2000-2015 the Rosegarden development team.
+
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
-
+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
@@ -15,18 +15,24 @@
COPYING included with this distribution for more information.
*/
+#ifndef RG_TEMPDIR_H
+#define RG_TEMPDIR_H
+
#include <QString>
namespace Rosegarden
{
-class GzipFile
+
+/// Provides a standard default temporary directory location.
+class TempDir
{
public:
- static bool writeToFile(QString file, QString text);
- static bool readFromFile(QString file, QString &text);
+ /// Use this instead of QDir::tempPath().
+ static QString path();
};
-}
+} // namespace Rosegarden
+#endif /* RG_TEMPDIR_H */
diff --git a/src/misc/Version.cpp b/src/misc/Version.cpp
index 0d8d9e8..77306a1 100644
--- a/src/misc/Version.cpp
+++ b/src/misc/Version.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/misc/Version.h b/src/misc/Version.h
index 724bce6..7423266 100644
--- a/src/misc/Version.h
+++ b/src/misc/Version.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sequencer/RosegardenSequencer.cpp b/src/sequencer/RosegardenSequencer.cpp
index 7120a0b..fb9c75b 100644
--- a/src/sequencer/RosegardenSequencer.cpp
+++ b/src/sequencer/RosegardenSequencer.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sequencer/RosegardenSequencer.h b/src/sequencer/RosegardenSequencer.h
index 45167de..dff4f09 100644
--- a/src/sequencer/RosegardenSequencer.h
+++ b/src/sequencer/RosegardenSequencer.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sequencer/RosegardenSequencerIface.h b/src/sequencer/RosegardenSequencerIface.h
index 1389cae..2b9262d 100644
--- a/src/sequencer/RosegardenSequencerIface.h
+++ b/src/sequencer/RosegardenSequencerIface.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sequencer/SequencerThread.cpp b/src/sequencer/SequencerThread.cpp
index b264649..fa4358a 100644
--- a/src/sequencer/SequencerThread.cpp
+++ b/src/sequencer/SequencerThread.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sequencer/SequencerThread.h b/src/sequencer/SequencerThread.h
index ad056f6..7164713 100644
--- a/src/sequencer/SequencerThread.h
+++ b/src/sequencer/SequencerThread.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp
index c0000a3..c314e40 100644
--- a/src/sound/AlsaDriver.cpp
+++ b/src/sound/AlsaDriver.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -34,14 +34,17 @@
#include "Midi.h"
#include "MappedStudio.h"
#include "misc/Strings.h"
+#include "misc/ConfigGroups.h"
#include "MappedCommon.h"
#include "MappedEvent.h"
#include "Audit.h"
#include "AudioPlayQueue.h"
#include "ExternalTransport.h"
-#include <QRegExp>
#include <QMutex>
+#include <QRegExp>
+#include <QSettings>
+#include <QTime>
#include <pthread.h>
@@ -111,13 +114,24 @@ AlsaDriver::AlsaDriver(MappedStudio *studio):
m_doTimerChecks(false),
m_firstTimerCheck(true),
m_timerRatio(0),
- m_timerRatioCalculated(false)
-
+ m_timerRatioCalculated(false),
+ m_debug(false)
{
Audit audit;
audit << "Rosegarden " << VERSION << " - AlsaDriver " << m_name << std::endl;
m_pendSysExcMap = new DeviceEventMap();
std::cerr << "AlsaDriver::AlsaDriver [begin]" << std::endl;
+
+#ifndef NDEBUG
+ // Debugging Mode
+ QSettings settings;
+ settings.beginGroup(GeneralOptionsConfigGroup);
+ const QString debugAlsaDriver = "debug_AlsaDriver";
+ m_debug = settings.value(debugAlsaDriver, false).toBool();
+ // Write it to the file to make it easier to find.
+ settings.setValue(debugAlsaDriver, m_debug);
+ settings.endGroup();
+#endif
}
AlsaDriver::~AlsaDriver()
@@ -3519,12 +3533,42 @@ AlsaDriver::processMidiOut(const MappedEventList &mC,
// NB the MappedEventList is implicitly ordered by time (std::multiset)
- // For each event
+ // For each incoming mapped event
+ // ??? "i" is a bit hard to follow in this huge 400-line loop. How about
+ // we dereference it at the top and never use "(*i)" again:
+ // const MappedEvent *mappedEvent = (*i);
+ // Might shave off a CPU cycle or two as a bonus.
for (MappedEventList::const_iterator i = mC.begin(); i != mC.end(); ++i) {
// Skip all non-MIDI events.
if ((*i)->getType() >= MappedEvent::Audio)
continue;
+ if ((*i)->getType() == MappedEvent::MidiNote &&
+ (*i)->getDuration() == RealTime::zeroTime &&
+ (*i)->getVelocity() == 0) {
+ // NOTE OFF with duration zero is scheduled from the
+ // internal segment mapper and we don't use that message
+ // in realtime otherwise it is a duplicate.
+ // When we receive a NOTE OFF message from MIDI input, the
+ // duration is never zero but at least 1 msec (see the case
+ // for SND_SEQ_EVENT_NOTEOFF in getMappedEventList).
+ continue;
+ }
+
+ bool debug = throttledDebug();
+ if (debug) {
+ RG_DEBUG << "AlsaDriver::processMidiOut() for each event...";
+ QString eventType = "unknown";
+ switch ((*i)->getType()) {
+ case MappedEvent::MidiNote: eventType = "MidiNote"; break;
+ case MappedEvent::MidiNoteOneShot: eventType = "MidiNoteOneShot"; break;
+ case MappedEvent::MidiController: eventType = "MidiController"; break;
+ default: break;
+ }
+ RG_DEBUG << " MappedEvent Event Type: " << (*i)->getType() << " (" << eventType << ")";
+ }
+
+ // ??? rename: alsaEvent
snd_seq_event_t event;
snd_seq_ev_clear(&event);
@@ -3592,15 +3636,13 @@ AlsaDriver::processMidiOut(const MappedEventList &mC,
processNotesOff(outputTime, now);
-#ifdef HAVE_LIBJACK
+#if defined(DEBUG_PROCESS_MIDI_OUT) && defined(HAVE_LIBJACK)
if (m_jackDriver) {
size_t frameCount = m_jackDriver->getFramesProcessed();
size_t elapsed = frameCount - debug_jack_frame_count;
RealTime rt = RealTime::frame2RealTime(elapsed, m_jackDriver->getSampleRate());
rt = rt - getAlsaTime();
-#ifdef DEBUG_PROCESS_MIDI_OUT
std::cout << "processMidiOut[" << now << "]: JACK time is " << rt << " ahead of ALSA time" << std::endl;
-#endif
}
#endif
@@ -3674,26 +3716,6 @@ AlsaDriver::processMidiOut(const MappedEventList &mC,
switch ((*i)->getType()) {
- case MappedEvent::MidiNoteOneShot:
- {
- snd_seq_ev_set_noteon(&event,
- channel,
- (*i)->getPitch(),
- (*i)->getVelocity());
- needNoteOff = true;
-
- if (!isSoftSynth) {
- LevelInfo info;
- info.level = (*i)->getVelocity();
- info.levelRight = 0;
- SequencerDataBlock::getInstance()->setInstrumentLevel
- ((*i)->getInstrument(), info);
- }
-
- weedRecentNoteOffs((*i)->getPitch(), channel, (*i)->getInstrument());
- }
- break;
-
case MappedEvent::MidiNote:
// We always use plain NOTE ON here, not ALSA
// time+duration notes, because we have our own NOTE
@@ -3701,28 +3723,35 @@ AlsaDriver::processMidiOut(const MappedEventList &mC,
// this function) and we want to ensure it gets used
// for the purposes of e.g. soft synths
//
- if ((*i)->getVelocity() > 0) {
- snd_seq_ev_set_noteon(&event,
- channel,
- (*i)->getPitch(),
- (*i)->getVelocity());
-
- if (!isSoftSynth) {
- LevelInfo info;
- info.level = (*i)->getVelocity();
- info.levelRight = 0;
- SequencerDataBlock::getInstance()->setInstrumentLevel
- ((*i)->getInstrument(), info);
- }
-
- weedRecentNoteOffs((*i)->getPitch(), channel, (*i)->getInstrument());
- } else {
+ if ((*i)->getVelocity() == 0) {
snd_seq_ev_set_noteoff(&event,
channel,
(*i)->getPitch(),
NOTE_OFF_VELOCITY);
+ break;
+ }
+
+ case MappedEvent::MidiNoteOneShot:
+ snd_seq_ev_set_noteon(&event,
+ channel,
+ (*i)->getPitch(),
+ (*i)->getVelocity());
+
+ // NOTE ON from MIDI input is scheduled with duration -1
+ // and we don't use the NOTE OFF stack for MIDI input.
+ if ((*i)->getDuration() > RealTime(-1, 0)) {
+ needNoteOff = true;
+ }
+
+ if (!isSoftSynth) {
+ LevelInfo info;
+ info.level = (*i)->getVelocity();
+ info.levelRight = 0;
+ SequencerDataBlock::getInstance()->setInstrumentLevel
+ ((*i)->getInstrument(), info);
}
+ weedRecentNoteOffs((*i)->getPitch(), channel, (*i)->getInstrument());
break;
case MappedEvent::MidiProgramChange:
@@ -3847,13 +3876,32 @@ AlsaDriver::processMidiOut(const MappedEventList &mC,
continue;
}
+ if (debug) {
+ QString eventType = "unknown";
+ switch (event.type) {
+ case SND_SEQ_EVENT_NOTEON: eventType = "SND_SEQ_EVENT_NOTEON"; break;
+ case SND_SEQ_EVENT_NOTEOFF: eventType = "SND_SEQ_EVENT_NOTEOFF"; break;
+ case SND_SEQ_EVENT_CONTROLLER: eventType = "SND_SEQ_EVENT_CONTROLLER"; break;
+ default: break;
+ }
+ RG_DEBUG << " ALSA event type: " << event.type << " (" << eventType << ")";
+ }
+
if (isSoftSynth) {
+ if (debug)
+ RG_DEBUG << " Calling processSoftSynthEventOut()...";
processSoftSynthEventOut((*i)->getInstrument(), &event, now);
} else {
- checkAlsaError(snd_seq_event_output(m_midiHandle, &event),
- "processMidiOut(): output queued");
+ if (debug)
+ RG_DEBUG << " Calling snd_seq_event_output()...";
+
+ int rc = snd_seq_event_output(m_midiHandle, &event);
+ checkAlsaError(rc, "processMidiOut(): output queued");
+
+ if (debug)
+ RG_DEBUG << " snd_seq_event_output() rc:" << rc;
if (now) {
if (m_queueRunning && !m_playing) {
@@ -3884,7 +3932,7 @@ AlsaDriver::processMidiOut(const MappedEventList &mC,
m_noteOffQueue.insert(noteOffEvent);
}
- }
+ } // for each event
processNotesOff(sliceEnd - m_playStartPosition + m_alsaPlayStartTime, now);
@@ -5375,6 +5423,40 @@ AlsaDriver::versionIsAtLeast(std::string v, int major, int minor, int subminor)
return ok;
}
+bool
+AlsaDriver::throttledDebug() const
+{
+ if (!m_debug)
+ return false;
+
+ static bool active = true;
+ static int count = 0;
+ static QTime timeout;
+
+ // if we are active
+ if (active) {
+ ++count;
+ // if we've done too many
+ if (count > 5) {
+ active = false;
+ timeout = QTime::currentTime().addSecs(5);
+ return false;
+ }
+ return true;
+ } else {
+ // if current time > timeout
+ if (QTime::currentTime() > timeout) {
+ active = true;
+ count = 1;
+ return true;
+ }
+ return false;
+ }
+
+ return false;
+}
+
+
}
diff --git a/src/sound/AlsaDriver.h b/src/sound/AlsaDriver.h
index e4d650c..0aa56a7 100644
--- a/src/sound/AlsaDriver.h
+++ b/src/sound/AlsaDriver.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -12,20 +12,11 @@
COPYING included with this distribution for more information.
*/
-// Specialisation of SoundDriver to support ALSA (http://www.alsa-project.org)
-//
-//
#ifndef RG_ALSADRIVER_H
#define RG_ALSADRIVER_H
-#include <vector>
-#include <set>
-#include <map>
-
#ifdef HAVE_ALSA
-#include <alsa/asoundlib.h> // ALSA
-
#include "SoundDriver.h"
#include "base/Instrument.h"
#include "base/Device.h"
@@ -37,11 +28,19 @@
#include "JackDriver.h"
#endif
+#include <alsa/asoundlib.h> // ALSA
+
#include <QMutex>
+#include <vector>
+#include <set>
+#include <map>
+
namespace Rosegarden
{
+
+/// Specialisation of SoundDriver to support ALSA (http://www.alsa-project.org)
class AlsaDriver : public SoundDriver
{
public:
@@ -629,6 +628,31 @@ private:
*/
MappedEventList m_returnComposition;
+ /// Debugging mode is enabled.
+ /**
+ * Moving debug configuration to run-time to make it a little
+ * easier for users to turn on and off. Downside is the need
+ * for "if (m_debug)" which uses CPU as opposed to #if.
+ *
+ * To enable debugging, do a debug build and set the following
+ * in the Rosegarden.conf file:
+ *
+ * [General_Options]
+ * debug_AlsaDriver=true
+ */
+ bool m_debug;
+
+ /// Reduce the amount of debug output.
+ /**
+ * Debugging real-time code is rather challenging. It's easy to
+ * end up with too much output, and the behavior will change as
+ * the debugging sucks up CPU.
+ *
+ * This function is intended to reduce the amount of debug output
+ * by only allowing output at fixed intervals, and for short
+ * bursts.
+ */
+ bool throttledDebug() const;
};
}
diff --git a/src/sound/AlsaPort.cpp b/src/sound/AlsaPort.cpp
index 54cca2f..d285356 100644
--- a/src/sound/AlsaPort.cpp
+++ b/src/sound/AlsaPort.cpp
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/AlsaPort.h b/src/sound/AlsaPort.h
index 3932278..e733b08 100644
--- a/src/sound/AlsaPort.h
+++ b/src/sound/AlsaPort.h
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/AudioCache.cpp b/src/sound/AudioCache.cpp
index 4361422..5fc7116 100644
--- a/src/sound/AudioCache.cpp
+++ b/src/sound/AudioCache.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/AudioCache.h b/src/sound/AudioCache.h
index 9b44da2..a7d6048 100644
--- a/src/sound/AudioCache.h
+++ b/src/sound/AudioCache.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/AudioFile.cpp b/src/sound/AudioFile.cpp
index bd7dbe6..4870e7b 100644
--- a/src/sound/AudioFile.cpp
+++ b/src/sound/AudioFile.cpp
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/AudioFile.h b/src/sound/AudioFile.h
index 281a107..2f52355 100644
--- a/src/sound/AudioFile.h
+++ b/src/sound/AudioFile.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index 5f357ff..f981468 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/AudioFileManager.h b/src/sound/AudioFileManager.h
index fa1af02..c3058e4 100644
--- a/src/sound/AudioFileManager.h
+++ b/src/sound/AudioFileManager.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/AudioFileTimeStretcher.cpp b/src/sound/AudioFileTimeStretcher.cpp
index a7778e8..d9ae6c6 100644
--- a/src/sound/AudioFileTimeStretcher.cpp
+++ b/src/sound/AudioFileTimeStretcher.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/AudioFileTimeStretcher.h b/src/sound/AudioFileTimeStretcher.h
index 70c4e41..b1ea119 100644
--- a/src/sound/AudioFileTimeStretcher.h
+++ b/src/sound/AudioFileTimeStretcher.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/AudioPlayQueue.cpp b/src/sound/AudioPlayQueue.cpp
index 415c2d6..e697df0 100644
--- a/src/sound/AudioPlayQueue.cpp
+++ b/src/sound/AudioPlayQueue.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/AudioPlayQueue.h b/src/sound/AudioPlayQueue.h
index 3bbd88b..94d57cd 100644
--- a/src/sound/AudioPlayQueue.h
+++ b/src/sound/AudioPlayQueue.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/AudioProcess.cpp b/src/sound/AudioProcess.cpp
index e3208b9..2faa115 100644
--- a/src/sound/AudioProcess.cpp
+++ b/src/sound/AudioProcess.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/AudioProcess.h b/src/sound/AudioProcess.h
index b094bd2..9582e08 100644
--- a/src/sound/AudioProcess.h
+++ b/src/sound/AudioProcess.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/AudioTimeStretcher.h b/src/sound/AudioTimeStretcher.h
index 90c755b..2f88a38 100644
--- a/src/sound/AudioTimeStretcher.h
+++ b/src/sound/AudioTimeStretcher.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/Audit.cpp b/src/sound/Audit.cpp
index 844bce4..847a5c8 100644
--- a/src/sound/Audit.cpp
+++ b/src/sound/Audit.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/Audit.h b/src/sound/Audit.h
index 98870c6..2ced4d3 100644
--- a/src/sound/Audit.h
+++ b/src/sound/Audit.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/BWFAudioFile.cpp b/src/sound/BWFAudioFile.cpp
index 3ef007b..279e32b 100644
--- a/src/sound/BWFAudioFile.cpp
+++ b/src/sound/BWFAudioFile.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/BWFAudioFile.h b/src/sound/BWFAudioFile.h
index 8978ee9..3e8c202 100644
--- a/src/sound/BWFAudioFile.h
+++ b/src/sound/BWFAudioFile.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/ControlBlock.cpp b/src/sound/ControlBlock.cpp
index 8028b98..61ee699 100644
--- a/src/sound/ControlBlock.cpp
+++ b/src/sound/ControlBlock.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/ControlBlock.h b/src/sound/ControlBlock.h
index 5d8bd49..870a138 100644
--- a/src/sound/ControlBlock.h
+++ b/src/sound/ControlBlock.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/DSSIPluginFactory.cpp b/src/sound/DSSIPluginFactory.cpp
index b36a640..62ab8c8 100644
--- a/src/sound/DSSIPluginFactory.cpp
+++ b/src/sound/DSSIPluginFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/DSSIPluginFactory.h b/src/sound/DSSIPluginFactory.h
index cb304de..5922352 100644
--- a/src/sound/DSSIPluginFactory.h
+++ b/src/sound/DSSIPluginFactory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/DSSIPluginInstance.cpp b/src/sound/DSSIPluginInstance.cpp
index b9f2c5e..5217f17 100644
--- a/src/sound/DSSIPluginInstance.cpp
+++ b/src/sound/DSSIPluginInstance.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -874,6 +874,7 @@ DSSIPluginInstance::run(const RealTime &blockTime)
{
static snd_seq_event_t localEventBuffer[EVENT_BUFFER_SIZE];
int evCount = 0;
+ unsigned int evDeferred = 0;
bool needLock = false;
if (m_descriptor->select_program)
@@ -921,7 +922,7 @@ DSSIPluginInstance::run(const RealTime &blockTime)
}
#endif
- while (m_eventBuffer.getReadSpace() > 0) {
+ while (m_eventBuffer.getReadSpace() > evDeferred) {
snd_seq_event_t *ev = localEventBuffer + evCount;
*ev = m_eventBuffer.peek();
@@ -940,8 +941,18 @@ DSSIPluginInstance::run(const RealTime &blockTime)
std::cerr << "Type: " << int(ev->type) << ", pitch: " << int(ev->data.note.note) << ", velocity: " << int(ev->data.note.velocity) << std::endl;
#endif
- if (frameOffset >= int(m_blockSize))
- break;
+ if (frameOffset >= int(m_blockSize)) {
+ if (m_eventBuffer.getReadSpace() == ++evDeferred) {
+ break;
+ }
+ // The events are possibly unsorted because we can merge events played in
+ // realtime with recorded events (generally sorted but not immediate), so
+ // we reinsert the current event at the last position and continue to read
+ // the other events.
+ m_eventBuffer.skip(1);
+ m_eventBuffer.write(ev, 1);
+ continue;
+ }
if (frameOffset < 0)
frameOffset = 0;
@@ -1078,6 +1089,8 @@ DSSIPluginInstance::runGrouped(const RealTime &blockTime)
size_t index = 0;
unsigned long *counts = (unsigned long *)
alloca(m_groupLocalEventBufferCount * sizeof(unsigned long));
+ unsigned long *evDeferred = (unsigned long *)
+ alloca(m_groupLocalEventBufferCount * sizeof(unsigned long));
LADSPA_Handle *instances = (LADSPA_Handle *)
alloca(m_groupLocalEventBufferCount * sizeof(LADSPA_Handle));
@@ -1088,6 +1101,7 @@ DSSIPluginInstance::runGrouped(const RealTime &blockTime)
DSSIPluginInstance *instance = *i;
counts[index] = 0;
+ evDeferred[index] = 0;
instances[index] = instance->m_instanceHandle;
#ifdef DEBUG_DSSI_PROCESS
@@ -1104,7 +1118,7 @@ DSSIPluginInstance::runGrouped(const RealTime &blockTime)
(instance->m_instanceHandle, bank, program);
}
- while (instance->m_eventBuffer.getReadSpace() > 0) {
+ while (instance->m_eventBuffer.getReadSpace() > evDeferred[index]) {
snd_seq_event_t *ev = m_groupLocalEventBuffers[index] + counts[index];
*ev = instance->m_eventBuffer.peek();
@@ -1122,8 +1136,19 @@ DSSIPluginInstance::runGrouped(const RealTime &blockTime)
<< ", block size " << m_blockSize << std::endl;
#endif
- if (frameOffset >= int(m_blockSize))
- break;
+ if (frameOffset >= int(m_blockSize)) {
+ if (instance->m_eventBuffer.getReadSpace() == ++evDeferred[index]) {
+ break;
+ }
+ // The events are possibly unsorted because we can merge events played in
+ // realtime with recorded events (generally sorted but not immediate), so
+ // we reinsert the current event at the last position and continue to read
+ // the other events.
+ instance->m_eventBuffer.skip(1);
+ instance->m_eventBuffer.write(ev, 1);
+ continue;
+ }
+
if (frameOffset < 0)
frameOffset = 0;
diff --git a/src/sound/DSSIPluginInstance.h b/src/sound/DSSIPluginInstance.h
index b58b517..f30434f 100644
--- a/src/sound/DSSIPluginInstance.h
+++ b/src/sound/DSSIPluginInstance.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/DummyDriver.cpp b/src/sound/DummyDriver.cpp
index cafa01f..c8320f6 100644
--- a/src/sound/DummyDriver.cpp
+++ b/src/sound/DummyDriver.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/DummyDriver.h b/src/sound/DummyDriver.h
index e1da5d5..aa929a9 100644
--- a/src/sound/DummyDriver.h
+++ b/src/sound/DummyDriver.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/ExternalTransport.h b/src/sound/ExternalTransport.h
index b2ea2d9..25a5d08 100644
--- a/src/sound/ExternalTransport.h
+++ b/src/sound/ExternalTransport.h
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/ImmediateNote.cpp b/src/sound/ImmediateNote.cpp
index 41f239f..5cbda06 100644
--- a/src/sound/ImmediateNote.cpp
+++ b/src/sound/ImmediateNote.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/ImmediateNote.h b/src/sound/ImmediateNote.h
index 201b5f8..144ddb3 100644
--- a/src/sound/ImmediateNote.h
+++ b/src/sound/ImmediateNote.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/JackDriver.cpp b/src/sound/JackDriver.cpp
index 7c654f0..970d51e 100644
--- a/src/sound/JackDriver.cpp
+++ b/src/sound/JackDriver.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -720,6 +720,13 @@ JackDriver::getAudioPlayLatency() const
if (!m_client)
return RealTime::zeroTime;
+ // ??? DEPRECATED
+ // jack_port_get_total_latency() is deprecated. Replace with
+ // jack_port_get_latency_range(). Something like this:
+ //
+ // jack_latency_range_t latencyRange;
+ // jack_port_get_latency_range(m_outputMasters[0], Playback, &latencyRange);
+ // return RealTime::frame2RealTime(latencyRange.max, m_sampleRate);
jack_nframes_t latency =
jack_port_get_total_latency(m_client, m_outputMasters[0]);
@@ -732,6 +739,13 @@ JackDriver::getAudioRecordLatency() const
if (!m_client)
return RealTime::zeroTime;
+ // ??? DEPRECATED
+ // jack_port_get_total_latency() is deprecated. Replace with
+ // jack_port_get_latency_range(). Something like this:
+ //
+ // jack_latency_range_t latencyRange;
+ // jack_port_get_latency_range(m_inputPorts[0], Capture, &latencyRange);
+ // return RealTime::frame2RealTime(latencyRange.max, m_sampleRate);
jack_nframes_t latency =
jack_port_get_total_latency(m_client, m_inputPorts[0]);
diff --git a/src/sound/JackDriver.h b/src/sound/JackDriver.h
index b1f6b14..7fd1dd0 100644
--- a/src/sound/JackDriver.h
+++ b/src/sound/JackDriver.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/LADSPAPluginFactory.cpp b/src/sound/LADSPAPluginFactory.cpp
index 8f8def9..0405979 100644
--- a/src/sound/LADSPAPluginFactory.cpp
+++ b/src/sound/LADSPAPluginFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/LADSPAPluginFactory.h b/src/sound/LADSPAPluginFactory.h
index b1b9250..652185a 100644
--- a/src/sound/LADSPAPluginFactory.h
+++ b/src/sound/LADSPAPluginFactory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/LADSPAPluginInstance.cpp b/src/sound/LADSPAPluginInstance.cpp
index 0803cb5..132c29f 100644
--- a/src/sound/LADSPAPluginInstance.cpp
+++ b/src/sound/LADSPAPluginInstance.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/LADSPAPluginInstance.h b/src/sound/LADSPAPluginInstance.h
index fe617e8..a6bd020 100644
--- a/src/sound/LADSPAPluginInstance.h
+++ b/src/sound/LADSPAPluginInstance.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/LSCPPatchExtractor.cpp b/src/sound/LSCPPatchExtractor.cpp
index 5da61d4..187c0a0 100644
--- a/src/sound/LSCPPatchExtractor.cpp
+++ b/src/sound/LSCPPatchExtractor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/LSCPPatchExtractor.h b/src/sound/LSCPPatchExtractor.h
index 7e3e435..a4977fc 100644
--- a/src/sound/LSCPPatchExtractor.h
+++ b/src/sound/LSCPPatchExtractor.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/MappedBufMetaIterator.cpp b/src/sound/MappedBufMetaIterator.cpp
index f65266c..266c45e 100644
--- a/src/sound/MappedBufMetaIterator.cpp
+++ b/src/sound/MappedBufMetaIterator.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/MappedCommon.h b/src/sound/MappedCommon.h
index 99d89bc..fc57762 100644
--- a/src/sound/MappedCommon.h
+++ b/src/sound/MappedCommon.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/MappedDevice.cpp b/src/sound/MappedDevice.cpp
index f2fa350..3d1529d 100644
--- a/src/sound/MappedDevice.cpp
+++ b/src/sound/MappedDevice.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/MappedDevice.h b/src/sound/MappedDevice.h
index 7a2d50f..8b7c6e4 100644
--- a/src/sound/MappedDevice.h
+++ b/src/sound/MappedDevice.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/MappedEvent.cpp b/src/sound/MappedEvent.cpp
index 940ff5e..39857be 100644
--- a/src/sound/MappedEvent.cpp
+++ b/src/sound/MappedEvent.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -17,6 +17,7 @@
#include "Midi.h"
#include "base/MidiTypes.h"
#include "base/NotationTypes.h" // for Note::EventType
+#include "misc/TempDir.h"
#include <QDir>
#include <QFile>
@@ -60,7 +61,6 @@ MappedEvent::MappedEvent(InstrumentId id,
// defaults set.
if (e.isa(Note::EventType)) {
- m_type = MidiNoteOneShot;
long v = MidiMaxValue;
e.get<Int>(BaseProperties::VELOCITY, v);
m_data2 = v;
@@ -240,7 +240,7 @@ protected:
};
DataBlockFile::DataBlockFile(DataBlockRepository::blockid id)
- : m_fileName(QDir::tempPath() + QString("/rosegarden_datablock_%1").arg(id)),
+ : m_fileName(TempDir::path() + QString("/rosegarden_datablock_%1").arg(id)),
m_file(m_fileName),
m_cleared(false)
{
@@ -426,7 +426,7 @@ void DataBlockRepository::clear()
// Erase all 'datablock_*' files
//
- QString tmpPath = QDir::tempPath();
+ QString tmpPath = TempDir::path();
QDir segmentsDir(tmpPath, "rosegarden_datablock_*");
diff --git a/src/sound/MappedEvent.h b/src/sound/MappedEvent.h
index e58edfc..0ba69c3 100644
--- a/src/sound/MappedEvent.h
+++ b/src/sound/MappedEvent.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/MappedEventInserter.cpp b/src/sound/MappedEventInserter.cpp
index adacbc5..9b8ae88 100644
--- a/src/sound/MappedEventInserter.cpp
+++ b/src/sound/MappedEventInserter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/MappedEventInserter.h b/src/sound/MappedEventInserter.h
index ad0d4db..5dc1f73 100644
--- a/src/sound/MappedEventInserter.h
+++ b/src/sound/MappedEventInserter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/MappedEventList.cpp b/src/sound/MappedEventList.cpp
index 894e945..45105a4 100644
--- a/src/sound/MappedEventList.cpp
+++ b/src/sound/MappedEventList.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/MappedEventList.h b/src/sound/MappedEventList.h
index 3e78188..ff94438 100644
--- a/src/sound/MappedEventList.h
+++ b/src/sound/MappedEventList.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/MappedInserterBase.h b/src/sound/MappedInserterBase.h
index 978dad3..b8ec5d2 100644
--- a/src/sound/MappedInserterBase.h
+++ b/src/sound/MappedInserterBase.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/MappedInstrument.cpp b/src/sound/MappedInstrument.cpp
index 9b0d0fe..43b2172 100644
--- a/src/sound/MappedInstrument.cpp
+++ b/src/sound/MappedInstrument.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/MappedInstrument.h b/src/sound/MappedInstrument.h
index e80cfac..a35e805 100644
--- a/src/sound/MappedInstrument.h
+++ b/src/sound/MappedInstrument.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/MappedStudio.cpp b/src/sound/MappedStudio.cpp
index a11bb1b..2217a77 100644
--- a/src/sound/MappedStudio.cpp
+++ b/src/sound/MappedStudio.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/MappedStudio.h b/src/sound/MappedStudio.h
index a3e260d..4c16ca6 100644
--- a/src/sound/MappedStudio.h
+++ b/src/sound/MappedStudio.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/Midi.h b/src/sound/Midi.h
index 463f543..c29cd4f 100644
--- a/src/sound/Midi.h
+++ b/src/sound/Midi.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/MidiEvent.cpp b/src/sound/MidiEvent.cpp
index 1c895fb..b4bb073 100644
--- a/src/sound/MidiEvent.cpp
+++ b/src/sound/MidiEvent.cpp
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -11,139 +11,129 @@
COPYING included with this distribution for more information.
*/
-#include "Midi.h"
#include "MidiEvent.h"
+
+#include "Midi.h"
+
#include <iostream>
-// MidiEvent is a representation of MIDI which we use
-// for the import/export of MidiFiles. It uses std::strings for
-// meta event messages which makes them nice and easy to handle.
-//
-//
namespace Rosegarden
{
-using std::string;
-using std::cout;
-using std::endl;
-
-MidiEvent::MidiEvent()
-{}
-MidiEvent::MidiEvent(timeT deltaTime,
- MidiByte eventCode):
- m_deltaTime(deltaTime),
- m_duration(0),
- m_eventCode(eventCode),
- m_data1(0),
- m_data2(0),
- m_metaEventCode(0),
- m_metaMessage("")
-{}
+MidiEvent::MidiEvent() :
+ m_time(0),
+ m_duration(0),
+ m_eventCode(0),
+ m_data1(0),
+ m_data2(0),
+ m_metaEventCode(0),
+ m_metaMessage()
+{
+}
-MidiEvent::MidiEvent(timeT deltaTime,
+MidiEvent::MidiEvent(timeT time,
MidiByte eventCode,
MidiByte data1):
- m_deltaTime(deltaTime),
+ m_time(time),
m_duration(0),
m_eventCode(eventCode),
m_data1(data1),
m_data2(0),
m_metaEventCode(0),
m_metaMessage("")
-{}
+{
+}
-MidiEvent::MidiEvent(timeT deltaTime,
+MidiEvent::MidiEvent(timeT time,
MidiByte eventCode,
MidiByte data1,
MidiByte data2):
- m_deltaTime(deltaTime),
+ m_time(time),
m_duration(0),
m_eventCode(eventCode),
m_data1(data1),
m_data2(data2),
m_metaEventCode(0),
m_metaMessage("")
+{
+}
-{}
-
-MidiEvent::MidiEvent(timeT deltaTime,
+MidiEvent::MidiEvent(timeT time,
MidiByte eventCode,
MidiByte metaEventCode,
- const string &metaMessage):
- m_deltaTime(deltaTime),
+ const std::string &metaMessage):
+ m_time(time),
m_duration(0),
m_eventCode(eventCode),
m_data1(0),
m_data2(0),
m_metaEventCode(metaEventCode),
m_metaMessage(metaMessage)
-{}
+{
+}
-MidiEvent::MidiEvent(timeT deltaTime,
+MidiEvent::MidiEvent(timeT time,
MidiByte eventCode,
- const string &sysEx):
- m_deltaTime(deltaTime),
+ const std::string &sysEx):
+ m_time(time),
m_duration(0),
m_eventCode(eventCode),
m_data1(0),
m_data2(0),
m_metaEventCode(0),
m_metaMessage(sysEx)
-{}
-
-MidiEvent::~MidiEvent()
-{}
+{
+}
// Show a representation of our MidiEvent purely for information
// purposes (also demos how we decode them)
-//
-//
void
MidiEvent::print()
{
timeT tempo;
int tonality;
- string sharpflat;
+ std::string sharpflat;
if (m_metaEventCode) {
switch (m_metaEventCode) {
case MIDI_SEQUENCE_NUMBER:
- cout << "MIDI SEQUENCE NUMBER" << endl;
+ std::cout << "MIDI SEQUENCE NUMBER\n";
break;
case MIDI_TEXT_EVENT:
- cout << "MIDI TEXT:\t\"" << m_metaMessage << "\"" << endl;
+ std::cout << "MIDI TEXT:\t\"" << m_metaMessage << "\"\n";
break;
case MIDI_COPYRIGHT_NOTICE:
- cout << "COPYRIGHT:\t\"" << m_metaMessage << "\"" << endl;
+ std::cout << "COPYRIGHT:\t\"" << m_metaMessage << "\"\n";
+ break;
case MIDI_TRACK_NAME:
- cout << "TRACK NAME:\t\"" << m_metaMessage << "\"" << endl;
+ std::cout << "TRACK NAME:\t\"" << m_metaMessage << "\"\n";
break;
case MIDI_INSTRUMENT_NAME:
- cout << "INSTRUMENT NAME:\t\"" << m_metaMessage << "\"" << endl;
+ std::cout << "INSTRUMENT NAME:\t\"" << m_metaMessage << "\"\n";
break;
case MIDI_LYRIC:
- cout << "LYRIC:\t\"" << m_metaMessage << "\"" << endl;
+ std::cout << "LYRIC:\t\"" << m_metaMessage << "\"\n";
break;
case MIDI_TEXT_MARKER:
- cout << "MARKER:\t\"" << m_metaMessage << "\"" << endl;
+ std::cout << "MARKER:\t\"" << m_metaMessage << "\"\n";
break;
case MIDI_CUE_POINT:
- cout << "CUE POINT:\t\"" << m_metaMessage << "\"" << endl;
+ std::cout << "CUE POINT:\t\"" << m_metaMessage << "\"\n";
break;
// Sets a Channel number for a TRACK before it starts
case MIDI_CHANNEL_PREFIX:
- cout << "CHANNEL PREFIX:\t"
- << (timeT)m_metaMessage[0]
- << endl;
+ std::cout << "CHANNEL PREFIX:\t"
+ << (timeT)m_metaMessage[0]
+ << '\n';
break;
// These are actually the same case but this is not an
@@ -151,12 +141,12 @@ MidiEvent::print()
// assume it's a MIDI_CHANNEL_PREFIX though
//
case MIDI_CHANNEL_PREFIX_OR_PORT:
- cout << "FIXED CHANNEL PREFIX:\t"
- << (timeT)m_metaMessage[0] << endl;
+ std::cout << "FIXED CHANNEL PREFIX:\t"
+ << (timeT)m_metaMessage[0] << '\n';
break;
case MIDI_END_OF_TRACK:
- cout << "END OF TRACK" << endl;
+ std::cout << "END OF TRACK\n";
break;
case MIDI_SET_TEMPO:
@@ -166,25 +156,25 @@ MidiEvent::print()
(short)(MidiByte)m_metaMessage[2];
tempo = 60000000 / tempo;
- cout << "SET TEMPO:\t" << tempo << endl;
+ std::cout << "SET TEMPO:\t" << tempo << '\n';
break;
case MIDI_SMPTE_OFFSET:
- cout << "SMPTE TIME CODE:\t"
- << (timeT)m_metaMessage[0]
- << ":" << (timeT)m_metaMessage[1]
- << ":" << (timeT)m_metaMessage[2]
- << " - fps = " << (timeT)m_metaMessage[3]
- << " - subdivsperframe = "
- << (timeT)m_metaMessage[4]
- << endl;
+ std::cout << "SMPTE TIME CODE:\t"
+ << (timeT)m_metaMessage[0]
+ << ":" << (timeT)m_metaMessage[1]
+ << ":" << (timeT)m_metaMessage[2]
+ << " - fps = " << (timeT)m_metaMessage[3]
+ << " - subdivsperframe = "
+ << (timeT)m_metaMessage[4]
+ << '\n';
break;
case MIDI_TIME_SIGNATURE:
- cout << "TIME SIGNATURE:\t"
- << (timeT)m_metaMessage[0]
- << "/"
- << (1 << (timeT)m_metaMessage[1]) << endl;
+ std::cout << "TIME SIGNATURE:\t"
+ << (timeT)m_metaMessage[0]
+ << "/"
+ << (1 << (timeT)m_metaMessage[1]) << '\n';
break;
case MIDI_KEY_SIGNATURE:
@@ -197,59 +187,59 @@ MidiEvent::print()
sharpflat += " sharp";
}
- cout << "KEY SIGNATURE:\t" << sharpflat << " "
- << (((int)m_metaMessage[1]) == 0 ? "major" : "minor")
- << endl;
+ std::cout << "KEY SIGNATURE:\t" << sharpflat << " "
+ << (((int)m_metaMessage[1]) == 0 ? "major" : "minor")
+ << '\n';
break;
case MIDI_SEQUENCER_SPECIFIC:
- cout << "SEQUENCER SPECIFIC:\t\"" << m_metaMessage << endl;
+ std::cout << "SEQUENCER SPECIFIC:\t\"" << m_metaMessage << '\n';
break;
default:
- cout << "Undefined MIDI META event - "
- << (timeT)m_metaEventCode << endl;
+ std::cout << "Undefined MIDI META event - "
+ << (timeT)m_metaEventCode << '\n';
break;
}
} else {
switch (m_eventCode & MIDI_MESSAGE_TYPE_MASK) {
case MIDI_NOTE_ON:
- cout << "NOTE ON:\t" << (int)m_data1 << " - "
- << (int)m_data2 << endl;
+ std::cout << "NOTE ON:\t" << (int)m_data1 << " - "
+ << (int)m_data2 << '\n';
break;
case MIDI_NOTE_OFF:
- cout << "NOTE OFF:\t" << (int)m_data1 << " - "
- << (int)m_data2 << endl;
+ std::cout << "NOTE OFF:\t" << (int)m_data1 << " - "
+ << (int)m_data2 << '\n';
break;
case MIDI_POLY_AFTERTOUCH:
- cout << "POLY AFTERTOUCH:\t" << (int)m_data1
- << " - " << (int)m_data2 << endl;
+ std::cout << "POLY AFTERTOUCH:\t" << (int)m_data1
+ << " - " << (int)m_data2 << '\n';
break;
case MIDI_CTRL_CHANGE:
- cout << "CTRL CHANGE:\t" << (int)m_data1
- << " - " << (int)m_data2 << endl;
+ std::cout << "CTRL CHANGE:\t" << (int)m_data1
+ << " - " << (int)m_data2 << '\n';
break;
case MIDI_PITCH_BEND:
- cout << "PITCH BEND:\t" << (int)m_data1
- << " - " << (int)m_data2 << endl;
+ std::cout << "PITCH BEND:\t" << (int)m_data1
+ << " - " << (int)m_data2 << '\n';
break;
case MIDI_PROG_CHANGE:
- cout << "PROG CHANGE:\t" << (int)m_data1 << endl;
+ std::cout << "PROG CHANGE:\t" << (int)m_data1 << '\n';
break;
case MIDI_CHNL_AFTERTOUCH:
- cout << "CHNL AFTERTOUCH\t" << (int)m_data1 << endl;
+ std::cout << "CHNL AFTERTOUCH\t" << (int)m_data1 << '\n';
break;
default:
- cout << "Undefined MIDI event" << endl;
+ std::cout << "Undefined MIDI event\n";
break;
}
}
@@ -258,25 +248,5 @@ MidiEvent::print()
return ;
}
-// Adds the argument to _deltaTime and returns the result
-// thus aggregating the times as we go aint
-timeT
-MidiEvent::addTime(const timeT &time)
-{
- m_deltaTime += time;
- return m_deltaTime;
-}
-
-
-// Compare based on time
-//
-bool
-operator<(const MidiEvent &a, const MidiEvent &b)
-{
- return a.getTime() < b.getTime();
-}
-
}
-
-
diff --git a/src/sound/MidiEvent.h b/src/sound/MidiEvent.h
index bc956eb..737e595 100644
--- a/src/sound/MidiEvent.h
+++ b/src/sound/MidiEvent.h
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -12,123 +12,95 @@
*/
-#ifndef RG_MIDI_EVENT_H
-#define RG_MIDI_EVENT_H
+#ifndef RG_MIDIEVENT_H
+#define RG_MIDIEVENT_H
#include "Midi.h"
#include "base/Event.h"
-// MidiEvent holds MIDI and Event data during MIDI file I/O.
-// We don't use this class at all for playback or recording of MIDI -
-// for that look at MappedEvent and MappedEventList.
-//
-// Rosegarden doesn't have any internal concept of MIDI events, only
-// Events which are a superset of MIDI functionality.
-//
-// Check out Event in base/ for more information.
-//
-//
-//
-
namespace Rosegarden
{
+
+
+/// For standard MIDI file I/O.
+/**
+ * MidiEvent is a representation of MIDI which we use
+ * for the import/export of MIDI files. It uses std::string for
+ * meta event messages which makes them nice and easy to handle.
+ *
+ * We don't use this class at all for playback or recording of MIDI -
+ * for that look at MappedEvent and MappedEventList.
+ *
+ * Rosegarden doesn't have any internal concept of MIDI events, only
+ * the Event class which offers a superset of MIDI functionality.
+ */
class MidiEvent
{
public:
MidiEvent();
- // No data event
- //
- MidiEvent(timeT deltaTime,
- MidiByte eventCode);
-
- // single data byte case
- //
- MidiEvent(timeT deltaTime,
+ /// An event with one data byte. E.g. Program Change.
+ MidiEvent(timeT time,
MidiByte eventCode,
MidiByte data1);
- // double data byte
- //
- MidiEvent(timeT deltaTime,
+ /// An event with two data bytes. E.g. Note-On.
+ MidiEvent(timeT time,
MidiByte eventCode,
MidiByte data1,
MidiByte data2);
- // Meta event
- //
- MidiEvent(timeT deltaTime,
+ /// Meta event
+ MidiEvent(timeT time,
MidiByte eventCode,
MidiByte metaEventCode,
const std::string &metaMessage);
- // Sysex style constructor
- //
- MidiEvent(timeT deltaTime,
+ /// Sysex event
+ MidiEvent(timeT time,
MidiByte eventCode,
const std::string &sysEx);
+ void setTime(const timeT &time) { m_time = time; }
+ timeT getTime() const { return m_time; }
- ~MidiEvent();
-
- // View our event as text
- //
- void print();
-
-
- void setTime(const timeT &time) { m_deltaTime = time; }
- void setDuration(const timeT& duration) {m_duration = duration;}
- timeT addTime(const timeT &time);
+ void setDuration(const timeT& duration) { m_duration = duration; }
+ timeT getDuration() const { return m_duration; }
+ MidiByte getEventCode() const { return m_eventCode; }
MidiByte getMessageType() const
- { return ( m_eventCode & MIDI_MESSAGE_TYPE_MASK ); }
-
+ { return m_eventCode & MIDI_MESSAGE_TYPE_MASK; }
MidiByte getChannelNumber() const
- { return ( m_eventCode & MIDI_CHANNEL_NUM_MASK ); }
+ { return m_eventCode & MIDI_CHANNEL_NUM_MASK; }
- timeT getTime() const { return m_deltaTime; }
- timeT getDuration() const { return m_duration; }
-
- MidiByte getPitch() const { return m_data1; }
- MidiByte getVelocity() const { return m_data2; }
MidiByte getData1() const { return m_data1; }
- MidiByte getData2() const { return m_data2; }
- MidiByte getEventCode() const { return m_eventCode; }
+ MidiByte getPitch() const { return m_data1; }
- bool isMeta() const { return(m_eventCode == MIDI_FILE_META_EVENT); }
+ MidiByte getData2() const { return m_data2; }
+ MidiByte getVelocity() const { return m_data2; }
+ bool isMeta() const { return (m_eventCode == MIDI_FILE_META_EVENT); }
MidiByte getMetaEventCode() const { return m_metaEventCode; }
- std::string getMetaMessage() const { return m_metaMessage; }
void setMetaMessage(const std::string &meta) { m_metaMessage = meta; }
+ std::string getMetaMessage() const { return m_metaMessage; }
- friend bool operator<(const MidiEvent &a, const MidiEvent &b);
+ /// Debugging. Dump to std::cout.
+ void print();
private:
-
- MidiEvent& operator=(const MidiEvent);
-
- timeT m_deltaTime;
+ /// Delta or absolute time, depending.
+ timeT m_time;
timeT m_duration;
- MidiByte m_eventCode;
- MidiByte m_data1; // or Note
- MidiByte m_data2; // or Velocity
-
- MidiByte m_metaEventCode;
- std::string m_metaMessage;
+ MidiByte m_eventCode;
+ MidiByte m_data1;
+ MidiByte m_data2;
+ MidiByte m_metaEventCode;
+ std::string m_metaMessage;
};
-// Comparator for sorting
-//
-struct MidiEventCmp
-{
- bool operator()(const MidiEvent &mE1, const MidiEvent &mE2) const
- { return mE1.getTime() < mE2.getTime(); }
- bool operator()(const MidiEvent *mE1, const MidiEvent *mE2) const
- { return mE1->getTime() < mE2->getTime(); }
-};
}
-#endif // RG_MIDI_EVENT_H
+#endif // RG_MIDIEVENT_H
diff --git a/src/sound/MidiFile.cpp b/src/sound/MidiFile.cpp
index 00116d6..45bcd78 100644
--- a/src/sound/MidiFile.cpp
+++ b/src/sound/MidiFile.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -13,20 +13,21 @@
COPYING included with this distribution for more information.
*/
-#include <QApplication>
+#define RG_MODULE_STRING "[MidiFile]"
-#include "Midi.h"
#include "MidiFile.h"
+
+#include "Midi.h"
+#include "MidiEvent.h"
#include "base/Segment.h"
-#include "base/NotationTypes.h"
+//#include "base/NotationTypes.h"
#include "base/BaseProperties.h"
-#include "base/SegmentNotationHelper.h"
-#include "base/SegmentPerformanceHelper.h"
#include "base/Track.h"
#include "base/Instrument.h"
#include "base/Studio.h"
#include "base/MidiTypes.h"
#include "base/Profiler.h"
+#include "document/RosegardenDocument.h"
#include "gui/application/RosegardenMainWindow.h"
#include "gui/seqmanager/SequenceManager.h"
#include "misc/Debug.h"
@@ -38,76 +39,42 @@
#include <iostream>
#include <fstream>
#include <string>
-#include <cstdio>
-#include <algorithm>
-#include <limits.h>
#include <sstream>
+// ??? Get rid of this. Use RG_NO_DEBUG_PRINT instead.
#define MIDI_DEBUG 1
namespace Rosegarden
{
-using std::string;
-using std::ifstream;
-using std::stringstream;
-using std::cerr;
-using std::endl;
-using std::ends;
-using std::ios;
-
-MidiFile::MidiFile(Studio *studio):
- SoundFile("unnamed.mid"),
- m_timingFormat(MIDI_TIMING_PPQ_TIMEBASE),
- m_timingDivision(0),
- m_fps(0),
- m_subframes(0),
- m_format(MIDI_FILE_NOT_LOADED),
- m_numberOfTracks(0),
- m_containsTimeChanges(false),
- m_trackByteCount(0),
- m_decrementCount(false),
- m_studio(studio)
-{}
-
-MidiFile::MidiFile(const QString &fn,
- Studio *studio):
- SoundFile(fn),
- m_timingFormat(MIDI_TIMING_PPQ_TIMEBASE),
- m_timingDivision(0),
- m_fps(0),
- m_subframes(0),
- m_format(MIDI_FILE_NOT_LOADED),
- m_numberOfTracks(0),
- m_containsTimeChanges(false),
- m_trackByteCount(0),
- m_decrementCount(false),
- m_studio(studio)
-{}
-
-// Make sure we clear away the m_midiComposition
-//
+
+MidiFile::MidiFile() :
+ m_format(MIDI_FILE_NOT_LOADED),
+ m_numberOfTracks(0),
+ m_timingFormat(MIDI_TIMING_PPQ_TIMEBASE),
+ m_timingDivision(0),
+ m_fps(0),
+ m_subframes(0),
+ m_fileSize(0),
+ m_trackByteCount(0),
+ m_decrementCount(false),
+ m_bytesRead(0)
+{
+}
+
MidiFile::~MidiFile()
{
clearMidiComposition();
}
-
-// A couple of convenience functions. Watch the byte conversions out
-// of the STL strings.
-//
-//
long
-MidiFile::midiBytesToLong(const string& bytes)
+MidiFile::midiBytesToLong(const std::string &bytes)
{
if (bytes.length() != 4) {
-#ifdef MIDI_DEBUG
- std::cerr << "WARNING: Wrong length for long data (" << bytes.length()
- << ", should be 4)" << endl;
-#endif
+ std::cerr << "MidiFile::midiBytesToLong(): WARNING: Wrong length for long data (" << bytes.length() << ", should be 4)\n";
// TRANSLATOR: "long" is a C++ data type
- throw (Exception(qstrtostr(QObject::tr("Wrong length for long data in MIDI stream"))));
+ throw Exception(qstrtostr(QObject::tr("Wrong length for long data in MIDI stream")));
}
long longRet = ((long)(((MidiByte)bytes[0]) << 24)) |
@@ -115,22 +82,19 @@ MidiFile::midiBytesToLong(const string& bytes)
((long)(((MidiByte)bytes[2]) << 8)) |
((long)((MidiByte)(bytes[3])));
- std::cerr << "midiBytesToLong(" << int((MidiByte)bytes[0]) << "," << int((MidiByte)bytes[1]) << "," << int((MidiByte)bytes[2]) << "," << int((MidiByte)bytes[3]) << ") -> " << longRet << std::endl;
+ RG_DEBUG << "midiBytesToLong(" << int((MidiByte)bytes[0]) << "," << int((MidiByte)bytes[1]) << "," << int((MidiByte)bytes[2]) << "," << int((MidiByte)bytes[3]) << ") -> " << longRet;
return longRet;
}
int
-MidiFile::midiBytesToInt(const string& bytes)
+MidiFile::midiBytesToInt(const std::string &bytes)
{
if (bytes.length() != 2) {
-#ifdef MIDI_DEBUG
- std::cerr << "WARNING: Wrong length for int data (" << bytes.length()
- << ", should be 2)" << endl;
-#endif
+ std::cerr << "MidiFile::midiBytesToInt(): WARNING: Wrong length for int data (" << bytes.length() << ", should be 2)\n";
// TRANSLATOR: "int" is a C++ data type
- throw (Exception(qstrtostr(QObject::tr("Wrong length for int data in MIDI stream"))));
+ throw Exception(qstrtostr(QObject::tr("Wrong length for int data in MIDI stream")));
}
int intRet = ((int)(((MidiByte)bytes[0]) << 8)) |
@@ -138,144 +102,87 @@ MidiFile::midiBytesToInt(const string& bytes)
return (intRet);
}
-
-
-// Gets a single byte from the MIDI byte stream. For each track
-// section we can read only a specified number of bytes held in
-// m_trackByteCount.
-//
MidiByte
-MidiFile::getMidiByte(ifstream* midiFile)
+MidiFile::read(std::ifstream *midiFile)
{
- static int bytesGot = 0; // purely for progress reporting purposes
-
- if (midiFile->eof()) {
- throw(Exception(qstrtostr(QObject::tr("End of MIDI file encountered while reading"))));
- }
-
- if (m_decrementCount && m_trackByteCount <= 0) {
- throw(Exception(qstrtostr(QObject::tr("Attempt to get more bytes than expected on Track"))));
- }
-
- char byte;
- if (midiFile->read(&byte, 1)) {
-
- --m_trackByteCount;
-
- // update a progress dialog if we have one
- //
- ++bytesGot;
- if (bytesGot % 2000 == 0) {
-
- emit setValue((int)(double(midiFile->tellg()) /
- double(m_fileSize) * 20.0));
- qApp->processEvents( QEventLoop::AllEvents ); // note: was qApp->processEvents(50)
- }
-
- return (MidiByte)byte;
- }
-
- throw(Exception(qstrtostr(QObject::tr("Attempt to read past MIDI file end"))));
+ return static_cast<MidiByte>(read(midiFile, 1)[0]);
}
-
-// Gets a specified number of bytes from the MIDI byte stream. For
-// each track section we can read only a specified number of bytes
-// held in m_trackByteCount.
-//
-string
-MidiFile::getMidiBytes(ifstream* midiFile, unsigned long numberOfBytes)
+std::string
+MidiFile::read(std::ifstream *midiFile, unsigned long numberOfBytes)
{
- string stringRet;
- char fileMidiByte;
- static int bytesGot = 0; // purely for progress reporting purposes
-
if (midiFile->eof()) {
-#ifdef MIDI_DEBUG
- std::cerr << "MIDI file EOF - got "
- << stringRet.length() << " bytes out of "
- << numberOfBytes << endl;
-#endif
-
- throw(Exception(qstrtostr(QObject::tr("End of MIDI file encountered while reading"))));
+ std::cerr << "MidiFile::read(): MIDI file EOF - got 0 bytes out of " << numberOfBytes << '\n';
+ throw Exception(qstrtostr(QObject::tr("End of MIDI file encountered while reading")));
}
- if (m_decrementCount && (numberOfBytes > (unsigned long)m_trackByteCount)) {
-#ifdef MIDI_DEBUG
- std::cerr << "Attempt to get more bytes than allowed on Track ("
- << numberOfBytes
- << " > "
- << m_trackByteCount << endl;
-#endif
-
- //!!! Investigate -- I'm seeing this on new-notation-quantization
- // branch: load glazunov.rg, run Interpret on first segment, export
- // and attempt to import again
+ // For each track section we can read only m_trackByteCount bytes.
+ if (m_decrementCount && numberOfBytes > (unsigned long)m_trackByteCount) {
+ std::cerr << "MidiFile::read(): Attempt to get more bytes than allowed on Track (" << numberOfBytes << " > " << m_trackByteCount << ")\n";
- throw(Exception(qstrtostr(QObject::tr("Attempt to get more bytes than expected on Track"))));
+ throw Exception(qstrtostr(QObject::tr("Attempt to get more bytes than expected on Track")));
}
- while (stringRet.length() < numberOfBytes &&
- midiFile->read(&fileMidiByte, 1)) {
+ char fileMidiByte;
+ std::string stringRet;
+
+ while (stringRet.length() < numberOfBytes &&
+ midiFile->read(&fileMidiByte, 1)) {
stringRet += fileMidiByte;
}
- // if we've reached the end of file without fulfilling the
- // quota then panic as our parsing has performed incorrectly
- //
+ // Unexpected EOF
if (stringRet.length() < numberOfBytes) {
- stringRet = "";
-#ifdef MIDI_DEBUG
-
- cerr << "Attempt to read past file end - got "
- << stringRet.length() << " bytes out of "
- << numberOfBytes << endl;
-#endif
-
- throw(Exception(qstrtostr(QObject::tr("Attempt to read past MIDI file end"))));
+ std::cerr << "MidiFile::read(): Attempt to read past file end - got " << stringRet.length() << " bytes out of " << numberOfBytes << '\n';
+ throw Exception(qstrtostr(QObject::tr("Attempt to read past MIDI file end")));
}
- // decrement the byte count
if (m_decrementCount)
- m_trackByteCount -= stringRet.length();
+ m_trackByteCount -= numberOfBytes;
- // update a progress dialog if we have one
- //
- bytesGot += numberOfBytes;
- if (bytesGot % 2000 == 0) {
- emit setValue((int)(double(midiFile->tellg()) /
- double(m_fileSize) * 20.0));
- qApp->processEvents(QEventLoop::AllEvents);
+ m_bytesRead += numberOfBytes;
+
+ // Every 2000 bytes...
+ if (m_bytesRead >= 2000) {
+ m_bytesRead = 0;
+
+ // Update the progress dialog if one is connected.
+ emit progress((int)(double(midiFile->tellg()) /
+ double(m_fileSize) * 20.0));
+
+ // Kick the event loop to make sure the UI doesn't become
+ // unresponsive during a long load.
+ qApp->processEvents();
}
return stringRet;
}
-
-// Get a long number of variable length from the MIDI byte stream.
-//
-//
long
-MidiFile::getNumberFromMidiBytes(ifstream* midiFile, int firstByte)
+MidiFile::readNumber(std::ifstream *midiFile, int firstByte)
{
- long longRet = 0;
+ if (midiFile->eof())
+ return 0;
+
MidiByte midiByte;
+ // If we already have the first byte, use it
if (firstByte >= 0) {
midiByte = (MidiByte)firstByte;
- } else if (midiFile->eof()) {
- return longRet;
- } else {
- midiByte = getMidiByte(midiFile);
+ } else { // read it
+ midiByte = read(midiFile);
}
- longRet = midiByte;
- if (midiByte & 0x80 ) {
+ long longRet = midiByte;
+
+ // See MIDI spec section 4, pages 2 and 11.
+
+ if (midiByte & 0x80) {
longRet &= 0x7F;
do {
- midiByte = getMidiByte(midiFile);
+ midiByte = read(midiFile);
longRet = (longRet << 7) + (midiByte & 0x7F);
} while (!midiFile->eof() && (midiByte & 0x80));
}
@@ -283,547 +190,418 @@ MidiFile::getNumberFromMidiBytes(ifstream* midiFile, int firstByte)
return longRet;
}
-
-
-// Seeks to the next track in the midi file and sets the number
-// of bytes to be read in the counter m_trackByteCount.
-//
-bool
-MidiFile::skipToNextTrack(ifstream *midiFile)
+void
+MidiFile::findNextTrack(std::ifstream *midiFile)
{
- string buffer, buffer2;
- m_trackByteCount = -1;
+ // Conforms to recommendation in the MIDI spec, section 4, page 3:
+ // "Your programs should /expect/ alien chunks and treat them as if
+ // they weren't there." (Emphasis theirs.)
+
+ // Assume not found.
m_decrementCount = false;
+ m_trackByteCount = -1;
- while (!midiFile->eof() && (m_decrementCount == false )) {
- buffer = getMidiBytes(midiFile, 4);
+ // For each chunk
+ while (!midiFile->eof()) {
+ // Read the chunk type and size.
+ std::string chunkType = read(midiFile, 4);
+ long chunkSize = midiBytesToLong(read(midiFile, 4));
- if (buffer.compare(0, 4, MIDI_TRACK_HEADER) == 0) {
- m_trackByteCount = midiBytesToLong(getMidiBytes(midiFile, 4));
+ // If we've found a track chunk
+ if (chunkType.compare(0, 4, MIDI_TRACK_HEADER) == 0) {
+ m_trackByteCount = chunkSize;
m_decrementCount = true;
+ return;
}
+ RG_DEBUG << "findNextTrack(): skipping alien chunk. Type:" << chunkType;
+
+ // Alien chunk encountered, initiate evasive maneuvers (skip it).
+ midiFile->seekg(chunkSize, std::ios::cur);
}
- if ( m_trackByteCount == -1 ) // we haven't found a track
- return (false);
- else
- return (true);
+ // Track not found.
+ std::cerr << "MidiFile::findNextTrack(): Couldn't find Track\n";
+ throw Exception(qstrtostr(QObject::tr("File corrupted or in non-standard format")));
}
-
-// Read in a MIDI file. The parsing process throws string
-// exceptions back up here if we run into trouble which we
-// can then pass back out to whoever called us using a nice
-// bool.
-//
-//
bool
-MidiFile::open()
+MidiFile::read(const QString &filename)
{
- bool retOK = true;
- m_error = "";
-
-#ifdef MIDI_DEBUG
-
- std::cerr << "MidiFile::open() : fileName = " << m_fileName << endl;
-#endif
+ RG_DEBUG << "read(): filename = " << filename;
clearMidiComposition();
- // Open the file
- ifstream *midiFile = new ifstream(m_fileName.toLocal8Bit(), ios::in | ios::binary);
-
- try {
- if (*midiFile) {
- // Set file size so we can count it off
- //
- midiFile->seekg(0, std::ios::end);
- m_fileSize = midiFile->tellg();
- midiFile->seekg(0, std::ios::beg);
-
- // Parse the MIDI header first. The first 14 bytes of the file.
- if (!parseHeader(getMidiBytes(midiFile, 14))) {
- m_format = MIDI_FILE_NOT_LOADED;
- m_error = "Not a MIDI file.";
- return (false);
- }
-
- m_containsTimeChanges = false;
-
- TrackId i = 0;
-
- for (unsigned int j = 0; j < m_numberOfTracks; ++j) {
+ // Open the file
+ std::ifstream *midiFile =
+ new std::ifstream(filename.toLocal8Bit(),
+ std::ios::in | std::ios::binary);
-//#ifdef MIDI_DEBUG
- std::cerr << "Parsing Track " << j << endl;
-//#endif
+ if (!(*midiFile)) {
+ m_error = "File not found or not readable.";
+ m_format = MIDI_FILE_NOT_LOADED;
+ return false;
+ }
- if (!skipToNextTrack(midiFile)) {
-#ifdef MIDI_DEBUG
- cerr << "Couldn't find Track " << j << endl;
-#endif
+ // Compute the file size so we can report progress.
+ midiFile->seekg(0, std::ios::end);
+ m_fileSize = midiFile->tellg();
+ midiFile->seekg(0, std::ios::beg);
- m_error = "File corrupted or in non-standard format?";
- m_format = MIDI_FILE_NOT_LOADED;
- return (false);
- }
+ // The parsing process throws string exceptions back up here if we
+ // run into trouble which we can then pass back out to whomever
+ // called us using m_error and a nice bool.
+ try {
+ // Parse the MIDI header first.
+ parseHeader(midiFile);
-#ifdef MIDI_DEBUG
- std::cerr << "Track has " << m_trackByteCount << " bytes" << std::endl;
-#endif
+ // For each track chunk in the MIDI file.
+ for (unsigned track = 0; track < m_numberOfTracks; ++track) {
- // Run through the events taking them into our internal
- // representation.
- if (!parseTrack(midiFile, i)) {
-//#ifdef MIDI_DEBUG
- std::cerr << "Track " << j << " parsing failed" << endl;
-//#endif
+ RG_DEBUG << "read(): Parsing MIDI file track " << track;
- m_error = "File corrupted or in non-standard format?";
- m_format = MIDI_FILE_NOT_LOADED;
- return (false);
- }
+ // Skip any alien chunks.
+ findNextTrack(midiFile);
- ++i; // j is the source track number, i the destination
- }
+ RG_DEBUG << "read(): Track has " << m_trackByteCount << " bytes";
- m_numberOfTracks = i;
- } else {
- m_error = "File not found or not readable.";
- m_format = MIDI_FILE_NOT_LOADED;
- return (false);
+ // Read the track into m_midiComposition.
+ parseTrack(midiFile);
}
- // Close the file now
- midiFile->close();
- } catch (Exception e) {
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::open() - caught exception - "
- << e.getMessage() << endl;
-#endif
+ } catch (const Exception &e) {
+ std::cerr << "MidiFile::read() - caught exception - " << e.getMessage() << '\n';
m_error = e.getMessage();
- retOK = false;
+ m_format = MIDI_FILE_NOT_LOADED;
+ return false;
}
- return (retOK);
+ midiFile->close();
+
+ return true;
}
-// Parse and ensure the MIDI Header is legitimate
-//
-//
-bool
-MidiFile::parseHeader(const string &midiHeader)
+void
+MidiFile::parseHeader(std::ifstream *midiFile)
{
- if (midiHeader.size() < 14) {
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::parseHeader() - file header undersized" << endl;
-#endif
+ // The basic MIDI header is 14 bytes.
+ std::string midiHeader = read(midiFile, 14);
- return (false);
+ if (midiHeader.size() < 14) {
+ std::cerr << "MidiFile::parseHeader() - file header undersized\n";
+ throw Exception(qstrtostr(QObject::tr("Not a MIDI file")));
}
if (midiHeader.compare(0, 4, MIDI_FILE_HEADER) != 0) {
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::parseHeader()"
- << "- file header not found or malformed"
- << endl;
-#endif
- return (false);
- }
-
- if (midiBytesToLong(midiHeader.substr(4, 4)) != 6L) {
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::parseHeader()"
- << " - header length incorrect"
- << endl;
-#endif
-
- return (false);
+ std::cerr << "MidiFile::parseHeader() - file header not found or malformed\n";
+ throw Exception(qstrtostr(QObject::tr("Not a MIDI file")));
}
+ long chunkSize = midiBytesToLong(midiHeader.substr(4, 4));
m_format = (FileFormatType)midiBytesToInt(midiHeader.substr(8, 2));
m_numberOfTracks = midiBytesToInt(midiHeader.substr(10, 2));
m_timingDivision = midiBytesToInt(midiHeader.substr(12, 2));
m_timingFormat = MIDI_TIMING_PPQ_TIMEBASE;
if (m_format == MIDI_SEQUENTIAL_TRACK_FILE) {
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::parseHeader()"
- << "- can't load sequential track file"
- << endl;
-#endif
- return (false);
+ std::cerr << "MidiFile::parseHeader() - can't load sequential track (Format 2) MIDI file\n";
+ throw Exception(qstrtostr(QObject::tr("Unexpected MIDI file format")));
}
if (m_timingDivision > 32767) {
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::parseHeader() - file uses SMPTE timing" << endl;
-#endif
+ RG_DEBUG << "parseHeader() - file uses SMPTE timing";
+
m_timingFormat = MIDI_TIMING_SMPTE;
m_fps = 256 - (m_timingDivision >> 8);
m_subframes = (m_timingDivision & 0xff);
}
- return true;
+ if (chunkSize > 6) {
+ // Skip any remaining bytes in the header chunk.
+ // MIDI spec section 4, page 5: "[...] more parameters may be
+ // added to the MThd chunk in the future: it is important to
+ // read and honor the length, even if it is longer than 6."
+ midiFile->seekg(chunkSize - 6, std::ios::cur);
+ }
}
+static const std::string defaultTrackName = "Imported MIDI";
-// Extract the contents from a MIDI file track and places it into
-// our local map of MIDI events.
-//
-bool
-MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
+void
+MidiFile::parseTrack(std::ifstream *midiFile)
{
- MidiByte midiByte, metaEventCode, data1, data2;
- MidiByte eventCode = 0x80;
- std::string metaMessage;
- unsigned int messageLength;
- unsigned long deltaTime;
- unsigned long accumulatedTime = 0;
-
- // The trackNum passed in to this method is the default track for
- // all events provided they're all on the same channel. If we find
- // events on more than one channel, we increment trackNum and record
- // the mapping from channel to trackNum in this channelTrackMap.
- // We then return the new trackNum by reference so the calling
- // method knows we've got more tracks than expected.
-
- // This would be a vector<TrackId> but TrackId is unsigned
- // and we need -1 to indicate "not yet used"
- std::vector<int> channelTrackMap(16, -1);
+ // The term "Track" is overloaded in this routine. The first
+ // meaning is a track in the MIDI file. That is what this routine
+ // processes. A single track from a MIDI file. The second meaning
+ // is a track in m_midiComposition. This is the most common usage.
+ // To improve clarity, "MIDI file track" will be used to refer to
+ // the first sense of the term. Occasionally, "m_midiComposition
+ // track" will be used to refer to the second sense.
+
+ // Absolute time of the last event on any track.
+ unsigned long eventTime = 0;
+
+ // lastTrackNum is the track for all events provided they're
+ // all on the same channel. If we find events on more than one
+ // channel, we increment lastTrackNum and record the mapping from
+ // channel to trackNum in channelToTrack.
+ TrackId lastTrackNum = m_midiComposition.size();
+
+ // MIDI channel to m_midiComposition track.
+ // Note: This would be a vector<TrackId> but TrackId is unsigned
+ // and we need -1 to indicate "not yet used"
+ std::vector<int> channelToTrack(16, -1);
// This is used to store the last absolute time found on each track,
// allowing us to modify delta-times correctly when separating events
// out from one to multiple tracks
- //
- std::map<int, unsigned long> trackTimeMap;
+ // ??? rename: lastEventTime[track]?
+ std::map<int /*track*/, unsigned long /*lastTime*/> trackTimeMap;
+ trackTimeMap[lastTrackNum] = 0;
// Meta-events don't have a channel, so we place them in a fixed
// track number instead
TrackId metaTrack = lastTrackNum;
+ std::string trackName = defaultTrackName;
+ std::string instrumentName;
+
// Remember the last non-meta status byte (-1 if we haven't seen one)
int runningStatus = -1;
bool firstTrack = true;
- std::cerr << "Parse track: last track number is " << lastTrackNum << std::endl;
+ RG_DEBUG << "parseTrack(): last track number is " << lastTrackNum;
- // Since no event and its associated delta time can fit in just one
- // byte, a single remaining byte in the track has to be padding.
- // This obscure and non-standard, but such files do exist; ordinarily
- // there should be no bytes in the track after the last event.
- while (!midiFile->eof() && ( m_trackByteCount > 1 ) ) {
- if (eventCode < 0x80) {
-#ifdef MIDI_DEBUG
- cerr << "WARNING: Invalid event code " << eventCode
- << " in MIDI file" << endl;
-#endif
+ // While there is still data to read in the MIDI file track.
+ // Why "m_trackByteCount > 1" instead of "m_trackByteCount > 0"? Since
+ // no event and its associated delta time can fit in just one
+ // byte, a single remaining byte in the MIDI file track has to be padding.
+ // This is obscure and non-standard, but such files do exist; ordinarily
+ // there should be no bytes in the MIDI file track after the last event.
+ while (!midiFile->eof() && m_trackByteCount > 1) {
- throw (Exception(qstrtostr(QObject::tr("Invalid event code found"))));
- }
+ unsigned long deltaTime = readNumber(midiFile);
- deltaTime = getNumberFromMidiBytes(midiFile);
+ RG_DEBUG << "parseTrack(): read delta time " << deltaTime;
-#ifdef MIDI_DEBUG
- cerr << "read delta time " << deltaTime << endl;
-#endif
+ // Compute the absolute time for the event.
+ eventTime += deltaTime;
// Get a single byte
- midiByte = getMidiByte(midiFile);
+ MidiByte midiByte = read(midiFile);
- if (!(midiByte & MIDI_STATUS_BYTE_MASK)) {
- if (runningStatus < 0) {
- throw (Exception(qstrtostr(QObject::tr("Running status used for first event in track"))));
- }
+ MidiByte statusByte = 0;
+ MidiByte data1 = 0;
- eventCode = (MidiByte)runningStatus;
- data1 = midiByte;
+ // If this is a status byte, use it.
+ if (midiByte & MIDI_STATUS_BYTE_MASK) {
+ RG_DEBUG << "parseTrack(): have new status byte" << QString("0x%1").arg(midiByte, 0, 16);
-#ifdef MIDI_DEBUG
- std::cerr << "using running status (byte " << int(midiByte) << " found)" << std::endl;
-#endif
+ statusByte = midiByte;
+ data1 = read(midiFile);
+ } else { // Use running status.
+ // If we haven't seen a status byte yet, fail.
+ if (runningStatus < 0)
+ throw Exception(qstrtostr(QObject::tr("Running status used for first event in track")));
- } else {
-#ifdef MIDI_DEBUG
- std::cerr << "have new event code " << int(midiByte) << std::endl;
-#endif
+ statusByte = (MidiByte)runningStatus;
+ data1 = midiByte;
- eventCode = midiByte;
- data1 = getMidiByte(midiFile);
+ RG_DEBUG << "parseTrack(): using running status (byte " << int(midiByte) << " found)";
}
- if (eventCode == MIDI_FILE_META_EVENT) // meta events
- {
- // metaEventCode = getMidiByte(midiFile);
- metaEventCode = data1;
- messageLength = getNumberFromMidiBytes(midiFile);
+ if (statusByte == MIDI_FILE_META_EVENT) {
-#ifdef MIDI_DEBUG
+ MidiByte metaEventCode = data1;
+ unsigned messageLength = readNumber(midiFile);
- std::cerr << "Meta event of type " << int(metaEventCode) << " and " << messageLength << " bytes found" << std::endl;
-#endif
+ RG_DEBUG << "parseTrack(): Meta event of type " << QString("0x%1").arg(metaEventCode, 0, 16) << " and " << messageLength << " bytes found";
- metaMessage = getMidiBytes(midiFile, messageLength);
+ std::string metaMessage = read(midiFile, messageLength);
- if (metaEventCode == MIDI_TIME_SIGNATURE ||
- metaEventCode == MIDI_SET_TEMPO)
- {
- m_containsTimeChanges = true;
- }
-
- long gap = accumulatedTime - trackTimeMap[metaTrack];
- accumulatedTime += deltaTime;
- deltaTime += gap;
- trackTimeMap[metaTrack] = accumulatedTime;
+ // Compute the difference between this event and the previous
+ // event on this track.
+ deltaTime = eventTime - trackTimeMap[metaTrack];
+ // Store the absolute time of the last event on this track.
+ trackTimeMap[metaTrack] = eventTime;
+ // create and store our event
MidiEvent *e = new MidiEvent(deltaTime,
MIDI_FILE_META_EVENT,
metaEventCode,
metaMessage);
-
m_midiComposition[metaTrack].push_back(e);
- } else // the rest
- {
- runningStatus = eventCode;
-
- MidiEvent *midiEvent;
-
- int channel = (eventCode & MIDI_CHANNEL_NUM_MASK);
- if (channelTrackMap[channel] == -1) {
- if (!firstTrack) {
- ++lastTrackNum;
- } else {
- firstTrack = false;
- }
- std::cerr << "MidiFile: new channel map entry: channel " << channel << " -> track " << lastTrackNum << std::endl;
- channelTrackMap[channel] = lastTrackNum;
- m_trackChannelMap[lastTrackNum] = channel;
+ if (metaEventCode == MIDI_TRACK_NAME)
+ trackName = metaMessage;
+ else if (metaEventCode == MIDI_INSTRUMENT_NAME)
+ instrumentName = metaMessage;
+
+ // Get the next event.
+ continue;
+ }
+
+ runningStatus = statusByte;
+
+ int channel = (statusByte & MIDI_CHANNEL_NUM_MASK);
+
+ // If this channel hasn't been seen yet in this MIDI file track
+ if (channelToTrack[channel] == -1) {
+ // If this is the first m_midiComposition track we've
+ // used
+ if (firstTrack) {
+ // We've already allocated an m_midiComposition track for
+ // the first channel we encounter. Use it.
+ firstTrack = false;
+ } else { // We need a new track.
+ // Allocate a new track for this channel.
+ ++lastTrackNum;
+ trackTimeMap[lastTrackNum] = 0;
}
- TrackId trackNum = channelTrackMap[channel];
+ RG_DEBUG << "parseTrack(): new channel map entry: channel " << channel << " -> track " << lastTrackNum;
- {
- static int prevTrackNum = -1, prevChannel = -1;
- if (prevTrackNum != (int) trackNum ||
- prevChannel != (int) channel) {
- std::cerr << "MidiFile: track number for channel " << channel << " is " << trackNum << std::endl;
- prevTrackNum = trackNum;
- prevChannel = channel;
- }
- }
+ channelToTrack[channel] = lastTrackNum;
+ m_trackChannelMap[lastTrackNum] = channel;
+ }
- // accumulatedTime is abs time of last event on any track;
- // trackTimeMap[trackNum] is that of last event on this track
+ TrackId trackNum = channelToTrack[channel];
- long gap = accumulatedTime - trackTimeMap[trackNum];
- accumulatedTime += deltaTime;
- deltaTime += gap;
- trackTimeMap[trackNum] = accumulatedTime;
+#ifdef DEBUG
+ {
+ static int prevTrackNum = -1;
+ static int prevChannel = -1;
- switch (eventCode & MIDI_MESSAGE_TYPE_MASK) {
- case MIDI_NOTE_ON:
- case MIDI_NOTE_OFF:
- case MIDI_POLY_AFTERTOUCH:
- case MIDI_CTRL_CHANGE:
- data2 = getMidiByte(midiFile);
+ // If we're on a different track or channel
+ if (prevTrackNum != (int)trackNum ||
+ prevChannel != (int)channel) {
- // create and store our event
- midiEvent = new MidiEvent(deltaTime, eventCode, data1, data2);
+ // Report it for debugging.
+ RG_DEBUG << "parseTrack(): track number for channel " << channel << " is " << trackNum;
-#ifdef MIDI_DEBUG
- std::cerr << "MIDI event for channel " << channel + 1 << " (track "
- << trackNum << ")" << std::endl;
- midiEvent->print();
+ prevTrackNum = trackNum;
+ prevChannel = channel;
+ }
+ }
#endif
+ // Compute the difference between this event and the previous
+ // event on this track.
+ deltaTime = eventTime - trackTimeMap[trackNum];
+ // Store the absolute time of the last event on this track.
+ trackTimeMap[trackNum] = eventTime;
+
+ switch (statusByte & MIDI_MESSAGE_TYPE_MASK) {
+ case MIDI_NOTE_ON: // These events have two data bytes.
+ case MIDI_NOTE_OFF:
+ case MIDI_POLY_AFTERTOUCH:
+ case MIDI_CTRL_CHANGE:
+ case MIDI_PITCH_BEND:
+ {
+ MidiByte data2 = read(midiFile);
+ // create and store our event
+ MidiEvent *midiEvent =
+ new MidiEvent(deltaTime, statusByte, data1, data2);
m_midiComposition[trackNum].push_back(midiEvent);
- break;
- case MIDI_PITCH_BEND:
- data2 = getMidiByte(midiFile);
+ if (statusByte != MIDI_PITCH_BEND) {
+ RG_DEBUG << "parseTrack(): MIDI event for channel " << channel + 1 << " (track " << trackNum << ')';
+ // ??? This prints to cout. We need an operator<<() to
+ // allow printing to RG_DEBUG output.
+ //midiEvent->print();
+ //RG_DEBUG << *midiEvent; // Preferred.
+ }
+ }
+ break;
- // create and store our event
- midiEvent = new MidiEvent(deltaTime, eventCode, data1, data2);
- m_midiComposition[trackNum].push_back(midiEvent);
- break;
+ case MIDI_PROG_CHANGE: // These events have a single data byte.
+ case MIDI_CHNL_AFTERTOUCH:
+ {
+ RG_DEBUG << "parseTrack(): Program change (Cn) or channel aftertouch (Dn): time " << deltaTime << ", code " << QString("0x%1").arg(statusByte, 0, 16) << ", data " << (int) data1 << " going to track " << trackNum;
- case MIDI_PROG_CHANGE:
- case MIDI_CHNL_AFTERTOUCH:
// create and store our event
- std::cerr << "Program change or channel aftertouch: time " << deltaTime << ", code " << (int)eventCode << ", data " << (int) data1 << " going to track " << trackNum << std::endl;
- midiEvent = new MidiEvent(deltaTime, eventCode, data1);
+ MidiEvent *midiEvent =
+ new MidiEvent(deltaTime, statusByte, data1);
m_midiComposition[trackNum].push_back(midiEvent);
- break;
-
- case MIDI_SYSTEM_EXCLUSIVE:
- messageLength = getNumberFromMidiBytes(midiFile, data1);
+ }
+ break;
-#ifdef MIDI_DEBUG
+ case MIDI_SYSTEM_EXCLUSIVE:
+ {
+ unsigned messageLength = readNumber(midiFile, data1);
- std::cerr << "SysEx of " << messageLength << " bytes found" << std::endl;
-#endif
+ RG_DEBUG << "parseTrack(): SysEx of " << messageLength << " bytes found";
- metaMessage = getMidiBytes(midiFile, messageLength);
+ std::string sysex = read(midiFile, messageLength);
- if (MidiByte(metaMessage[metaMessage.length() - 1]) !=
+ if (MidiByte(sysex[sysex.length() - 1]) !=
MIDI_END_OF_EXCLUSIVE) {
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::parseTrack() - "
- << "malformed or unsupported SysEx type"
- << std::endl;
-#endif
-
+ std::cerr << "MidiFile::parseTrack() - malformed or unsupported SysEx type\n";
continue;
}
- // chop off the EOX
- // length fixed by Pedro Lopez-Cabanillas (20030523)
- //
- metaMessage = metaMessage.substr(0, metaMessage.length() - 1);
+ // Chop off the EOX.
+ sysex = sysex.substr(0, sysex.length() - 1);
- midiEvent = new MidiEvent(deltaTime,
- MIDI_SYSTEM_EXCLUSIVE,
- metaMessage);
+ // create and store our event
+ MidiEvent *midiEvent =
+ new MidiEvent(deltaTime,
+ MIDI_SYSTEM_EXCLUSIVE,
+ sysex);
m_midiComposition[trackNum].push_back(midiEvent);
- break;
-
- case MIDI_END_OF_EXCLUSIVE:
-#ifdef MIDI_DEBUG
-
- std::cerr << "MidiFile::parseTrack() - "
- << "Found a stray MIDI_END_OF_EXCLUSIVE" << std::endl;
-#endif
-
- break;
-
- default:
-#ifdef MIDI_DEBUG
+ }
+ break;
- std::cerr << "MidiFile::parseTrack()"
- << " - Unsupported MIDI Event Code: "
- << (int)eventCode << endl;
-#endif
+ case MIDI_END_OF_EXCLUSIVE:
+ std::cerr << "MidiFile::parseTrack() - Found a stray MIDI_END_OF_EXCLUSIVE\n";
+ break;
- break;
- }
+ default:
+ std::cerr << "MidiFile::parseTrack() - Unsupported MIDI Status Byte: " << QString("0x%1").arg(statusByte, 0, 16) << '\n';
+ break;
}
}
- // If the track has a padding byte, read and discard it to make sure that
- // the stream is positioned at the beginning of the following
- // track (if there is one.)
- if (m_trackByteCount == 1) {
+ // If the MIDI file track has a padding byte, read and discard it
+ // to make sure that the stream is positioned at the beginning of
+ // the following MIDI file track (if there is one.)
+ if (m_trackByteCount == 1)
midiFile->ignore();
- }
- return (true);
-}
+ if (instrumentName != "")
+ trackName += " (" + instrumentName + ")";
-// borrowed from ALSA pcm_timer.c
-//
-static unsigned long gcd(unsigned long a, unsigned long b)
-{
- unsigned long r;
- if (a < b) {
- r = a;
- a = b;
- b = r;
- }
- while ((r = a % b) != 0) {
- a = b;
- b = r;
- }
- return b;
+ // Fill out the Track Names
+ for (TrackId i = metaTrack; i <= lastTrackNum; ++i)
+ m_trackNames.push_back(trackName);
}
-// If we wanted to abstract the MidiFile class to make it more useful to
-// other applications (and formats) we'd make this method and its twin
-// pure virtual.
-//
bool
-MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
+MidiFile::convertToRosegarden(const QString &filename, RosegardenDocument *doc)
{
Profiler profiler("MidiFile::convertToRosegarden");
- MidiTrack::iterator midiEvent;
- Segment *rosegardenSegment;
- Segment *conductorSegment = 0;
- Event *rosegardenEvent;
- string trackName;
-
- // Time conversions
- //
- timeT rosegardenTime = 0;
- timeT rosegardenDuration = 0;
- timeT maxTime = 0;
-
- // To create rests
- //
- timeT endOfLastNote;
-
- // Event specific vars
- //
- int numerator = 4;
- int denominator = 4;
- timeT segmentTime;
-
- // keys
- int accidentals;
- bool isMinor;
- bool isSharp;
-
- if (type == CONVERT_REPLACE)
- composition.clear();
-
- timeT origin = 0;
- if (type == CONVERT_APPEND && composition.getDuration() > 0) {
- origin = composition.getBarEndForTime(composition.getDuration());
- }
+ // Read the MIDI file into m_midiComposition.
+ if (!read(filename))
+ return false;
- TrackId compTrack = 0;
- for (Composition::iterator ci = composition.begin();
- ci != composition.end(); ++ci) {
- if ((*ci)->getTrack() >= compTrack)
- compTrack = (*ci)->getTrack() + 1;
+ if (m_midiComposition.size() != m_trackNames.size()) {
+ std::cerr << "MidiFile::convertToRosegarden(): m_midiComposition and m_trackNames size mismatch\n";
+ return false;
}
- Track *track = 0;
-
- // precalculate the timing factor
- //
- // [cc] -- attempt to avoid floating-point rounding errors
- timeT crotchetTime = Note(Note::Crotchet).getDuration();
- int divisor = m_timingDivision ? m_timingDivision : 96;
+ Composition &composition = doc->getComposition();
+ Studio &studio = doc->getStudio();
- unsigned long multiplier = crotchetTime;
- int g = (int)gcd(crotchetTime, divisor);
- multiplier /= g;
- divisor /= g;
-
- timeT maxRawTime = LONG_MAX;
- if ((long)multiplier > (long)divisor)
- maxRawTime = (maxRawTime / multiplier) * divisor;
-
- //bool haveTimeSignatures = false;
- InstrumentId compInstrument = MidiInstrumentBase;
+ composition.clear();
// Clear down the assigned Instruments we already have
- //
- if (type == CONVERT_REPLACE) {
- m_studio->unassignAllInstruments();
- }
+ studio.unassignAllInstruments();
- std::vector<Segment *> addedSegments;
-
-#ifdef MIDI_DEBUG
- std::cerr << "NUMBER OF TRACKS = " << m_numberOfTracks << endl;
- std::cerr << "MIDI COMP SIZE = " << m_midiComposition.size() << endl;
-#endif
+ RG_DEBUG << "convertToRosegarden(): MIDI COMP SIZE = " << m_midiComposition.size();
if (m_timingFormat == MIDI_TIMING_SMPTE) {
@@ -840,12 +618,17 @@ MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
// good idea to mess with file loading just for the sake of
// slightly simpler code. So, SMPTE only.
- std::map<int, tempoT> tempi;
- for (TrackId i = 0; i < m_numberOfTracks; ++i) {
- for (midiEvent = m_midiComposition[i].begin();
+ typedef std::map<int /*time*/, tempoT> TempoMap;
+ TempoMap tempi;
+
+ // For each track
+ for (TrackId i = 0; i < m_midiComposition.size(); ++i) {
+ // For each event
+ for (MidiTrack::const_iterator midiEvent = m_midiComposition[i].begin();
midiEvent != m_midiComposition[i].end();
++midiEvent) {
if ((*midiEvent)->isMeta()) {
+ // If we have a set tempo meta-event
if ((*midiEvent)->getMetaEventCode() == MIDI_SET_TEMPO) {
MidiByte m0 = (*midiEvent)->getMetaMessage()[0];
MidiByte m1 = (*midiEvent)->getMetaMessage()[1];
@@ -854,96 +637,123 @@ MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
if (tempo != 0) {
double qpm = 60000000.0 / double(tempo);
tempoT rgt(Composition::getTempoForQpm(qpm));
+ // Store the tempo in the tempo map.
+ // ??? Strange. The event's time is a delta
+ // time at this point. Seems wrong.
tempi[(*midiEvent)->getTime()] = rgt;
}
}
}
}
}
- for (std::map<int, tempoT>::const_iterator i = tempi.begin();
- i != tempi.end(); ++i) {
- timeT t = composition.getElapsedTimeForRealTime
- (RealTime::frame2RealTime(i->first, m_fps * m_subframes));
+
+ // For each set tempo meta-event
+ for (TempoMap::const_iterator i = tempi.begin();
+ i != tempi.end();
+ ++i) {
+ timeT t = composition.getElapsedTimeForRealTime(
+ RealTime::frame2RealTime(i->first, m_fps * m_subframes));
composition.addTempoAtTime(t, i->second);
}
}
- for (TrackId i = 0; i < m_numberOfTracks; ++i) {
+ const int rosegardenPPQ = Note(Note::Crotchet).getDuration();
+ const int midiFilePPQ = m_timingDivision ? m_timingDivision : 96;
+ // Conversion factor.
+ const double midiToRgTime =
+ static_cast<double>(rosegardenPPQ) /
+ static_cast<double>(midiFilePPQ);
+
+ // Used to expand the composition if needed.
+ timeT maxTime = 0;
+
+ Segment *conductorSegment = 0;
+
+ // Time Signature
+ int numerator = 4;
+ int denominator = 4;
- segmentTime = 0;
- trackName = string("Imported MIDI");
+ // Destination TrackId in the Composition.
+ TrackId rosegardenTrackId = 0;
+
+ // Keep track of the segments we add to the composition for
+ // post-processing.
+ std::vector<Segment *> addedSegments;
+
+ // For each track
+ // ??? BIG loop.
+ for (TrackId trackId = 0;
+ trackId < m_midiComposition.size();
+ ++trackId) {
// progress - 20% total in file import itself and then 80%
// split over these tracks
- emit setValue(20 +
- (int)((80.0 * double(i) / double(m_numberOfTracks))));
- qApp->processEvents(QEventLoop::AllEvents);
-
- // Convert the deltaTime to an absolute time since
- // the start of the segment. The addTime method
- // returns the sum of the current Midi Event delta
- // time plus the argument.
- //
- for (midiEvent = m_midiComposition[i].begin();
- midiEvent != m_midiComposition[i].end();
+ emit progress(20 + static_cast<int>(
+ 80.0 * trackId / m_midiComposition.size()));
+ // Kick the event loop.
+ qApp->processEvents();
+
+ timeT absTime = 0;
+
+ // Convert the event times from delta to absolute for
+ // consolidateNoteEvents().
+ for (MidiTrack::iterator midiEvent = m_midiComposition[trackId].begin();
+ midiEvent != m_midiComposition[trackId].end();
++midiEvent) {
- segmentTime = (*midiEvent)->addTime(segmentTime);
+ absTime += (*midiEvent)->getTime();
+ (*midiEvent)->setTime(absTime);
}
- // Consolidate NOTE ON and NOTE OFF events into a NOTE ON with
+ // Consolidate NOTE ON and NOTE OFF events into NOTE ON events with
// a duration.
- //
- consolidateNoteOffEvents(i);
-
- if (m_trackChannelMap.find(i) != m_trackChannelMap.end()) {
- compInstrument = MidiInstrumentBase + m_trackChannelMap[i];
- } else {
- compInstrument = MidiInstrumentBase;
- }
+ consolidateNoteEvents(trackId);
- rosegardenSegment = new Segment;
- rosegardenSegment->setTrack(compTrack);
- rosegardenSegment->setStartTime(0);
+ InstrumentId instrumentId = MidiInstrumentBase;
- track = new Track(compTrack, // id
- compInstrument, // instrument
- compTrack, // position
- trackName, // name
- false); // muted
+ // If this track has a channel, use that channel's instrument.
+ if (m_trackChannelMap.find(trackId) != m_trackChannelMap.end()) {
+ instrumentId = MidiInstrumentBase + m_trackChannelMap[trackId];
+ }
- std::cerr << "New Rosegarden track: id = " << compTrack << ", instrument = " << compInstrument << ", name = " << trackName << std::endl;
+ Segment *segment = new Segment;
+ segment->setLabel(m_trackNames[trackId]);
+ segment->setTrack(rosegardenTrackId);
+ segment->setStartTime(0);
- // rest creation token needs to be reset here
- //
- endOfLastNote = 0;
+ Track *track = new Track(rosegardenTrackId, // id
+ instrumentId, // instrument
+ rosegardenTrackId, // position
+ m_trackNames[trackId], // label
+ false); // muted
- int msb = -1, lsb = -1; // for bank selects
- Instrument *instrument = 0;
+ RG_DEBUG << "convertToRosegarden(): New Rosegarden track: id = " << rosegardenTrackId << ", instrument = " << instrumentId;
- for (midiEvent = m_midiComposition[i].begin();
- midiEvent != m_midiComposition[i].end();
- ++midiEvent) {
+ // Used for filling the space between events with rests. Also used
+ // for padding the end of the track with rests.
+ timeT endOfLastNote = 0;
- rosegardenEvent = 0;
+ // Statistics.
+ int noteCount = 0;
+ int keySigCount = 0;
- // [cc] -- avoid floating-point where possible
+ // For each event on the current track
+ // ??? BIG loop.
+ for (MidiTrack::const_iterator midiEventIter =
+ m_midiComposition[trackId].begin();
+ midiEventIter != m_midiComposition[trackId].end();
+ ++midiEventIter) {
+ const MidiEvent &midiEvent = **midiEventIter;
- timeT rawTime = (*midiEvent)->getTime();
- timeT rawDuration = (*midiEvent)->getDuration();
+ const timeT midiAbsoluteTime = midiEvent.getTime();
+ const timeT midiDuration = midiEvent.getDuration();
+ timeT rosegardenTime = 0;
+ timeT rosegardenDuration = 0;
if (m_timingFormat == MIDI_TIMING_PPQ_TIMEBASE) {
-
- if (rawTime < maxRawTime) {
- rosegardenTime = origin +
- timeT((rawTime * multiplier) / divisor);
- } else {
- rosegardenTime = origin +
- timeT((double(rawTime) * multiplier) / double(divisor) + 0.01);
- }
-
+ rosegardenTime =
+ static_cast<timeT>(midiAbsoluteTime * midiToRgTime);
rosegardenDuration =
- timeT((rawDuration * multiplier) / divisor);
-
+ static_cast<timeT>(midiDuration * midiToRgTime);
} else {
// SMPTE timestamps are a count of the number of
@@ -953,154 +763,184 @@ MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
// go through a realtime -> musical time conversion
// for these, having added our tempo changes earlier
- rosegardenTime = composition.getElapsedTimeForRealTime
- (RealTime::frame2RealTime(rawTime,
- m_fps * m_subframes));
+ rosegardenTime = composition.getElapsedTimeForRealTime(
+ RealTime::frame2RealTime(midiAbsoluteTime,
+ m_fps * m_subframes));
- rosegardenDuration = composition.getElapsedTimeForRealTime
- (RealTime::frame2RealTime(rawTime + rawDuration,
- m_fps * m_subframes))
+ rosegardenDuration = composition.getElapsedTimeForRealTime(
+ RealTime::frame2RealTime(midiAbsoluteTime + midiDuration,
+ m_fps * m_subframes))
- rosegardenTime;
}
-#ifdef MIDI_DEBUG
- std::cerr << "MIDI file import: origin " << origin
- << ", event time " << rosegardenTime
- << ", duration " << rosegardenDuration
- << ", event type " << (int)(*midiEvent)->getMessageType()
- << ", previous max time " << maxTime
- << ", potential max time " << (rosegardenTime + rosegardenDuration)
- << ", ev raw time " << (*midiEvent)->getTime()
- << ", ev raw duration " << (*midiEvent)->getDuration()
- << ", crotchet " << crotchetTime
- << ", multiplier " << multiplier
- << ", divisor " << divisor
- << ", sfps " << m_fps * m_subframes
- << std::endl;
-#endif
-
- if (rosegardenTime + rosegardenDuration > maxTime) {
+ RG_DEBUG << "convertToRosegarden(): MIDI file import: event time " << rosegardenTime
+ << ", duration " << rosegardenDuration
+ << ", event type " << (int)midiEvent.getMessageType()
+ << ", previous max time " << maxTime
+ << ", potential max time " << (rosegardenTime + rosegardenDuration)
+ << ", ev raw time " << midiAbsoluteTime
+ << ", ev raw duration " << midiDuration
+ << ", crotchet " << Note(Note::Crotchet).getDuration()
+ << ", midiToRgTime " << midiToRgTime
+ << ", sfps " << m_fps * m_subframes;
+
+ if (rosegardenTime + rosegardenDuration > maxTime)
maxTime = rosegardenTime + rosegardenDuration;
- }
- if (rosegardenSegment->empty()) {
+ // If we don't have any events yet
+ if (segment->empty()) {
+ // Save the beginning of the bar so we can pad to the
+ // left with rests.
+ // ??? But if we have a loop with a precise start and end,
+ // this ruins the start. This would preserve it:
+ // endOfLastNote = rosegardenTime;
+ // If the user wants the beginning on a bar, they can
+ // easily do that. We shouldn't be modifying things.
endOfLastNote = composition.getBarStartForTime(rosegardenTime);
}
- if ((*midiEvent)->isMeta()) {
+ // The incoming midiEvent is transformed into this rosegardenEvent.
+ Event *rosegardenEvent = 0;
+
+ if (midiEvent.isMeta()) {
- switch ((*midiEvent)->getMetaEventCode()) {
+ switch (midiEvent.getMetaEventCode()) {
case MIDI_TEXT_EVENT: {
- std::string text = (*midiEvent)->getMetaMessage();
- rosegardenEvent =
+ std::string text = midiEvent.getMetaMessage();
+ rosegardenEvent =
Text(text).getAsEvent(rosegardenTime);
- }
break;
+ }
case MIDI_LYRIC: {
- std::string text = (*midiEvent)->getMetaMessage();
- rosegardenEvent =
- Text(text, Text::Lyric).
- getAsEvent(rosegardenTime);
- }
+ std::string text = midiEvent.getMetaMessage();
+ rosegardenEvent =
+ Text(text, Text::Lyric).getAsEvent(rosegardenTime);
break;
+ }
case MIDI_TEXT_MARKER: {
- std::string text = (*midiEvent)->getMetaMessage();
- composition.addMarker(new Marker
- (rosegardenTime, text, ""));
- }
+ std::string text = midiEvent.getMetaMessage();
+ composition.addMarker(
+ new Marker(rosegardenTime, text, ""));
break;
+ }
case MIDI_COPYRIGHT_NOTICE:
- if (type == CONVERT_REPLACE) {
- composition.setCopyrightNote((*midiEvent)->
- getMetaMessage());
- }
+ composition.setCopyrightNote(midiEvent.getMetaMessage());
break;
case MIDI_TRACK_NAME:
- track->setLabel((*midiEvent)->getMetaMessage());
+ // We already handled this in parseTrack().
break;
- case MIDI_INSTRUMENT_NAME:
- rosegardenSegment->setLabel((*midiEvent)->getMetaMessage());
- break;
+ case MIDI_INSTRUMENT_NAME:
+ // We already handled this in parseTrack().
+ break;
case MIDI_END_OF_TRACK: {
timeT trackEndTime = rosegardenTime;
+
+ // If the track's empty (or worse)
if (trackEndTime <= 0) {
- trackEndTime = crotchetTime * 4 * numerator / denominator;
+ // Make it a full bar.
+ // ??? Use Semibreve instead of Crotchet*4.
+ trackEndTime =
+ Note(Note::Crotchet).getDuration() * 4 *
+ numerator / denominator;
}
+
+ // If there's space between the last note and the track
+ // end, fill it out with rests.
if (endOfLastNote < trackEndTime) {
// If there's nothing in the segment yet, then we
// shouldn't fill with rests because we don't want
- // to cause the otherwise empty segment to be created
- if (rosegardenSegment->size() > 0) {
- rosegardenSegment->fillWithRests(trackEndTime);
- }
+ // to cause the otherwise empty segment to be created.
+ if (!segment->empty())
+ segment->fillWithRests(trackEndTime);
}
- }
+
break;
+ }
case MIDI_SET_TEMPO:
+ // We've already handled the SMPTE case above.
if (m_timingFormat == MIDI_TIMING_PPQ_TIMEBASE) {
- // (if we have smpte, we have already done this)
-
- MidiByte m0 = (*midiEvent)->getMetaMessage()[0];
- MidiByte m1 = (*midiEvent)->getMetaMessage()[1];
- MidiByte m2 = (*midiEvent)->getMetaMessage()[2];
-
- long tempo = (((m0 << 8) + m1) << 8) + m2;
-
- if (tempo != 0) {
- double qpm = 60000000.0 / double(tempo);
- tempoT rgt(Composition::getTempoForQpm(qpm));
-// std::cout << "MidiFile: converted MIDI tempo " << tempo << " to Rosegarden tempo " << rgt << std::endl;
- composition.addTempoAtTime(rosegardenTime, rgt);
+ MidiByte m0 = midiEvent.getMetaMessage()[0];
+ MidiByte m1 = midiEvent.getMetaMessage()[1];
+ MidiByte m2 = midiEvent.getMetaMessage()[2];
+
+ // usecs per quarter-note
+ long midiTempo = (((m0 << 8) + m1) << 8) + m2;
+
+ if (midiTempo != 0) {
+ // Convert to quarter-notes per minute.
+ double qpm = 60000000.0 / midiTempo;
+ tempoT rosegardenTempo(
+ Composition::getTempoForQpm(qpm));
+ //RG_DEBUG << "convertToRosegarden(): converted MIDI tempo " << midiTempo << " to Rosegarden tempo " << rosegardenTempo;
+ composition.addTempoAtTime(
+ rosegardenTime, rosegardenTempo);
}
}
break;
- case MIDI_TIME_SIGNATURE:
- numerator = (int) (*midiEvent)->getMetaMessage()[0];
- denominator = 1 << ((int)(*midiEvent)->getMetaMessage()[1]);
+ case MIDI_TIME_SIGNATURE: {
+ std::string metaMessage = midiEvent.getMetaMessage();
+
+ numerator = static_cast<int>(metaMessage[0]);
+ denominator = 1 << static_cast<int>(metaMessage[1]);
- // NB. a MIDI time signature also has
- // metamessage[2] and [3], containing some timing data
+ // A MIDI time signature has additional information that
+ // we ignore. From the spec, section 4 page 10:
+ // metaMessage[2] "expresses the number of *MIDI clocks*
+ // in a metronome tick."
+ // metaMessage[3] "expresses the number of notated
+ // 32nd-notes in what MIDI thinks of as a quarter-note
+ // (24 MIDI clocks)."
- if (numerator == 0) numerator = 4;
- if (denominator == 0) denominator = 4;
+ // Fall back on 4/4
+ if (numerator == 0)
+ numerator = 4;
+ if (denominator == 0)
+ denominator = 4;
+
+ composition.addTimeSignature(
+ rosegardenTime,
+ TimeSignature(numerator, denominator));
- composition.addTimeSignature
- (rosegardenTime,
- TimeSignature(numerator, denominator));
- //haveTimeSignatures = true;
break;
+ }
+
+ case MIDI_KEY_SIGNATURE: {
+ std::string metaMessage = midiEvent.getMetaMessage();
+
+ // Whether char is signed or unsigned is platform
+ // dependent. Casting to signed char guarantees the
+ // correct results on all platforms.
+
+ int accidentals =
+ abs(static_cast<signed char>(metaMessage[0]));
+ bool isSharp =
+ (static_cast<signed char>(metaMessage[0]) >= 0);
+
+ bool isMinor = (metaMessage[1] != 0);
- case MIDI_KEY_SIGNATURE:
- // get the details
- accidentals = (int) (*midiEvent)->getMetaMessage()[0];
- isMinor = (int) (*midiEvent)->getMetaMessage()[1];
- isSharp = accidentals < 0 ? false : true;
- accidentals = accidentals < 0 ? -accidentals : accidentals;
- // create the key event
- //
try {
- rosegardenEvent = Rosegarden::Key
- (accidentals, isSharp, isMinor).
- getAsEvent(rosegardenTime);
+ rosegardenEvent =
+ Rosegarden::Key(accidentals, isSharp, isMinor).
+ getAsEvent(rosegardenTime);
}
catch (...) {
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::convertToRosegarden - "
- << " badly formed key signature"
- << std::endl;
-#endif
+ std::cerr << "MidiFile::convertToRosegarden() - badly formed key signature\n";
break;
}
+
+ ++keySigCount;
+
break;
+ }
case MIDI_SEQUENCE_NUMBER:
case MIDI_CHANNEL_PREFIX_OR_PORT:
@@ -1109,325 +949,337 @@ MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
case MIDI_SEQUENCER_SPECIFIC:
case MIDI_SMPTE_OFFSET:
default:
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::convertToRosegarden - "
- << "unsupported META event code "
- << (int)((*midiEvent)->getMetaEventCode()) << endl;
-#endif
+ std::cerr << "MidiFile::convertToRosegarden() - unsupported META event code " << QString("0x%1").arg(midiEvent.getMetaEventCode(), 0, 16) << '\n';
break;
}
- } else
- switch ((*midiEvent)->getMessageType()) {
+ } else { // Not a meta-event.
+ switch (midiEvent.getMessageType()) {
case MIDI_NOTE_ON:
- // A zero velocity here is a virtual "NOTE OFF"
- // so we ignore this event
- //
- if ((*midiEvent)->getVelocity() == 0) break;
+ // Note-off? Ignore. Note-ons and note-offs have been
+ // consolidated. Stray note-offs can be ignored.
+ if (midiEvent.getVelocity() == 0)
+ break;
endOfLastNote = rosegardenTime + rosegardenDuration;
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::convertToRosegarden: note at " << rosegardenTime << ", duration " << rosegardenDuration << ", midi time " << (*midiEvent)->getTime() << " and duration " << (*midiEvent)->getDuration() << std::endl;
-#endif
+ RG_DEBUG << "convertToRosegarden(): note at " << rosegardenTime << ", duration " << rosegardenDuration << ", midi time " << midiAbsoluteTime << " and duration " << midiDuration;
- // create and populate event
rosegardenEvent = new Event(Note::EventType,
rosegardenTime,
rosegardenDuration);
rosegardenEvent->set<Int>(BaseProperties::PITCH,
- (*midiEvent)->getPitch());
+ midiEvent.getPitch());
rosegardenEvent->set<Int>(BaseProperties::VELOCITY,
- (*midiEvent)->getVelocity());
+ midiEvent.getVelocity());
+
+ ++noteCount;
+
break;
- // We ignore any NOTE OFFs here as we've already
- // converted NOTE ONs to have duration
- //
case MIDI_NOTE_OFF:
- continue;
+ // Note-off? Ignore. Note-ons and note-offs have been
+ // consolidated. Stray note-offs can be ignored.
break;
case MIDI_PROG_CHANGE:
- // Attempt to turn the prog change we've found into an
- // Instrument. Send the program number and whether or
- // not we're on the percussion channel.
- //
- // Note that we make no attempt to do the right
- // thing with program changes during a track -- we
- // just save them as events. Only the first is
- // used to select the instrument. If it's at time
- // zero, it's not saved as an event.
- //
-// std::cerr << "Program change found" << std::endl;
-
- if (!instrument) {
-
- bool percussion = ((*midiEvent)->getChannelNumber() ==
- MIDI_PERCUSSION_CHANNEL);
- int program = (*midiEvent)->getData1();
-
- if (type == CONVERT_REPLACE) {
-
- instrument = m_studio->getInstrumentById(compInstrument);
- if (instrument) {
- instrument->setPercussion(percussion);
- instrument->setSendProgramChange(true);
- instrument->setProgramChange(program);
- instrument->setSendBankSelect(msb >= 0 || lsb >= 0);
- if (instrument->sendsBankSelect()) {
- instrument->setMSB(msb >= 0 ? msb : 0);
- instrument->setLSB(lsb >= 0 ? lsb : 0);
- }
- }
- } else { // not CONVERT_REPLACE
- instrument =
- m_studio->assignMidiProgramToInstrument
- (program, msb, lsb, percussion);
- }
- }
-
- // assign it here
- if (instrument) {
- track->setInstrument(instrument->getId());
- // We used to set the segment name from the instrument
- // here, but now we do them all at the end only if the
- // segment has no other name set (e.g. from instrument
- // meta event)
- if ((*midiEvent)->getTime() == 0) break; // no insert
- }
-
- // did we have a bank select? if so, insert that too
-
- if (msb >= 0) {
- rosegardenSegment->insert
- (Controller(MIDI_CONTROLLER_BANK_MSB, msb).
- getAsEvent(rosegardenTime));
- }
- if (lsb >= 0) {
- rosegardenSegment->insert
- (Controller(MIDI_CONTROLLER_BANK_LSB, msb).
- getAsEvent(rosegardenTime));
- }
-
- rosegardenEvent =
- ProgramChange((*midiEvent)->getData1()).
- getAsEvent(rosegardenTime);
+ rosegardenEvent = ProgramChange(midiEvent.getData1()).
+ getAsEvent(rosegardenTime);
break;
case MIDI_CTRL_CHANGE:
-
- // If it's a bank select, interpret it (or remember
- // for later insertion) instead of just inserting it
- // as a Rosegarden event
-
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_BANK_MSB) {
- msb = (*midiEvent)->getData2();
- break;
- }
-
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_BANK_LSB) {
- lsb = (*midiEvent)->getData2();
- break;
- }
-
- // If it's something we can use as an instrument
- // parameter, and it's at time zero, and we already
- // have an instrument, then apply it to the instrument
- // instead of inserting
-
- if (instrument && (*midiEvent)->getTime() == 0) {
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_VOLUME) {
- instrument->setControllerValue(MIDI_CONTROLLER_VOLUME, (*midiEvent)->getData2());
- break;
- }
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_PAN) {
- instrument->setControllerValue(MIDI_CONTROLLER_PAN, (*midiEvent)->getData2());
- break;
- }
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_ATTACK) {
- instrument->setControllerValue(MIDI_CONTROLLER_ATTACK, (*midiEvent)->getData2());
- break;
- }
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_RELEASE) {
- instrument->setControllerValue(MIDI_CONTROLLER_RELEASE, (*midiEvent)->getData2());
- break;
- }
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_FILTER) {
- instrument->setControllerValue(MIDI_CONTROLLER_FILTER, (*midiEvent)->getData2());
- break;
- }
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_RESONANCE) {
- instrument->setControllerValue(MIDI_CONTROLLER_RESONANCE, (*midiEvent)->getData2());
- break;
- }
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_CHORUS) {
- instrument->setControllerValue(MIDI_CONTROLLER_CHORUS, (*midiEvent)->getData2());
- break;
- }
- if ((*midiEvent)->getData1() == MIDI_CONTROLLER_REVERB) {
- instrument->setControllerValue(MIDI_CONTROLLER_REVERB, (*midiEvent)->getData2());
- break;
- }
- }
-
rosegardenEvent =
- Controller((*midiEvent)->getData1(),
- (*midiEvent)->getData2()).
- getAsEvent(rosegardenTime);
+ Controller(midiEvent.getData1(),
+ midiEvent.getData2()).
+ getAsEvent(rosegardenTime);
break;
case MIDI_PITCH_BEND:
rosegardenEvent =
- PitchBend((*midiEvent)->getData2(),
- (*midiEvent)->getData1()).
- getAsEvent(rosegardenTime);
+ PitchBend(midiEvent.getData2(),
+ midiEvent.getData1()).
+ getAsEvent(rosegardenTime);
break;
case MIDI_SYSTEM_EXCLUSIVE:
rosegardenEvent =
- SystemExclusive((*midiEvent)->getMetaMessage()).
- getAsEvent(rosegardenTime);
+ SystemExclusive(midiEvent.getMetaMessage()).
+ getAsEvent(rosegardenTime);
break;
case MIDI_POLY_AFTERTOUCH:
rosegardenEvent =
- KeyPressure((*midiEvent)->getData1(),
- (*midiEvent)->getData2()).
- getAsEvent(rosegardenTime);
+ KeyPressure(midiEvent.getData1(),
+ midiEvent.getData2()).
+ getAsEvent(rosegardenTime);
break;
case MIDI_CHNL_AFTERTOUCH:
rosegardenEvent =
- ChannelPressure((*midiEvent)->getData1()).
- getAsEvent(rosegardenTime);
+ ChannelPressure(midiEvent.getData1()).
+ getAsEvent(rosegardenTime);
break;
default:
-
-#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::convertToRosegarden - "
- << "Unsupported event code = "
- << (int)(*midiEvent)->getMessageType() << std::endl;
-#endif
-
+ std::cerr << "MidiFile::convertToRosegarden() - Unsupported event code = " << (int)midiEvent.getMessageType();
break;
- }
+ } // switch message type (non-meta-event)
+ } // if meta-event
if (rosegardenEvent) {
- // if (fillFromTime < rosegardenTime) {
- // rosegardenSegment->fillWithRests(fillFromTime, rosegardenTime);
- // }
+ // If there's a gap between the last note and this event
if (endOfLastNote < rosegardenTime) {
- rosegardenSegment->fillWithRests(endOfLastNote, rosegardenTime);
+ // Fill it with rests.
+ segment->fillWithRests(endOfLastNote, rosegardenTime);
}
- rosegardenSegment->insert(rosegardenEvent);
+ segment->insert(rosegardenEvent);
}
+ } // for each event
+
+ // Empty segment? Toss it.
+ if (segment->empty()) {
+ delete segment;
+ segment = 0;
+ delete track;
+ track = 0;
+
+ // Try the next track
+ continue;
}
- if (rosegardenSegment->size() > 0) {
+ // Need to count rests separately.
+ int restCount = 0;
- // if all we have is key signatures and rests, take this
- // to be a conductor segment and don't insert it
- //
- bool keySigsOnly = true;
- bool haveKeySig = false;
- for (Segment::iterator i = rosegardenSegment->begin();
- i != rosegardenSegment->end(); ++i) {
- if (!(*i)->isa(Rosegarden::Key::EventType) &&
- !(*i)->isa(Note::EventRestType)) {
- keySigsOnly = false;
- break;
- } else if ((*i)->isa(Rosegarden::Key::EventType)) {
- haveKeySig = true;
+ // For each event in the segment
+ for (Segment::const_iterator i = segment->begin();
+ i != segment->end();
+ ++i) {
+ const Event &event = **i;
+
+ if (event.isa(Note::EventRestType))
+ ++restCount;
+ }
+
+ int nonRestCount = segment->size() - restCount;
+
+ RG_DEBUG << "convertToRosegarden(): Track analysis...";
+ RG_DEBUG << " Total events:" << segment->size();
+ RG_DEBUG << " Notes:" << noteCount;
+ RG_DEBUG << " Rests:" << restCount;
+ RG_DEBUG << " Non-rests:" << nonRestCount;
+ RG_DEBUG << " Key signatures:" << keySigCount;
+
+ // Key sigs and no notes means a conductor segment.
+ // Note: A conductor track also contains time signatures and
+ // tempo events, however we've already added those to the
+ // composition above. They are not added to the segment.
+ if (noteCount == 0 && keySigCount > 0) {
+ conductorSegment = segment;
+
+ // If this conductor segment has nothing but rests and key sigs,
+ // there's no need to add it to the composition.
+ // ??? This probably never happens. Conductor tracks almost
+ // always have a few text events in them.
+ if (nonRestCount == keySigCount) {
+ // ??? Memory leak. conductorSegment will not be deleted.
+ continue;
+ }
+ }
+
+ // If this track has no key sigs and we have a conductor segment
+ if (keySigCount == 0 && conductorSegment) {
+ // copy across any key sigs from the conductor segment
+
+ timeT segmentStartTime = segment->getStartTime();
+ timeT earliestEventEndTime = segmentStartTime;
+
+ // For each event in the segment
+ for (Segment::iterator i = conductorSegment->begin();
+ i != conductorSegment->end();
+ ++i) {
+ const Event &event = **i;
+
+ // If this isn't a key sig, try the next event.
+ if (!event.isa(Rosegarden::Key::EventType))
+ continue;
+
+ // ??? Should we really expand the segment? Seems like
+ // it would make more sense to only add the key sigs
+ // that fall within the segment's time. If there isn't
+ // one at the very start of the segment, then insert
+ // the previous.
+
+ // Adjust the earliest event time if needed.
+ if (event.getAbsoluteTime() + event.getDuration() <
+ earliestEventEndTime) {
+ earliestEventEndTime =
+ event.getAbsoluteTime() + event.getDuration();
}
+
+ segment->insert(new Event(event));
}
- if (keySigsOnly) {
- conductorSegment = rosegardenSegment;
- continue;
- } else if (!haveKeySig && conductorSegment) {
- // copy across any key sigs from the conductor segment
-
- timeT segmentStartTime = rosegardenSegment->getStartTime();
- timeT earliestEventEndTime = segmentStartTime;
-
- for (Segment::iterator i = conductorSegment->begin();
- i != conductorSegment->end(); ++i) {
- if ((*i)->getAbsoluteTime() + (*i)->getDuration() <
- earliestEventEndTime) {
- earliestEventEndTime =
- (*i)->getAbsoluteTime() + (*i)->getDuration();
- }
- rosegardenSegment->insert(new Event(**i));
+ // Add rests to the beginning.
+ // ??? No need. It happens anyway. Must be someone else doing
+ // this.
+ if (earliestEventEndTime < segmentStartTime)
+ segment->fillWithRests(earliestEventEndTime,
+ segmentStartTime);
+ }
+
+ // Configure the Instrument based on events at time 0.
+
+ Instrument *instrument = studio.getInstrumentById(instrumentId);
+
+ if (instrument) {
+ instrument->setPercussion(
+ instrument->getNaturalChannel() ==
+ MIDI_PERCUSSION_CHANNEL);
+
+ track->setInstrument(instrument->getId());
+
+ Segment::iterator msbIter = segment->end();
+ Segment::iterator lsbIter = segment->end();
+
+ // For each event in the segment
+ for (Segment::iterator i = segment->begin();
+ i != segment->end();
+ /* increment before use */) {
+ // Increment before use. This allows us to delete events
+ // from the Segment.
+ Segment::iterator j = i++;
+
+ const Event &event = **j;
+
+ // We only care about events at time 0.
+ if (event.getAbsoluteTime() > 0)
+ break;
+
+ // If this is a Bank Select MSB, save it.
+ if (event.isa(Controller::EventType) &&
+ event.get<Int>(Controller::NUMBER) ==
+ MIDI_CONTROLLER_BANK_MSB) {
+ msbIter = j;
+ continue;
+ }
+
+ // If this is a Bank Select LSB, save it.
+ if (event.isa(Controller::EventType) &&
+ event.get<Int>(Controller::NUMBER) ==
+ MIDI_CONTROLLER_BANK_LSB) {
+ lsbIter = j;
+ continue;
+ }
+
+ // If this is a Program Change
+ if (event.isa(ProgramChange::EventType)) {
+ // Configure the instrument.
+ int program = event.get<Int>(ProgramChange::PROGRAM);
+ instrument->setProgramChange(program);
+ instrument->setSendProgramChange(true);
+
+ // Remove the program change from the Segment.
+ segment->erase(j);
+
+ continue;
}
- if (earliestEventEndTime < segmentStartTime) {
- rosegardenSegment->fillWithRests(earliestEventEndTime,
- segmentStartTime);
+ // If this is a control change
+ if (event.isa(Controller::EventType)) {
+ int controller = event.get<Int>(Controller::NUMBER);
+
+ // Only process the four that usually appear in the
+ // Instrument Parameters box.
+ if (controller == MIDI_CONTROLLER_VOLUME ||
+ controller == MIDI_CONTROLLER_PAN ||
+ controller == MIDI_CONTROLLER_REVERB ||
+ controller == MIDI_CONTROLLER_CHORUS) {
+
+ // Configure the Instrument.
+ instrument->setControllerValue(
+ controller,
+ event.get<Int>(Controller::VALUE));
+
+ // Remove the event from the Segment.
+ segment->erase(j);
+
+ continue;
+ }
}
}
-#ifdef MIDI_DEBUG
- std::cerr << "MIDI import: adding segment with start time " << rosegardenSegment->getStartTime() << " and end time " << rosegardenSegment->getEndTime() << std::endl;
- if (rosegardenSegment->getEndTime() == 2880) {
- std::cerr << "events:" << std::endl;
- for (Segment::iterator i = rosegardenSegment->begin();
- i != rosegardenSegment->end(); ++i) {
- std::cerr << "type = " << (*i)->getType() << std::endl;
- std::cerr << "time = " << (*i)->getAbsoluteTime() << std::endl;
- std::cerr << "duration = " << (*i)->getDuration() << std::endl;
- }
- }
+ // If we have both msb and lsb for bank select
+ if (msbIter != segment->end() && lsbIter != segment->end()) {
+ // Configure the Instrument
+ instrument->setMSB((*msbIter)->get<Int>(Controller::VALUE));
+ instrument->setLSB((*lsbIter)->get<Int>(Controller::VALUE));
+ instrument->setSendBankSelect(true);
+
+ // Remove the events.
+ segment->erase(msbIter);
+ segment->erase(lsbIter);
+ }
+
+ // Use the program name for a label if nothing else
+ // was found.
+ std::string programName = instrument->getProgramName();
+ if (programName != "") {
+ if (track->getLabel() == defaultTrackName)
+ track->setLabel(instrument->getProgramName());
+ if (segment->getLabel() == defaultTrackName)
+ segment->setLabel(instrument->getProgramName());
+ }
+ }
+
+#ifdef DEBUG
+ RG_DEBUG << "convertToRosegarden(): MIDI import: adding segment with start time " << segment->getStartTime() << " and end time " << segment->getEndTime();
+ // Secret trigger end time for testing.
+ if (segment->getEndTime() == 2880) {
+ RG_DEBUG << " events:";
+ for (Segment::iterator i = segment->begin();
+ i != segment->end(); ++i) {
+ RG_DEBUG << " type = " << (*i)->getType();
+ RG_DEBUG << " time = " << (*i)->getAbsoluteTime();
+ RG_DEBUG << " duration = " << (*i)->getDuration();
+ }
+ }
#endif
- // add the Segment to the Composition and increment the
- // Rosegarden segment number
- //
- composition.addTrack(track);
+ // add the Segment to the Composition and increment the
+ // Rosegarden segment number
+ //
+ composition.addTrack(track);
- std::vector<TrackId> trackIds;
- trackIds.push_back(track->getId());
- composition.notifyTracksAdded(trackIds);
+ std::vector<TrackId> trackIds;
+ trackIds.push_back(track->getId());
+ composition.notifyTracksAdded(trackIds);
- composition.addSegment(rosegardenSegment);
- addedSegments.push_back(rosegardenSegment);
- compTrack++;
+ composition.addSegment(segment);
+ addedSegments.push_back(segment);
- } else {
- delete rosegardenSegment;
- rosegardenSegment = 0;
- delete track;
- track = 0;
- }
- }
+ // Next Track in the Composition.
+ ++rosegardenTrackId;
- if (type == CONVERT_REPLACE || maxTime > composition.getEndMarker()) {
- composition.setEndMarker(composition.getBarEndForTime(maxTime));
- }
+ } // for each track
+
+ // Adjust the composition to hold the segments.
+ composition.setEndMarker(composition.getBarEndForTime(maxTime));
for (std::vector<Segment *>::iterator i = addedSegments.begin();
- i != addedSegments.end(); ++i) {
- Segment *s = *i;
- if (s) {
- timeT duration = s->getEndMarkerTime() - s->getStartTime();
-/*
- std::cerr << "duration = " << duration << " (start "
- << s->getStartTime() << ", end " << s->getEndTime()
- << ", marker " << s->getEndMarkerTime() << ")" << std::endl;
-*/
- if (duration == 0) {
- s->setEndMarkerTime(s->getStartTime() +
- Note(Note::Crotchet).getDuration());
- }
- Instrument *instr = m_studio->getInstrumentFor(s);
- if (instr) {
- if (s->getLabel() == "") {
- s->setLabel(m_studio->getSegmentName(instr->getId()));
- }
- }
- }
+ i != addedSegments.end(); ++i) {
+ Segment *s = *i;
+ if (s) {
+ timeT duration = s->getEndMarkerTime() - s->getStartTime();
+ //RG_DEBUG << "convertToRosegarden(): duration = " << duration << " (start " << s->getStartTime() << ", end " << s->getEndTime() << ", marker " << s->getEndMarkerTime() << ")";
+ // Make sure any zero-length segments are at least a crotchet
+ // wide.
+ // ??? Move this into the "for each track" loop.
+ if (duration == 0) {
+ s->setEndMarkerTime(s->getStartTime() +
+ Note(Note::Crotchet).getDuration());
+ }
+ }
}
return true;
@@ -1445,8 +1297,8 @@ MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
// times.
//
//
-void
-MidiFile::convertToMidi(Composition &comp)
+bool
+MidiFile::convertToMidi(Composition &comp, const QString &filename)
{
MappedBufMetaIterator * metaiterator =
@@ -1469,6 +1321,8 @@ MidiFile::convertToMidi(Composition &comp)
MidiInserter inserter(comp, 480, end);
sorter.insertSorted(inserter);
inserter.assignToMidiFile(*this);
+
+ return write(filename);
}
@@ -1477,7 +1331,7 @@ MidiFile::convertToMidi(Composition &comp)
// write out to the MidiFile.
//
void
-MidiFile::intToMidiBytes(std::ofstream* midiFile, int number)
+MidiFile::writeInt(std::ofstream* midiFile, int number)
{
MidiByte upper;
MidiByte lower;
@@ -1491,7 +1345,7 @@ MidiFile::intToMidiBytes(std::ofstream* midiFile, int number)
}
void
-MidiFile::longToMidiBytes(std::ofstream* midiFile, unsigned long number)
+MidiFile::writeLong(std::ofstream* midiFile, unsigned long number)
{
MidiByte upper1;
MidiByte lower1;
@@ -1573,11 +1427,11 @@ MidiFile::writeHeader(std::ofstream* midiFile)
// Number of Tracks we're writing out
//
- intToMidiBytes(midiFile, m_numberOfTracks);
+ writeInt(midiFile, m_numberOfTracks);
// Timing Division
//
- intToMidiBytes(midiFile, m_timingDivision);
+ writeInt(midiFile, m_timingDivision);
return (true);
}
@@ -1594,10 +1448,10 @@ MidiFile::writeTrack(std::ofstream* midiFile, TrackId trackNumber)
// First we write into the trackBuffer, then write it out to the
// file with it's accompanying length.
//
- string trackBuffer;
+ std::string trackBuffer;
- long progressTotal = (long)m_midiComposition[trackNumber].size();
- long progressCount = 0;
+ long progressTotal = (long)m_midiComposition[trackNumber].size();
+ long progressCount = 0;
for (midiEvent = m_midiComposition[trackNumber].begin();
midiEvent != m_midiComposition[trackNumber].end();
@@ -1689,8 +1543,7 @@ MidiFile::writeTrack(std::ofstream* midiFile, TrackId trackNumber)
#ifdef MIDI_DEBUG
std::cerr << "MidiFile::writeTrack()"
- << " - cannot write unsupported MIDI event"
- << endl;
+ << " - cannot write unsupported MIDI event\n";
#endif
break;
@@ -1700,13 +1553,12 @@ MidiFile::writeTrack(std::ofstream* midiFile, TrackId trackNumber)
// For the moment just keep the app updating until we work
// out a good way of accounting for this write.
//
- ++progressCount;
+ ++progressCount;
- if (progressCount % 500 == 0) {
- emit setValue(progressCount * 100 / progressTotal);
- //qApp->processEvents(500);
- qApp->processEvents(QEventLoop::AllEvents);
- }
+ if (progressCount % 500 == 0) {
+ emit progress(progressCount * 100 / progressTotal);
+ qApp->processEvents();
+ }
}
// Now we write the track - First the standard header..
@@ -1715,7 +1567,7 @@ MidiFile::writeTrack(std::ofstream* midiFile, TrackId trackNumber)
// ..now the length of the buffer..
//
- longToMidiBytes(midiFile, (long)trackBuffer.length());
+ writeLong(midiFile, (long)trackBuffer.length());
// ..then the buffer itself..
//
@@ -1727,17 +1579,17 @@ MidiFile::writeTrack(std::ofstream* midiFile, TrackId trackNumber)
// Writes out a MIDI file from the internal Midi representation
//
bool
-MidiFile::write()
+MidiFile::write(const QString &filename)
{
bool retOK = true;
std::ofstream *midiFile =
- new std::ofstream(m_fileName.toLocal8Bit(), ios::out | ios::binary);
+ new std::ofstream(filename.toLocal8Bit(), std::ios::out | std::ios::binary);
if (!(*midiFile)) {
#ifdef MIDI_DEBUG
- std::cerr << "MidiFile::write() - can't write file" << endl;
+ std::cerr << "MidiFile::write() - can't write file\n";
#endif
m_format = MIDI_FILE_NOT_LOADED;
@@ -1762,64 +1614,85 @@ MidiFile::write()
return (retOK);
}
-// Delete dead NOTE OFF and NOTE ON/Zero Velocty Events after
-// reading them and modifying their relevant NOTE ONs
-//
-bool
-MidiFile::consolidateNoteOffEvents(TrackId track)
+void
+MidiFile::consolidateNoteEvents(TrackId trackId)
{
- MidiTrack::iterator nOE, mE = m_midiComposition[track].begin();
- bool notesOnTrack = false;
- bool noteOffFound;
+ MidiTrack &track = m_midiComposition[trackId];
- for (;mE != m_midiComposition[track].end(); ++mE) {
- if ((*mE)->getMessageType() == MIDI_NOTE_ON && (*mE)->getVelocity() > 0) {
- // We've found a note - flag it
- //
- if (!notesOnTrack)
- notesOnTrack = true;
-
- noteOffFound = false;
-
- for (nOE = mE; nOE != m_midiComposition[track].end(); ++nOE) {
- if (((*nOE)->getChannelNumber() == (*mE)->getChannelNumber()) &&
- ((*nOE)->getPitch() == (*mE)->getPitch()) &&
- ((*nOE)->getMessageType() == MIDI_NOTE_OFF ||
- ((*nOE)->getMessageType() == MIDI_NOTE_ON &&
- (*nOE)->getVelocity() == 0x00))) {
- timeT noteDuration = ((*nOE)->getTime() - (*mE)->getTime());
-
- // Some MIDI files floating around in the real world
- // apparently have NOTE ON followed immediately by NOTE OFF
- // on percussion tracks. Instead of setting the duration to
- // 0 in this case, which has no meaning, set it to 1.
- if (noteDuration == 0) {
- std::cerr << "MidiFile::consolidateNoteOffEvents() - detected MIDI note duration of 0. Using duration of 1. Touch wood."
- << std::endl;
- noteDuration = 1;
- }
- (*mE)->setDuration(noteDuration);
+ // For each MIDI event on the track.
+ for (MidiTrack::iterator firstEventIter = track.begin();
+ firstEventIter != track.end();
+ ++firstEventIter) {
+ MidiEvent &firstEvent = **firstEventIter;
- delete *nOE;
- m_midiComposition[track].erase(nOE);
+ // Not a note-on? Try the next event.
+ if (firstEvent.getMessageType() != MIDI_NOTE_ON)
+ continue;
- noteOffFound = true;
- break;
- }
- }
+ // Note-on with velocity 0 is a note-off. Try the next event.
+ if (firstEvent.getVelocity() == 0)
+ continue;
- // If no matching NOTE OFF has been found then set
- // Event duration to length of Segment
- //
- if (noteOffFound == false) {
- --nOE; // avoid crash due to nOE == track.end()
- (*mE)->setDuration((*nOE)->getTime() - (*mE)->getTime());
+ // At this point, firstEvent is a note-on event.
+ // Search for the matching note-off event.
+
+ bool noteOffFound = false;
+
+ MidiTrack::iterator secondEventIter;
+
+ // For each following MIDI event
+ for (secondEventIter = firstEventIter + 1;
+ secondEventIter != track.end();
+ ++secondEventIter) {
+ const MidiEvent &secondEvent = **secondEventIter;
+
+ bool noteOff = (secondEvent.getMessageType() == MIDI_NOTE_OFF ||
+ (secondEvent.getMessageType() == MIDI_NOTE_ON &&
+ secondEvent.getVelocity() == 0x00));
+
+ // Not a note-off? Try the next event.
+ if (!noteOff)
+ continue;
+
+ // Wrong pitch? Try the next event.
+ if (secondEvent.getPitch() != firstEvent.getPitch())
+ continue;
+ // Wrong channel? Try the next event.
+ // Note: Since all the events in a track are for a single channel,
+ // this will never be true.
+ if (secondEvent.getChannelNumber() != firstEvent.getChannelNumber())
+ continue;
+
+ timeT noteDuration = secondEvent.getTime() - firstEvent.getTime();
+
+ // Some MIDI files floating around in the real world
+ // apparently have note-on followed immediately by note-off
+ // on percussion tracks. Instead of setting the duration to
+ // 0 in this case, which has no meaning, set it to 1.
+ if (noteDuration == 0) {
+ std::cerr << "MidiFile::consolidateNoteEvents() - detected MIDI note duration of 0. Using duration of 1. Touch wood.\n";
+ noteDuration = 1;
}
+
+ firstEvent.setDuration(noteDuration);
+
+ // Remove the note-off.
+ delete *secondEventIter;
+ track.erase(secondEventIter);
+
+ noteOffFound = true;
+ break;
}
- }
- return notesOnTrack;
+ if (!noteOffFound) {
+ // avoid crash due to secondEventIter == track.end()
+ --secondEventIter;
+ // Set Event duration to length of Segment.
+ firstEvent.setDuration(
+ (*secondEventIter)->getTime() - firstEvent.getTime());
+ }
+ }
}
// Clear down the MidiFile Composition
@@ -1844,14 +1717,6 @@ MidiFile::clearMidiComposition()
m_trackChannelMap.clear();
}
-// Doesn't do anything yet - doesn't need to. We need to satisfy
-// the pure virtual function in the base class.
-//
-void
-MidiFile::close()
-{}
-
-
}
diff --git a/src/sound/MidiFile.h b/src/sound/MidiFile.h
index 78e6a97..ac66ef9 100644
--- a/src/sound/MidiFile.h
+++ b/src/sound/MidiFile.h
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -12,162 +12,173 @@
*/
-#ifndef RG_MIDI_FILE_H
-#define RG_MIDI_FILE_H
+#ifndef RG_MIDIFILE_H
+#define RG_MIDIFILE_H
-#include <QObject>
-
-#include "Midi.h"
-#include "MidiEvent.h"
#include "base/Composition.h"
-#include "SoundFile.h"
+
+#include <QObject>
+#include <QString>
#include <fstream>
#include <string>
-#include <list>
+#include <vector>
#include <map>
-// Conversion class for Composition to and
-// from MIDI Files. Despite the fact you can reuse this
-// object it's probably safer just to create it for a
-// single way conversion and then throw it away (MIDI
-// to Composition conversion invalidates the internal
-// MIDI model).
-//
-// Derived from SoundFile but still had some features
-// in common with it which could theoretically be moved
-// up into the base for use in other derived classes.
-//
-// [rwb]
-//
-//
-
namespace Rosegarden
{
-// Our internal MIDI structure is just a list of MidiEvents.
-// We use a list and not a set because we want the order of
-// the events to be arbitrary until we explicitly sort them
-// (necessary when converting Composition absolute times to
-// MIDI delta times).
-//
-typedef std::vector<MidiEvent *> MidiTrack;
-typedef std::map<unsigned int, MidiTrack> MidiComposition;
-
-class Studio;
-
-class MidiFile : public QObject, public SoundFile
+
+class MidiEvent;
+class RosegardenDocument;
+
+/// Conversion class for Composition to and from MIDI Files.
+/**
+ * Despite the fact you can reuse this object it's probably safer just
+ * to create it for a single way conversion and then throw it away (MIDI
+ * to Composition conversion invalidates the internal MIDI model).
+ */
+class MidiFile : public QObject
{
Q_OBJECT
public:
+ MidiFile();
+ virtual ~MidiFile();
+
+ /// Convert a MIDI file to a Rosegarden composition.
+ /**
+ * Returns true on success.
+ *
+ * See RosegardenMainWindow::createDocumentFromMIDIFile().
+ */
+ bool convertToRosegarden(const QString &filename, RosegardenDocument *);
+
+ /// Error message when convertToRosegarden() fails.
+ std::string getError() const { return m_error; }
+
+ /// Convert a Rosegarden composition to a MIDI file.
+ /*
+ * Returns true on success.
+ *
+ * See RosegardenMainWindow::exportMIDIFile().
+ */
+ bool convertToMidi(Composition &, const QString &filename);
+
+signals:
+ /// Progress in percent. Connect to ProgressDialog::setValue(int).
+ void progress(int);
+
+private:
+ // convertToMidi() uses MidiInserter.
+ // MidiInserter uses:
+ // - m_timingDivision
+ // - m_format
+ // - m_numberOfTracks
+ // - m_midiComposition
+ // - clearMidiComposition()
friend class MidiInserter;
+
+ // *** Standard MIDI File Header
+
enum FileFormatType {
- MIDI_SINGLE_TRACK_FILE = 0x00,
- MIDI_SIMULTANEOUS_TRACK_FILE = 0x01,
- MIDI_SEQUENTIAL_TRACK_FILE = 0x02,
+ MIDI_SINGLE_TRACK_FILE = 0x00, // Format 0
+ MIDI_SIMULTANEOUS_TRACK_FILE = 0x01, // Format 1
+ MIDI_SEQUENTIAL_TRACK_FILE = 0x02, // Format 2
MIDI_CONVERTED_TO_APPLICATION = 0xFE,
MIDI_FILE_NOT_LOADED = 0xFF
};
+ FileFormatType m_format;
+
+ unsigned m_numberOfTracks;
enum TimingFormat {
MIDI_TIMING_PPQ_TIMEBASE,
MIDI_TIMING_SMPTE
};
+ TimingFormat m_timingFormat;
- enum ConversionType {
- CONVERT_REPLACE,
- CONVERT_AUGMENT,
- CONVERT_APPEND
- };
-
- MidiFile(Studio *studio);
- MidiFile (const QString &fn, Studio *studio);
- ~MidiFile();
-
- // Declare our virtuals
- //
- virtual bool open();
- virtual bool write();
- virtual void close();
+ /// Pulses Per Quarter note. (m_timingFormat == MIDI_TIMING_PPQ_TIMEBASE)
+ int m_timingDivision;
- TimingFormat timingFormat() { return m_timingFormat; }
- int timingDivision() { return m_timingDivision; } // only valid if timing format is PPQ timebase
- void smpteFrameSpecification(int &fps, int &subframes) { fps = m_fps; subframes = m_subframes; } // only valid if timing format is SMPTE
- FileFormatType fileFormat() { return m_format; }
- unsigned int numberOfTracks() { return m_numberOfTracks; }
- bool hasTimeChanges() { return m_containsTimeChanges; }
+ // For SMPTE.
+ int m_fps;
+ int m_subframes;
- // If a file open or save failed
- std::string getError() { return m_error; }
+ // *** Internal MIDI Composition
/**
- * Convert a MIDI file to a Rosegarden composition. Return true
- * for success.
+ * Our internal MIDI composition is just a vector of MidiEvents.
+ * We use a vector and not a set because we want the order of
+ * the events to be arbitrary until we explicitly sort them
+ * (necessary when converting Composition absolute times to
+ * MIDI delta times).
*/
- bool convertToRosegarden(Composition &c, ConversionType type);
+ typedef std::vector<MidiEvent *> MidiTrack;
+ typedef std::map<TrackId, MidiTrack> MidiComposition;
+ MidiComposition m_midiComposition;
+ void clearMidiComposition();
+ // *** Standard MIDI File to Rosegarden
+
+ /// Read a MIDI file into m_midiComposition.
+ bool read(const QString &filename);
+ void parseHeader(std::ifstream *midiFile);
+ /// Convert a track to events in m_midiComposition.
+ void parseTrack(std::ifstream *midiFile);
+ // m_midiComposition track to MIDI channel.
+ std::map<TrackId, int /*channel*/> m_trackChannelMap;
+ // Names for each track.
+ std::vector<std::string> m_trackNames;
+ /// Find the next track chunk and set m_trackByteCount.
+ void findNextTrack(std::ifstream *midiFile);
+ /// Combine each note-on/note-off pair into a single note event with a duration.
+ void consolidateNoteEvents(TrackId trackId);
+
+ // Read
+ /// Read a "variable-length quantity" from the MIDI byte stream.
+ /**
+ * In case the first byte has already been read, it can be sent
+ * in as firstByte.
+ */
+ long readNumber(std::ifstream *midiFile, int firstByte = -1);
+ MidiByte read(std::ifstream *midiFile);
+ std::string read(std::ifstream *midiFile,
+ unsigned long numberOfBytes);
+
+ // Conversion
+ int midiBytesToInt(const std::string &bytes);
+ long midiBytesToLong(const std::string &bytes);
+
+ size_t m_fileSize;
+ /// Number of bytes left to read in the current track.
+ long m_trackByteCount;
+ /// Allow decrementing of m_trackByteCount while reading.
/**
- * Convert a Rosegarden composition to MIDI format, storing the
- * result internally for later writing.
+ * Set to true while processing a track. false while processing other
+ * parts of the file.
*/
- void convertToMidi(Composition &comp);
+ bool m_decrementCount;
-signals:
- void setValue(int);
-
-private:
+ /// Counter for kicking the message loop.
+ int m_bytesRead;
- TimingFormat m_timingFormat;
- int m_timingDivision; // pulses per quarter note
- int m_fps;
- int m_subframes;
- FileFormatType m_format;
- unsigned int m_numberOfTracks;
- bool m_containsTimeChanges;
-
- // Internal counters
- //
- long m_trackByteCount;
- bool m_decrementCount;
-
- // Internal MidiComposition
- //
- MidiComposition m_midiComposition;
- std::map<int, int> m_trackChannelMap;
-
- // Clear the m_midiComposition
- //
- void clearMidiComposition();
+ std::string m_error;
- // Split the tasks up with these top level private methods
- //
- bool parseHeader(const std::string& midiHeader);
- bool parseTrack(std::ifstream* midiFile, unsigned int &trackNum);
- bool writeHeader(std::ofstream* midiFile);
- bool writeTrack(std::ofstream* midiFile, unsigned int trackNum);
-
- bool consolidateNoteOffEvents(TrackId track);
-
- // Internal convenience functions
- //
- int midiBytesToInt(const std::string& bytes);
- long midiBytesToLong(const std::string& bytes);
- long getNumberFromMidiBytes(std::ifstream* midiFile, int firstByte = -1);
- MidiByte getMidiByte(std::ifstream* midiFile);
- std::string getMidiBytes(std::ifstream* midiFile,
- unsigned long bytes);
- bool skipToNextTrack(std::ifstream *midiFile);
- void intToMidiBytes(std::ofstream* midiFile, int number);
- void longToMidiBytes(std::ofstream* midiFile, unsigned long number);
- std::string longToVarBuffer(unsigned long number);
+ // *** Rosegarden to Standard MIDI File
- // The pointer to the Studio for Instrument stuff
- //
- Studio *m_studio;
+ bool write(const QString &filename);
+ bool writeHeader(std::ofstream *midiFile);
+ bool writeTrack(std::ofstream *midiFile, TrackId trackNumber);
- std::string m_error;
+ // Write
+ void writeInt(std::ofstream *midiFile, int number);
+ void writeLong(std::ofstream *midiFile, unsigned long number);
+
+ // Conversion
+ std::string longToVarBuffer(unsigned long number);
};
+
}
-#endif // RG_MIDI_FILE_H
+#endif // RG_MIDIFILE_H
diff --git a/src/sound/MidiInserter.cpp b/src/sound/MidiInserter.cpp
index e2cc5b7..fba2466 100644
--- a/src/sound/MidiInserter.cpp
+++ b/src/sound/MidiInserter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -18,6 +18,8 @@
#define RG_MODULE_STRING "[MidiInserter]"
#include "MidiInserter.h"
+
+#include "MidiEvent.h"
#include "base/Composition.h"
#include "base/MidiTypes.h"
#include "misc/Debug.h"
diff --git a/src/sound/MidiInserter.h b/src/sound/MidiInserter.h
index f8ab64f..8f2cb5c 100644
--- a/src/sound/MidiInserter.h
+++ b/src/sound/MidiInserter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -45,7 +45,7 @@ class MidiInserter : public MappedInserterBase
// Make and insert a tempo event.
void insertTempo(timeT t, long tempo);
void endTrack(timeT t);
- MidiTrack m_midiTrack;
+ MidiFile::MidiTrack m_midiTrack;
timeT m_previousTime;
};
diff --git a/src/sound/PeakFile.cpp b/src/sound/PeakFile.cpp
index a6966bd..bb5a670 100644
--- a/src/sound/PeakFile.cpp
+++ b/src/sound/PeakFile.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/PeakFile.h b/src/sound/PeakFile.h
index 7c393ed..827854f 100644
--- a/src/sound/PeakFile.h
+++ b/src/sound/PeakFile.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/PeakFileManager.cpp b/src/sound/PeakFileManager.cpp
index 731c30f..4559588 100644
--- a/src/sound/PeakFileManager.cpp
+++ b/src/sound/PeakFileManager.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/PeakFileManager.h b/src/sound/PeakFileManager.h
index adb1dc0..9ebdeac 100644
--- a/src/sound/PeakFileManager.h
+++ b/src/sound/PeakFileManager.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/PlayableAudioFile.cpp b/src/sound/PlayableAudioFile.cpp
index 70be6d0..02993ae 100644
--- a/src/sound/PlayableAudioFile.cpp
+++ b/src/sound/PlayableAudioFile.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/PlayableAudioFile.h b/src/sound/PlayableAudioFile.h
index a15bfca..d8c5df7 100644
--- a/src/sound/PlayableAudioFile.h
+++ b/src/sound/PlayableAudioFile.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/PluginFactory.cpp b/src/sound/PluginFactory.cpp
index 3fb0d84..aeca370 100644
--- a/src/sound/PluginFactory.cpp
+++ b/src/sound/PluginFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/PluginFactory.h b/src/sound/PluginFactory.h
index f6c3554..c1abe3d 100644
--- a/src/sound/PluginFactory.h
+++ b/src/sound/PluginFactory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/PluginIdentifier.cpp b/src/sound/PluginIdentifier.cpp
index 5fcd8a3..adec4a5 100644
--- a/src/sound/PluginIdentifier.cpp
+++ b/src/sound/PluginIdentifier.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/PluginIdentifier.h b/src/sound/PluginIdentifier.h
index 6018436..e223db6 100644
--- a/src/sound/PluginIdentifier.h
+++ b/src/sound/PluginIdentifier.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/RIFFAudioFile.cpp b/src/sound/RIFFAudioFile.cpp
index f65e7e7..baf99d1 100644
--- a/src/sound/RIFFAudioFile.cpp
+++ b/src/sound/RIFFAudioFile.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/RIFFAudioFile.h b/src/sound/RIFFAudioFile.h
index 842818b..72b6b56 100644
--- a/src/sound/RIFFAudioFile.h
+++ b/src/sound/RIFFAudioFile.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/RecordableAudioFile.cpp b/src/sound/RecordableAudioFile.cpp
index f15411f..621baf5 100644
--- a/src/sound/RecordableAudioFile.cpp
+++ b/src/sound/RecordableAudioFile.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/RecordableAudioFile.h b/src/sound/RecordableAudioFile.h
index 3b2123b..1edf940 100644
--- a/src/sound/RecordableAudioFile.h
+++ b/src/sound/RecordableAudioFile.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/Resampler.cpp b/src/sound/Resampler.cpp
index 6789cc2..48e187f 100644
--- a/src/sound/Resampler.cpp
+++ b/src/sound/Resampler.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/Resampler.h b/src/sound/Resampler.h
index d55c439..b9a8b71 100644
--- a/src/sound/Resampler.h
+++ b/src/sound/Resampler.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/RingBuffer.h b/src/sound/RingBuffer.h
index 43bfbfe..02ce230 100644
--- a/src/sound/RingBuffer.h
+++ b/src/sound/RingBuffer.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/RunnablePluginInstance.cpp b/src/sound/RunnablePluginInstance.cpp
index f160c13..672806f 100644
--- a/src/sound/RunnablePluginInstance.cpp
+++ b/src/sound/RunnablePluginInstance.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/RunnablePluginInstance.h b/src/sound/RunnablePluginInstance.h
index e79a493..f98e74f 100644
--- a/src/sound/RunnablePluginInstance.h
+++ b/src/sound/RunnablePluginInstance.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/SF2PatchExtractor.cpp b/src/sound/SF2PatchExtractor.cpp
index 99f3284..bd8852a 100644
--- a/src/sound/SF2PatchExtractor.cpp
+++ b/src/sound/SF2PatchExtractor.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
@@ -84,6 +84,8 @@ SF2PatchExtractor::isSF2File(string fileName)
return true;
}
+#define SF2_PRESET_HEADER_SIZE 38
+
SF2PatchExtractor::Device
SF2PatchExtractor::read(string fileName)
{
@@ -137,7 +139,7 @@ SF2PatchExtractor::read(string fileName)
continue;
}
- int presets = pdtachunk.size / 38;
+ int presets = (pdtachunk.size / SF2_PRESET_HEADER_SIZE) - 1;
for (int i = 0; i < presets; ++i) {
char name[21];
@@ -151,16 +153,12 @@ SF2PatchExtractor::read(string fileName)
// cerr << "Read name as " << name << endl;
file->seekg(14, ios::cur);
-
- if (i == presets - 1 &&
- bank == 255 &&
- program == 255 &&
- string(name) == "EOP")
- continue;
-
device[bank][program] = name;
}
+
+ file->seekg(SF2_PRESET_HEADER_SIZE, ios::cur);
}
+ break;
}
file->close();
diff --git a/src/sound/SF2PatchExtractor.h b/src/sound/SF2PatchExtractor.h
index 51efab5..15b21d4 100644
--- a/src/sound/SF2PatchExtractor.h
+++ b/src/sound/SF2PatchExtractor.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/SampleWindow.h b/src/sound/SampleWindow.h
index c5a9cf5..37fed66 100644
--- a/src/sound/SampleWindow.h
+++ b/src/sound/SampleWindow.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/Scavenger.h b/src/sound/Scavenger.h
index bff5723..4a68c03 100644
--- a/src/sound/Scavenger.h
+++ b/src/sound/Scavenger.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/SequencerDataBlock.cpp b/src/sound/SequencerDataBlock.cpp
index 1218f81..ee293a1 100644
--- a/src/sound/SequencerDataBlock.cpp
+++ b/src/sound/SequencerDataBlock.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/SequencerDataBlock.h b/src/sound/SequencerDataBlock.h
index ce6c51e..bb9a24b 100644
--- a/src/sound/SequencerDataBlock.h
+++ b/src/sound/SequencerDataBlock.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/SortingInserter.cpp b/src/sound/SortingInserter.cpp
index 8398205..b32e7d0 100644
--- a/src/sound/SortingInserter.cpp
+++ b/src/sound/SortingInserter.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
@@ -28,9 +28,19 @@ insertSorted(MappedInserterBase &exporter)
// std::list sort is stable, so we get same-time events in the
// order we inserted them, important for NoteOffs.
m_list.sort(merc);
- typedef std::list<MappedEvent>::const_iterator iterator;
- for(iterator i = m_list.begin(); i != m_list.end(); ++i) {
- exporter.insertCopy(*i);
+ std::list<MappedEvent>::const_iterator i = m_list.begin();
+ if (i != m_list.end() && i->getEventTime() < RealTime::zeroTime) {
+ // Negative time if the composition starts before the bar 1
+ RealTime timeOffset = - i->getEventTime();
+ for(; i != m_list.end(); ++i) {
+ MappedEvent *mE = new MappedEvent(*i);
+ mE->setEventTime(mE->getEventTime() + timeOffset);
+ exporter.insertCopy(*mE);
+ }
+ } else {
+ for(; i != m_list.end(); ++i) {
+ exporter.insertCopy(*i);
+ }
}
}
diff --git a/src/sound/SortingInserter.h b/src/sound/SortingInserter.h
index dffdf5c..a452265 100644
--- a/src/sound/SortingInserter.h
+++ b/src/sound/SortingInserter.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/SoundDriver.cpp b/src/sound/SoundDriver.cpp
index 594fce3..81e7434 100644
--- a/src/sound/SoundDriver.cpp
+++ b/src/sound/SoundDriver.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/SoundDriver.h b/src/sound/SoundDriver.h
index 506d42d..43e3748 100644
--- a/src/sound/SoundDriver.h
+++ b/src/sound/SoundDriver.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/SoundDriverFactory.cpp b/src/sound/SoundDriverFactory.cpp
index 41241e4..191310f 100644
--- a/src/sound/SoundDriverFactory.cpp
+++ b/src/sound/SoundDriverFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/SoundDriverFactory.h b/src/sound/SoundDriverFactory.h
index a90f3e3..f64483e 100644
--- a/src/sound/SoundDriverFactory.h
+++ b/src/sound/SoundDriverFactory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/SoundFile.cpp b/src/sound/SoundFile.cpp
index 3411b61..a73dcd0 100644
--- a/src/sound/SoundFile.cpp
+++ b/src/sound/SoundFile.cpp
@@ -2,7 +2,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/SoundFile.h b/src/sound/SoundFile.h
index 37fb608..8057015 100644
--- a/src/sound/SoundFile.h
+++ b/src/sound/SoundFile.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/src/sound/Tuning.h b/src/sound/Tuning.h
index 306e4dc..3a78f1d 100644
--- a/src/sound/Tuning.h
+++ b/src/sound/Tuning.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
diff --git a/src/sound/WAVAudioFile.cpp b/src/sound/WAVAudioFile.cpp
index 73013be..a638372 100644
--- a/src/sound/WAVAudioFile.cpp
+++ b/src/sound/WAVAudioFile.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/WAVAudioFile.h b/src/sound/WAVAudioFile.h
index 6eb12fe..9e23b5b 100644
--- a/src/sound/WAVAudioFile.h
+++ b/src/sound/WAVAudioFile.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
See the AUTHORS file for more details.
This program is free software; you can redistribute it and/or
diff --git a/src/sound/audiostream/AudioReadStream.cpp b/src/sound/audiostream/AudioReadStream.cpp
index f185529..1826162 100644
--- a/src/sound/audiostream/AudioReadStream.cpp
+++ b/src/sound/audiostream/AudioReadStream.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/AudioReadStream.h b/src/sound/audiostream/AudioReadStream.h
index adc8279..be40f93 100644
--- a/src/sound/audiostream/AudioReadStream.h
+++ b/src/sound/audiostream/AudioReadStream.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/AudioReadStreamFactory.cpp b/src/sound/audiostream/AudioReadStreamFactory.cpp
index df093de..8404cb6 100644
--- a/src/sound/audiostream/AudioReadStreamFactory.cpp
+++ b/src/sound/audiostream/AudioReadStreamFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/AudioReadStreamFactory.h b/src/sound/audiostream/AudioReadStreamFactory.h
index a018979..04a9501 100644
--- a/src/sound/audiostream/AudioReadStreamFactory.h
+++ b/src/sound/audiostream/AudioReadStreamFactory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/AudioWriteStream.h b/src/sound/audiostream/AudioWriteStream.h
index feb61a7..f459ea0 100644
--- a/src/sound/audiostream/AudioWriteStream.h
+++ b/src/sound/audiostream/AudioWriteStream.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/AudioWriteStreamFactory.cpp b/src/sound/audiostream/AudioWriteStreamFactory.cpp
index 76d43a7..ff50e19 100644
--- a/src/sound/audiostream/AudioWriteStreamFactory.cpp
+++ b/src/sound/audiostream/AudioWriteStreamFactory.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/AudioWriteStreamFactory.h b/src/sound/audiostream/AudioWriteStreamFactory.h
index 4f71cda..d1ed520 100644
--- a/src/sound/audiostream/AudioWriteStreamFactory.h
+++ b/src/sound/audiostream/AudioWriteStreamFactory.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/OggVorbisReadStream.cpp b/src/sound/audiostream/OggVorbisReadStream.cpp
index 96093a3..b9f39c2 100644
--- a/src/sound/audiostream/OggVorbisReadStream.cpp
+++ b/src/sound/audiostream/OggVorbisReadStream.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/OggVorbisReadStream.h b/src/sound/audiostream/OggVorbisReadStream.h
index 871265f..d9adfa5 100644
--- a/src/sound/audiostream/OggVorbisReadStream.h
+++ b/src/sound/audiostream/OggVorbisReadStream.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/SimpleWavFileWriteStream.cpp b/src/sound/audiostream/SimpleWavFileWriteStream.cpp
index 62843ca..d56f273 100644
--- a/src/sound/audiostream/SimpleWavFileWriteStream.cpp
+++ b/src/sound/audiostream/SimpleWavFileWriteStream.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/SimpleWavFileWriteStream.h b/src/sound/audiostream/SimpleWavFileWriteStream.h
index f49327d..21183ad 100644
--- a/src/sound/audiostream/SimpleWavFileWriteStream.h
+++ b/src/sound/audiostream/SimpleWavFileWriteStream.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/WavFileReadStream.cpp b/src/sound/audiostream/WavFileReadStream.cpp
index 77c54f7..d14f6ba 100644
--- a/src/sound/audiostream/WavFileReadStream.cpp
+++ b/src/sound/audiostream/WavFileReadStream.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/WavFileReadStream.h b/src/sound/audiostream/WavFileReadStream.h
index 54da1a9..e7273de 100644
--- a/src/sound/audiostream/WavFileReadStream.h
+++ b/src/sound/audiostream/WavFileReadStream.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/WavFileWriteStream.cpp b/src/sound/audiostream/WavFileWriteStream.cpp
index 3c50174..7ad79c9 100644
--- a/src/sound/audiostream/WavFileWriteStream.cpp
+++ b/src/sound/audiostream/WavFileWriteStream.cpp
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
diff --git a/src/sound/audiostream/WavFileWriteStream.h b/src/sound/audiostream/WavFileWriteStream.h
index a410f4e..54bffcc 100644
--- a/src/sound/audiostream/WavFileWriteStream.h
+++ b/src/sound/audiostream/WavFileWriteStream.h
@@ -3,7 +3,7 @@
/*
Rosegarden
A MIDI and audio sequencer and musical notation editor.
- Copyright 2000-2014 the Rosegarden development team.
+ Copyright 2000-2015 the Rosegarden development team.
This file is Copyright 2005-2011 Chris Cannam.
--
rosegarden packaging
More information about the pkg-multimedia-commits
mailing list