locale updates

[jocker-il]

tag this to inform me of changes to locale files so I can add hebrew translation BEFORE you release...

also - please leave it open

[jocker-il]

Whatever you did, my version doesn't want to update and now I have a merge conflict that I can't resolve:

"$ git merge --ff-only @{u}
error: merge is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict."

and:

"$ git rebase -p @{u}
locale/he/he.cfg: needs merge
Cannot rebase: You have unstaged changes.
Additionally, your index contains uncommitted changes.
Please commit or stash them."

What can I do to solve this short of deleting my repo and forking your's again ?

[Choumiko]

Deleting and forking again is probably the quickest way. Have you tried this: https://help.github.com/articles/syncing-a-fork/ ? I'm not that good with git