Translation almost completed.
Translation completed.  Checked for inconsistent translation.
Resolved merge conflict.