System and method for providing a computer-assisted translation from a source language to a target language, using a generic NMT model and a translation memory. An input text segment is received, and input context information is received. The input context information is indicative of circumstances in which the input text segment is used, the input text segment being in the source language. An estimated translation of the input text segment into the target language is calculated, using a generic neural machine translation “NMT” model for providing a generalised machine translation from the source language to the target language, and a translation memory comprising translation elements; each translation element comprising a source language text segment, a corresponding target language text segment. The estimated translation is provided to a user, for correction by the user. The translation memory is updated by storing the input text segment, the corrected translation, and the input context information, as a new translation element in the translation memory.