German translation for instrument list

[Jojo-Schmitz]

Not complete, but no worse than the 1.2 version

[wschweer]

I changed the encoding of the file from iso-??? to utf8. Did you copy&paste the strings from the old german file?
The "umlaute" look strange in the diff.

[Jojo-Schmitz]

Yes, mostly copy and paste from the 1.2 instruments_de.xml, except for "Flöte", which I took from within the new insttruments_de.xml. And I used gvim for Windows to make those changes.

[Jojo-Schmitz]

I believe I've now fixed the Umlaute problem, should I close this pull request and sumite a new one?

[lasconic]

There is probably something to do to avoid the 7 "Merge remote-tracking branch 'upstream/master'" commits next time. Or Jojo should rebase his changes on top of the upstream branch instead of merge. Or we should pull is request locally and fix the history. That will probably broken Jojo repo though...

[Jojo-Schmitz]

OK, Werner seems to have accepted the pull request and my repo survived ;-)

I’ve just made some more changes to that file, so let me submit a new pull request…

Bye, Jojo

From: Nicolas Froment [mailto:notifications@github.com]
Sent: Wednesday, August 08, 2012 2:04 PM
To: musescore/MuseScore
Cc: Joachim Schmitz
Subject: Re: [MuseScore] German translation for instrument list (#33)

There is probably something to do to avoid the 7 "Merge remote-tracking branch 'upstream/master'" commits next time. Or Jojo should rebase his changes on top of the upstream branch instead of merge. Or we should pull is request locally and fix the history. That will probably broken Jojo repo though...

—
Reply to this email directly or view it on GitHub #33 (comment) .

Beschreibung: Das Bild wurde vom Absender entfernt.