Merge in updates from @dcomtois

[ghidinelli]

@dcomtois provided an updated version that needs to be merged in. He did his work in MySQL:

I use MySQL, so I could also send you a .sql file if you prefer (I have no postgre export option unfortunately). Anyhow, here's the .ods. To avoid repeating the verb properties over and over, data are split into 2 sheets.

The columns "tipo" and "comun" should be viewed as tentative. Also, to be considered "irregular", a verb only needs to have one irregularity (other sources might consider some of these verbs regular).

----------------------------------------------------------

                Hello Brian,

                Thanks for the quick reply!

                For the changes, there are many of them. Here's a list (maybe not
                exhaustive):

                - Added the present progressive form. For the reflexive verbs, 2
                entries
                were created (ex: estoy aburriÈndome, me estoy aburriendo).
                - Modes are now: Indicativo, Condicional, Imperativo, Subjuntivo.
                - For the imperative, columns for "el" and "vosotros" were inverted,
                this was fixed.
                - For the imperative as well, the "nosotros" conjugation was
                lacking,
                this was fixed.
                - "Presente perfecto" was renamed to "PretÈrito perfecto"
                - The 2nd form of the subjunctive imperfect was added, as well
                as the
                2nd form of the subjunctive "pluscuamperfecto"

                I am not sure how to go about this... I guess the best would be to
                publish it as a distinct database, crediting both Mr. Jehle's
                work and
                mine... Makes sense? I haven't really got into the details of the
                Creative Commons license though... Your advice is most welcome!

                Thanks,

                Dominic
                conjugo.comuv.com <http://conjugo.comuv.com>
                <http://conjugo.comuv.com>

[dcomtois]

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

[dkirkby]

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

[dcomtois]

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

[dkirkby]

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

[dcomtois]

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

Edit: Done.

[ghidinelli]

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

[dcomtois]

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

[ghidinelli]

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

[dcomtois]

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?

[dkirkby]

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

to consume, eat, use upe

Replace upe with up.

[dkirkby]

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)

[dcomtois]

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