search

rmcauley / rainwave

Rainwave Site and Radio Controller
http://rainwave.cc
GNU General Public License v2.0
193 stars 38 forks source link

Updated german language to current state of development #133

Closed masterofmagic86 closed 7 years ago

rmcauley commented 7 years ago

Hey Master-of-Magic, sorry I haven't pulled this in yet. All these extra commits make me concerned that something's wrong here. 🤔 I might check out your branch and cherry-pick your translation or take the file itself from your last commit and commit it myself, but I don't want to take away the credit from you there here on GitHub.

Can you try checking out Rainwave's master again and using git cherry-pick to update de_DE.json? Thanks a ton, and happy holidays. :)

masterofmagic86 commented 7 years ago

Hey rmcauley, no issue! I was also confused why Github kept all these commits. I'm new to git and not using any CLI (yet). I "just" tried to rebase my fork with the latest changes following some guide since it was outdated ... but apparently my merge did not behave as expected.

I now just followed your tip and deleted my old fork and reapplied my changes since I didn't find a way of cherry-picking on Github. So this pull request is obsolete and #134 is the new one.

Maybe you could give me a hint on how to keep my fork up to date without recreating it in the future :-)