Thanks Malcolm. That solves the problem I had with Ringo's first correction. It doesn't look like they credit the translation to anyone.

Ringo, "thy sail" makes the most sense. The song was written by and from the point of view of a woman waiting for her love to sail to her.

I'll review the rest of your corrections to see if they make any more sense than Malcolm's. However for now, I think Malcolm's would take the brass ring. That is quite a reasonable translation of the Gaelic words.