Merge in updates from @dcomtois about fred-jehle-spanish-verbs HOT 12 OPEN

When the fork takes over the master... thanks @dcomtois !

from fred-jehle-spanish-verbs.

@dcomtois if you can do a PR against the repo, I'll merge it (and would appreciate it)

from fred-jehle-spanish-verbs.

Just a note... the site has moved to www.conjug.com

from fred-jehle-spanish-verbs.

@dcomtois Is your updated version of the database available online somewhere, or did it ever get merged into this repo?

from fred-jehle-spanish-verbs.

@dkirkby Sure, just check my fork: https://github.com/dcomtois/fred-jehle-spanish-verbs

from fred-jehle-spanish-verbs.

Referring to @dcomtois's update, is there a reason why "mudar(se)" appears rather than simply "mudar"? (there are separate entries for "mudarse").

from fred-jehle-spanish-verbs.

No, this has been overlooked and should be corrected. Thx for pointing it out.

Edit: Done.

from fred-jehle-spanish-verbs.

@ghidinelli Want me to do a pull request, still?

from fred-jehle-spanish-verbs.

I'll try to do a local merge before doing a PR, in case conflicts prevent it. Will let you know how this goes.

Edit: Pls see my comment in the Pull requests section; the goodgravy:master merge should be rolled back prior to the merge, so that no conflicts arise. All the modifications from goodgravy are a subset of my own, so nothing will be lost. Also, I'm not sure that I need to create a new pull request... It seems that all commits are tracked down (at least this is what the Pull requests page suggests). Can you try to go ahead with the merge and see if my recent commits are included as well?

from fred-jehle-spanish-verbs.

I found a minor typo in cell I166 of @dcomtois's update:

to consume, eat, use upe

Replace upe with up.

from fred-jehle-spanish-verbs.

A few more typos in the english translations:

• "esperar" -> "to hope" (extra space)
• "presentar" -> "to introduce" (extra spaces)
• "besar" -> "kiss" (extra spaces)
• "cumplir" -> "to fulfill, carry out; to reach" (typos)

from fred-jehle-spanish-verbs.

@dkirkby Fixed typos in Excel file, CSV and sqlite3 (in my branch). Thx for pointing them out.

from fred-jehle-spanish-verbs.