diff options
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 6 | ||||
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 8 | ||||
| -rw-r--r-- | pym/portage/news.py | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index b9f3e8cc8..0065ed3b8 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -661,13 +661,13 @@ class portdbapi(dbapi): # returns a filename:size dictionnary of remaining downloads myebuild = self.findname(mypkg) if myebuild is None: - raise AssertionError("ebuild not found for '%s'" % mypkg) + raise AssertionError(_("ebuild not found for '%s'") % mypkg) pkgdir = os.path.dirname(myebuild) mf = Manifest(pkgdir, self.settings["DISTDIR"]) checksums = mf.getDigests() if not checksums: if debug: - writemsg("[empty/missing/bad digest]: %s\n" % (mypkg,)) + writemsg(_("[empty/missing/bad digest]: %s\n") % (mypkg,)) return {} filesdict={} myfiles = self.getFetchMap(mypkg, useflags=useflags) @@ -719,7 +719,7 @@ class portdbapi(dbapi): myfiles = self.getFetchMap(mypkg, useflags=useflags) myebuild = self.findname(mypkg) if myebuild is None: - raise AssertionError("ebuild not found for '%s'" % mypkg) + raise AssertionError(_("ebuild not found for '%s'") % mypkg) pkgdir = os.path.dirname(myebuild) mf = Manifest(pkgdir, self.settings["DISTDIR"]) mysums = mf.getDigests() diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index c5c772949..fddb4326c 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3600,9 +3600,9 @@ class dblink(object): backup_dest = self._new_backup_path(mydest) msg = [] msg.append("") - msg.append("Installation of a directory is blocked by a file:") + msg.append(_("Installation of a directory is blocked by a file:")) msg.append(" '%s'" % mydest) - msg.append("This file will be renamed to a different name:") + msg.append(_("This file will be renamed to a different name:")) msg.append(" '%s'" % backup_dest) msg.append("") self._eerror("preinst", msg) @@ -3678,9 +3678,9 @@ class dblink(object): newdest = self._new_backup_path(mydest) msg = [] msg.append("") - msg.append("Installation of a regular file is blocked by a directory:") + msg.append(_("Installation of a regular file is blocked by a directory:")) msg.append(" '%s'" % mydest) - msg.append("This file will be merged with a different name:") + msg.append(_("This file will be merged with a different name:")) msg.append(" '%s'" % newdest) msg.append("") self._eerror("preinst", msg) diff --git a/pym/portage/news.py b/pym/portage/news.py index c0e6ef329..f500aa3b8 100644 --- a/pym/portage/news.py +++ b/pym/portage/news.py @@ -1,5 +1,5 @@ # portage: news management code -# Copyright 2006 Gentoo Foundation +# Copyright 2006-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 __all__ = ["NewsManager", "NewsItem", "DisplayRestriction", @@ -123,7 +123,7 @@ class NewsManager(object): itemid = _unicode_decode(itemid, encoding=_encodings['fs'], errors='replace') writemsg_level( - "!!! Invalid encoding in news item name: '%s'\n" % \ + _("!!! Invalid encoding in news item name: '%s'\n") % \ itemid, level=logging.ERROR, noiselevel=-1) continue |