Mercurial > kallithea
changeset 8335:80ffe0f29857
scripts/i18n: tweak messages
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 10 Apr 2020 15:18:45 +0200 |
| parents | 19735bc60455 |
| children | 75e46ebf176d |
| files | scripts/i18n |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/i18n Wed Nov 13 12:28:19 2019 +0100 +++ b/scripts/i18n Fri Apr 10 15:18:45 2020 +0200 @@ -96,7 +96,7 @@ 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 @@ 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)