Guest jo, the translation you've written is what I learned and it is the translation that Marjorie Kennedy-Fraser published. I haven't heard the other translation before. Either version is pretty but the one I'm not familiar with has more syllables to bung into the tune, I like it simpler.