translation es-MX

[calonsot]

only this commit: f5be603

[kueda]

Hey Carlos, these mostly look good, but you need to resolve some issues before I will merge.

calonsot@f2554ad#L0L291
You should not translate the I18n keys themselves.

calonsot@c6ae568#L0L291
calonsot@f5be603#L0L291
You need to resolve these unmerged changes.

[calonsot]

Yeah, the first (calonsot/inaturalist@f2554ad#L0L291) was just a test that's not suppose to be change
But I'm having some issues with these unmerged changes, how could I remove some commits or fix the unmerged changes?

thanks,

Carlos Alonso.

----- Mensaje original -----

De: "Ken-ichi" notifications@github.com
Para: "inaturalist/inaturalist" inaturalist@noreply.github.com
CC: "calonso-conabio" calonso@conabio.gob.mx
Enviados: Lunes, 1 de Abril 2013 20:43:28
Asunto: Re: [inaturalist] translation es-MX (#20)

Hey Carlos, these mostly look good, but you need to resolve some issues before I will merge.
calonso-conabio@ f2554ad #L0L291
You should not translate the I18n keys themselves.
calonso-conabio@ c6ae568 #L0L291
calonso-conabio@ f5be603 #L0L291
You need to resolve these unmerged changes.
—
Reply to this email directly or view it on GitHub .

[kueda]

You can remove the commits if you want: http://stackoverflow.com/questions/448919/how-can-i-remove-a-commit-on-github

But it's also fine just to fix the problems in new commits. For the unmerged conflicts, you need to choose which one you want to keep and which to discard. Since you've already committed them, you'll need to delete the <<<<< and ==== stuff and choose the side that should remain. The both look pretty similar, so it might just be a change in whitespace. In the future if you have conflicts when you merge, you should resolve the conflicts with git mergetool. I prefer to use a visual merge tool like opendiff on the Mac: git mergetool -t opendiff. Here's at least one example of how to do something similar in Windows: http://stackoverflow.com/questions/426026/git-on-windows-how-do-you-set-up-a-mergetool

[calonsot]

thanks Ken-ichi!
I'm doing more changes on translations I will let you with a commit, thx.

Carlos Alonso.

----- Mensaje original -----

De: "Ken-ichi" notifications@github.com
Para: "inaturalist/inaturalist" inaturalist@noreply.github.com
CC: "calonso-conabio" calonso@conabio.gob.mx
Enviados: Lunes, 1 de Abril 2013 22:41:23
Asunto: Re: [inaturalist] translation es-MX (#20)

You can remove the commits if you want: http://stackoverflow.com/questions/448919/how-can-i-remove-a-commit-on-github
But it's also fine just to fix the problems in new commits. For the unmerged conflicts, you need to choose which one you want to keep and which to discard. Since you've already committed them, you'll need to delete the <<<<< and ==== stuff and choose the side that should remain. The both look pretty similar, so it might just be a change in whitespace. In the future if you have conflicts when you merge, you should resolve the conflicts with git mergetool . I prefer to use a visual merge tool like opendiff on the Mac: git mergetool -t opendiff . Here's at least one example of how to do something similar in Windows: http://stackoverflow.com/questions/426026/git-on-windows-how-do-you-set-up-a-mergetool
—
Reply to this email directly or view it on GitHub .

[kueda]

Hey Carlos, these changes were all handled by #22, right? Can I close this?