In order to fix the repository and restore some works

[carlosdelfino]

In order to fix the repository and restore some works by Jasper and correct the setting Helrunar sent by the Branch so that it is correct, I have to return the state of the repository for a few days late.

So be aware of that.

Thank you to everyone who has collaborated with the project and contributed patiently and understand that all this work is voluntary.

[jasperf]

Pulled the latest branch to check all. Got:

remote: Counting objects: 33, done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 22 (delta 15), reused 17 (delta 10)
Unpacking objects: 100% (22/22), done.
From ssh://github.com/OsTicket-Reloaded/OsTicket
- branch            master     -> FETCH_HEAD
  Auto-merging translate/en/translate.php
  CONFLICT (add/add): Merge conflict in translate/en/translate.php
  Automatic merge failed; fix conflicts and then commit the result.```

Deleted English translate file and tried again:

git pull origin master
M include/class.nav.php
M include/staff/viewticket.inc.php
M index.php
U translate/en/translate.php
M translate/pt_BR/translate.php
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm '
as appropriate to mark resolution, or use 'git commit -a'.```
Please advice what steps to take to not undo any previous changes...