diff options
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/muse/functions.cpp | 6 | ||||
| -rw-r--r-- | muse2/muse/midiedit/scoreedit.cpp | 4 | ||||
| -rw-r--r-- | muse2/share/locale/muse_de.ts | 26 | 
3 files changed, 18 insertions, 18 deletions
| diff --git a/muse2/muse/functions.cpp b/muse2/muse/functions.cpp index 8e9a7cd5..b6bff169 100644 --- a/muse2/muse/functions.cpp +++ b/muse2/muse/functions.cpp @@ -879,7 +879,8 @@ unsigned get_groupedevents_len(const QString& pt)  {  	unsigned maxlen=0; -	Xml xml(pt.toLatin1().constData()); +	QByteArray pt_= pt.toLatin1(); +	Xml xml(pt_.constData());  	for (;;)   	{  		Xml::Token token = xml.parse(); @@ -1062,7 +1063,8 @@ void paste_at(const QString& pt, int pos, int max_distance, bool always_new_part  	map<Part*, unsigned> expand_map;  	map<Part*, set<Part*> > new_part_map; -	Xml xml(pt.toLatin1().constData()); +	QByteArray pt_= pt.toLatin1(); +	Xml xml(pt_.constData());  	for (;;)   	{  		Xml::Token token = xml.parse(); diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp index 9637334e..265c7ec3 100644 --- a/muse2/muse/midiedit/scoreedit.cpp +++ b/muse2/muse/midiedit/scoreedit.cpp @@ -2017,7 +2017,7 @@ list<note_len_t> parse_note_len(int len_ticks, int begin_tick, vector<int>& foo,  		int len_now=0;  		int last_number=foo[pos]; -		do {pos++;len_done++;len_now++;} while (! ((foo[pos]<=last_number) || (len_done==len) || (pos==foo.size())) ); +		do {pos++;len_done++;len_now++;} while (! ((pos==foo.size()) || (foo[pos]<=last_number) || (len_done==len)) );  		len_now=len_now*TICKS_PER_WHOLE/64; @@ -4583,10 +4583,8 @@ void ScoreCanvas::add_new_parts(const std::map< Part*, std::set<Part*> >& param)   *     changing "share" status, the changed state isn't stored   *   ? pasting in editors sometimes fails oO? ( ERROR: reading eventlist   *     from clipboard failed. ignoring this one... ) [ not reproducible ] - *   o cakewalk-mode is ignored when saving config   *    * CURRENT TODO - *   o drum editor has "clef column"   * ! o fix sigedit boxes (see also "important todo")   *   o ticks-to-quarter spinboxes   *   o newly created windows have to be focussed! diff --git a/muse2/share/locale/muse_de.ts b/muse2/share/locale/muse_de.ts index 5fe3a1ff..36406282 100644 --- a/muse2/share/locale/muse_de.ts +++ b/muse2/share/locale/muse_de.ts @@ -11418,67 +11418,67 @@ Wahrscheinlich hat dir ausgewählte Spur den falschen Typ.</translation>      <message>          <location filename="../../muse/mixer/rack.cpp" line="+193"/>          <source>effect rack</source> -        <translation type="unfinished">Effekteinschub</translation> +        <translation>Effekteinschub</translation>      </message>      <message>          <location line="+83"/>          <source>new</source> -        <translation type="unfinished"></translation> +        <translation>neu</translation>      </message>      <message>          <location line="+1"/>          <source>change</source> -        <translation type="unfinished">ändern</translation> +        <translation>ändern</translation>      </message>      <message>          <location line="+1"/>          <source>move up</source> -        <translation type="unfinished">Nach oben bewegen</translation> +        <translation>Nach oben bewegen</translation>      </message>      <message>          <location line="+1"/>          <source>move down</source> -        <translation type="unfinished">Nach unten bewegen</translation> +        <translation>Nach unten bewegen</translation>      </message>      <message>          <location line="+1"/>          <source>remove</source> -        <translation type="unfinished">entfernen</translation> +        <translation>entfernen</translation>      </message>      <message>          <location line="+1"/>          <source>bypass</source> -        <translation type="unfinished">umleiten</translation> +        <translation>übergehen</translation>      </message>      <message>          <location line="+1"/>          <source>show gui</source> -        <translation type="unfinished">GUI anzeigen</translation> +        <translation>GUI anzeigen</translation>      </message>      <message>          <location line="+1"/>          <source>show native gui</source> -        <translation type="unfinished">Native GUI anzeigen</translation> +        <translation>Native GUI anzeigen</translation>      </message>      <message>          <location line="+1"/>          <source>save preset</source> -        <translation type="unfinished"></translation> +        <translation>Preset speichern</translation>      </message>      <message>          <location line="+138"/>          <source>MusE: Save Preset</source> -        <translation type="unfinished"></translation> +        <translation>MusE: Preset speichern</translation>      </message>      <message>          <location line="+143"/>          <source>Replace effect</source> -        <translation type="unfinished"></translation> +        <translation>Effekt ersetzen</translation>      </message>      <message>          <location line="+0"/>          <source>Do you really want to replace the effect %1?</source> -        <translation type="unfinished"></translation> +        <translation>Möchten Sie wirklich den Effekt %1 ersetzen?</translation>      </message>  </context>  <context> | 
