As an aside: Chinese also uses the same term for both (焊接), and the standard English translation is "welding". This can lead to some confusion when Chinese manufacturers start talking about e.g. "surface-mount welding". :)

Heh, that would be a funny misunderstanding to have as well as the opposite, when you get back something soldered when you expected it to be welded.