scripts/i18n: tweak messages

scripts/i18n

@@ -96,7 +96,7 b' def normalized_merge(local, base, other,'
         ui as uimod,
     )
 
-    print('i18n normalized-merge: merging file %s' % output)
+    print('i18n normalized-merge: normalizing and merging %s' % output)
 
     i18n_utils._normalize_po_file(local, merge_pot_file=merge_pot_file, strip=strip)
     i18n_utils._normalize_po_file(base, merge_pot_file=merge_pot_file, strip=strip)
@@ -121,7 +121,7 b' def normalized_merge(local, base, other,'
         otherkeep = other + '.keep'
         shutil.copyfile(base, basekeep)
         shutil.copyfile(other, otherkeep)
-        sys.stderr.write("Error: simple merge failed and %s is left with conflict markers. Resolve the conflics , then use 'hg resolve -m'.\n" % output)
+        sys.stderr.write("Error: simple merge failed and %s is left with conflict markers. Resolve the conflicts, then use 'hg resolve -m'.\n" % output)
         sys.stderr.write('Resolve with e.g.: kdiff3 %s %s %s -o %s\n' % (basekeep, localkeep, otherkeep, output))
         sys.exit(ret)