440 translate privacy

[studiozandra]

Feature added for issue #440:

1. English Privacy Policy: machine translation via DeepL.com -- english has been proofread by me. Tested by changing browser language in Chrome on Linux : the correct URL matching the browser language is shown

gif made using https://github.com/phw/peek and https://ezgif.com/optimize

[tim-antkowiak]

Hey @studiozandra thank you so much for contributing!

We made some changes yesterday on the develop branch, sorry for the confusion.

To fix the commits you need to rebase your branch again on the current develop branch:

# Add the remote, call it "upstream":
git remote add upstream git@github.com:JWManagement/JWManagement.git

# Fetch all the branches of that remote into remote-tracking branches
git fetch upstream

# Make sure that you're on your branch:
git checkout 440-translate-privacy

# Rewrite your branch so that any commits of yours that
# aren't already in upstream/master are replayed on top of that
# other branch:
git rebase upstream/develop

# (Force) Push your branch
git push origin 440-translate-privacy --force

Could you try these steps?

[studiozandra]

Thank you very kindly! I have run those commands. Still a couple of other commits in there 🤔

[tim-antkowiak]

Yea, that were the commits we removed from the develop branch yesterday. I just updated your branch. Make sure to do a git fetch and maybe a git reset --hard origin/440-translate-privacy to get the updated branch on your local setup (don't forget to stash if you have local changes).