DMS-Aus/Roam — pull request #83 by HeatherHillers (2014-03-27 09:05:26+00:00)
Title: 3 german translation

mainwindow.py has a line ending collision, which is snotting up the comparison. I am not smart enough to fix it.

Now and then when I merge upstream changes from DMS, I get ^M infestations, only to a couple files- mostly mainwindow.py.

In an attempt to solve the Problem I took Nathan's advice and followed the instructions here: https://help.github.com/articles/dealing-with-line-endings

and did:

$ git config --global core.autocrlf true
$ git rm --cached -r .
$ git reset --hard
$ git add .
$ git commit -m "Normalize line endings"

which has gotten rid of all my line ending Problems on my end, at least for the Moment. When I open mainwindow with vim, I don't see ^Ms anymore, I don't get any messages when I add or commit, everything is good. But it Looks like when I do the comparison for the pull request, there is still a difference between mainwindow line endings in my repository and in the DMS repository. I have no idea what to do about it.

I only changed a few lines in mainwindow. If you do a search for QApplication.translate, you will see all my changes.

I'm sorry for the inconvenience.