Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/i18n.py @ 1701:4ba8fe499df2
hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:10 -0600 |
parents | fbf2b10011aa |
children | 345bac2bc4ec |
line wrap: on
line source
""" i18n.py - internationalization support for mercurial Copyright 2005 Matt Mackall <mpm@selenic.com> This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. """ # the import from gettext is _really_ slow # for now we use a dummy function gettext = lambda x: x #import gettext #t = gettext.translation('hg', '/usr/share/locale', fallback=1) #gettext = t.gettext