kallithea Changeset - 80ffe0f29857

Changeset - 80ffe0f29857

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 6 years ago 2020-04-10 15:18:45
mads@kiilerich.com

Grafted from: 0b1ade3f5e85

scripts/i18n: tweak messages

1 file changed with 2 insertions and 2 deletions:

scripts/i18n

0 comments (0 inline, 0 general)

scripts/i18n

➞

Show inline comments

@@ @@ -93,13 +93,13 @@ def normalized_merge(local, base, other, @@
     from mercurial import (
         context,
         simplemerge,
         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)
     i18n_utils._normalize_po_file(other, merge_pot_file=merge_pot_file, strip=strip)
     i18n_utils._normalize_po_file(output, merge_pot_file=merge_pot_file, strip=strip)
@@ @@ -118,13 +118,13 @@ def normalized_merge(local, base, other, @@
     if ret:
         shutil.copyfile(localkeep, local)
         basekeep = base + '.keep'
         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)
     os.remove(localkeep)
 @cli.command()

0 comments (0 inline, 0 general)