Spanish translation for Base Partner Merge for branch 7.0 and a fix

[cesarcruz]

Added i18n/base_partner_merge.pot and i18n/es.po files in module base_partner_merge with all strings translated to spanish.

UPDATE

Added new commit with a fix in base_partner_merge.

Problem: When an admin user try to merge contacts with different emails got a wrong message:

All contacts must have the same email. Only the Administrator can merge contacts with different emails.

Since the logged in user is an admin it shouldn't display this error.

In branch 8.0 there is a condition asking for superuser, but in branch 7.0 don't, so I just added the condition to the branch 7.0 and now it works. The condition has been removed from this file in commit e0a359f

[oca-clabot]

Hey @cesarcruz, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/website.cla
Here is a list of the users:

• @cesarcruz (login unknown in OCA database)

Appreciation of efforts,
OCA CLAbot

[max3903]

Translations will soon be managed on Transifex:
https://www.transifex.com/organization/oca/dashboard

Feel free to join the OCA Translators team and translate there.

[cesarcruz]

Ok, @max3903 thanks

[mdietrichc2c]

@cesarcruz would it be possible to split the missed condition to a separate PR? I am not qualified to check the Spanish translation, but I would like to validate/merge the condition.

[cesarcruz]

I'm not sure how to split PR, I created a PR for spanish translation, then added new commit with fix condition and it automatically was added to the PR, I will check how to do that, thanks

[mdietrichc2c]

@cesarcruz what you want to do is move this commit to another branch, use this other branch for the new PR, and rebase this branch so the commit is not included.

[yvaucher]

@cesarcruz To split your commits, you need to do them on separate branches.

Best practice is to create always a new branch for a new fix/feature.

You can create a new branch on top of last commit of partner-contact and then cherry pick the commit you want:

# get your commit hashes
git log -n2

git fetch origin
git checkout origin/7.0 -b my_first_fix
git cherry-pick <commit_hash>
git push cesarcruz

(you will have to work with remotes git remote -v gives you the list of remotes,
git remote add ... will allow you to add remote)

Otherwise, you can create a new branch and going on it by doing git checkout -b name-of-my-new-branch 8.0 (8.0 is the branch name you are forking)
Then you can git rebase -i to remove one commit by deleting the line.

[yvaucher]

I set it as need fixing while you are splitting the 2 fixes

[pedrobaeza]

I close this PR as it seems abandoned.