Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 19226:c58b6ab4c26f
ui: merge prompt text components into a singe string
This will help avoid problems with partial or mismatched translation
of the components.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 22 May 2013 17:31:43 -0500 |
| parents | 113681bbef9e |
| children | feaf5749d7a4 |
line wrap: on
line diff
--- a/mercurial/merge.py Tue May 21 15:32:15 2013 -0500 +++ b/mercurial/merge.py Wed May 22 17:31:43 2013 -0500 @@ -365,8 +365,8 @@ actions.append((f, "r", None, "remote delete")) elif repo.ui.promptchoice( _("local changed %s which remote deleted\n" - "use (c)hanged version or (d)elete?") % f, - (_("&Changed"), _("&Delete")), 0): + "use (c)hanged version or (d)elete?" + "$$ &Changed $$ &Delete") % f, 0): actions.append((f, "r", None, "prompt delete")) else: actions.append((f, "a", None, "prompt keep")) @@ -375,8 +375,8 @@ actions.append((f, "g", (m2.flags(f),), "remote recreating")) elif repo.ui.promptchoice( _("remote changed %s which local deleted\n" - "use (c)hanged version or leave (d)eleted?") % f, - (_("&Changed"), _("&Deleted")), 0) == 0: + "use (c)hanged version or leave (d)eleted?" + "$$ &Changed $$ &Deleted") % f, 0) == 0: actions.append((f, "g", (m2.flags(f),), "prompt recreating")) else: assert False, m return actions