Обновлен перевод

mhiretskiy
Mike khiretskiy 10 years ago
parent e010529318
commit 323f715aa1

@ -1,4 +1,5 @@
AUX calculate-i18n-3.2.0_alpha10-r1.patch 239341 SHA256 237867da968f03263f7b7209fbb3278b4f8db0b55f872a6d697134e3cd0cf828 SHA512 47405f5d8092fa007cf45416f8a8963165705f8ce9922488634c2b4ec73bef68cb0235d54f6d513d00e3feef561c7f5237bda60f3b592c2b22d03547954be194 WHIRLPOOL 9c40e17eb0dc5d5819783647623d4b3f2906dfea343705c63021184b5e9bbd843c48a5759e81bf6d2621564dc5d7d41425f9e96885a0b565db86334f6ca23533
AUX calculate-i18n-3.2.0_alpha10-r2.patch 239633 SHA256 eb45bf3936c023a17b803f1ed21959f0f5855ff356b88c529006a7e416ecbe47 SHA512 06f1e2210cd1f64a342570af6a514cb7a439152dbf857515a352f6d8699e7ad34de6da43f9be40ac000e7eaf28d9fd94c66646681a6011e09a89c7484afd2d4b WHIRLPOOL fcdc8782b6ed2e0e3ade0225b298dc8c3132806351a2ee6193381bcea1a0435989ad7c1b36550907c3ab452e82522e3c836157a5db2c4493ed21d1e364c5edea
AUX calculate-i18n-3.2.0_alpha6-r1.patch 2028 SHA256 b9e8577bdd11aa5e37e276bfca165816456ac43407bd509043b23740cc5e4d60 SHA512 b66a449e3b6d2f44f91b920c33e3f69d12d9659eb9973653babe5a15e5fc7c4d6ff5774957c231fdbcb435faf7042b327deb5f7c968d0f75ae412cd5938da66d WHIRLPOOL 14fd8b210ef316b82e9993320e014a79c4f263b48124ff344c87cd22f72285070667063ea6a5a299191e50f38e2e378272f80daffa93e0075ab00d936274b775
DIST calculate-i18n-3.2.0_alpha10.tar.bz2 111001 SHA256 484c2135f361dfaaa326c2dc5c0f29cfc685f8a4dcf6fc363d8df72e3692b6c1 SHA512 c87e6e7d196c23012e6a1999ec93652a29d28ccef219702b85445237d3cce6a8fcad3929ef1ffeb5204747d025c3f79a6ae2f5fe1288f48e81144ca9479db5cf WHIRLPOOL 94614bd8c49cc0fa3636271dd43b91e24b193a00262837e7e17fa9aa02e475ba141e56fde566bd33f272818ac0dc6d915627b680c3ccc74fb642239fe6d869fc
DIST calculate-i18n-3.2.0_alpha6.tar.bz2 64584 SHA256 19a08288593778bb81df32c4c7d8ec6c2e3cfab3e98c778cc661d47a6d9c66e1 SHA512 b512ba91756af95ce7f388139280a9e8015a1a41c41b8101d56f5202df5cf42d1038d25dd3f97ab13542b5c85a6999eb303c338bf0aace7033cfb2987bfec660 WHIRLPOOL 80863dc1eeb451df069ca31e3b0cf5bbfdc56fcd838dd7047a9f494aaed1b0b4890dbc4fe812a6f46ad24b91606ec224380d5c5bc909a13965aa1defd907a364
@ -6,6 +7,7 @@ DIST calculate-i18n-3.2.0_alpha7.tar.bz2 64625 SHA256 6aa19bc23ffa69e6db29ebe285
DIST calculate-i18n-3.2.0_alpha8.tar.bz2 64616 SHA256 9e51382ad2b20ce773d2ea645599d7fdf719e91f8fb6282bf9677c9bf81040cc SHA512 699f78ff6dd360a1cfcc24dcf37fd7ea81da62e9ee44bf104410286b5851835034116bfba85557b93b7c1ddfa5f035f8450e9d6f55510e5b230bceca57ecf593 WHIRLPOOL e77c60bc50198eaecf406be1ef31562e0d230f64f231a7225c78762a8a1df50150d6b1b653549e77bf7977f039275682a9643f9e709c01e4286c3535ac075ff2
DIST calculate-i18n-3.2.0_alpha9.tar.bz2 108347 SHA256 7da6778e253e1a58a459d6deab712a3639ce737b0db66ec2c214d190af976f67 SHA512 336ce49d758b320dd5f4ae2f7eb8b649f93c6907418b7c1793a3ba319427f0f0e25d631efe5ca522b964f564272ba75f8bd23b85d1add9b3117d48b10556d4a6 WHIRLPOOL 04bb6f729e3cf0895c72f194a9946e0456aa314f85e1a43b0a78025edd96ea98e7a34289a8f7e4022b1cb1dea899c44979b9149fc661bb4bf7bf78c83f187c34
EBUILD calculate-i18n-3.2.0_alpha10-r1.ebuild 733 SHA256 27b827e75f6eb0d2e18c879216dfcaf0613b56eb5f661d56ba5bbda6409dabf3 SHA512 6c91ddbe89ee909e711af64aa2e0dd66e8d6198e98dd687116b055d3ca0cfc2633cd3c69ece4256c2a8fd8ba8e85c74fcc39cc2c355db31ffd668ac9470fb98c WHIRLPOOL 2c7d91a6d1529472feae6684ef389796f95f27134f8b353b05a8993f5270f26c9f001d189c7e7d1379844dc325850a50be39bd665c9a67116d66d9e22702c592
EBUILD calculate-i18n-3.2.0_alpha10-r2.ebuild 733 SHA256 c842ca44ca04de6645fce892658d62a7b26c43a35fd971f657c13d39fdd25c09 SHA512 50dc4cf0f67c122d4685dd826bf0e688692408ff6a0841095c23f8d7247675e728538284b48d24914b30b9ba84237e4821ede284a22d2eda605595329d05f56e WHIRLPOOL c3b78ec6c799587588ce6ba845b6a862fca26d767b9a1e4504164231aa4bf5a0454932239f990b42e456113ab714f50bb23af81b3ad14b97dd2a8edc7c4ca058
EBUILD calculate-i18n-3.2.0_alpha10.ebuild 590 SHA256 b14e52620a2230b40251a8111da01d0b6a460f880b55699099de644f73cbe275 SHA512 0e65611eea92c4d014f3f4ba8b5a16e1fd4a7f0df8e776c556d6852cf6d5c5352d101e5551bcd2d104869f1b4b652f37430640bc4bd43bf7144d69703bb8374f WHIRLPOOL ed98deedd644814000d1e4873feb4993f37950009e2a8b2b2e0dfb2d05159e5b56856b34871c1536c99845418c690c335770483145b25f35c2e1ae01234a653c
EBUILD calculate-i18n-3.2.0_alpha6-r1.ebuild 731 SHA256 be88afd34ad405aa054f0e2d571272005abcdb0fae565aee4831170cb8da2826 SHA512 f23bdf7f67ca241abcfc287a86d322119a9b34cbc733658b9f95d3836d669849eaed3b0704c2f22a50b43c14974bc33bc94837b4be60c073f54283d0a819f09b WHIRLPOOL 8bd173141576e8add3622d794175db07cd8edae447d6d95bff10fc6276c65db2c83f9dd4045feaffd019daf2d33d8055a108fd5ee39e57613753ffe328750369
EBUILD calculate-i18n-3.2.0_alpha6.ebuild 589 SHA256 4f8fa37f38584c2cf677381de4eb0b29d950e267092021b261646fc399c9ced0 SHA512 38ae5bd8627cef3b67177705f1f03d379161cca364de0adc8bcffb60616f234a45ffc1eb62b56966a4b4de39f75c6d7055b51bcaa05c4460e4bfbc546fc6fbf7 WHIRLPOOL ba058adfe7ce88bd7de4286e4cdeaa306cf4ccc560ffcc170f503e13e2bd10415b8325445ee4b7f975425142525030193802f2a6dddf18d5af9c8bd66768fd52

@ -0,0 +1,31 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-3.2.0_alpha10"
DEPEND="sys-devel/gettext
${RDEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-i18n-3.2.0_alpha10-r2.patch"
}

@ -1,4 +1,5 @@
AUX calculate-update-3.2.0_alpha10-r1.patch 19066 SHA256 4390a2a0a8425ddc0a3064e979547f916317e5268161e87b936acf40c7bf8dae SHA512 68548d6ac7886009d5590582fb4da449881402298ae8a794071a64942df773799d7b9813ccece1eba3e58d413d6866a3f0d7172d7c475c4abbccb650bd9c6180 WHIRLPOOL 8415635d09cf8b31fbc7081cb2184891f9c6bfcd9b1d1c78767b8af5cd9562de48c1f24accef92b6b47aa59d3eac35bbbbea6e0d8fbd51466a9317e4cc304a2b
AUX calculate-update-3.2.0_alpha10-r2.patch 20660 SHA256 a210e14f28a8e7876576ea53a6072eddc47a73860aad58d830444c0b5f90a859 SHA512 3e215e6acd983238fa89de2c975f4a2ae12f9ed21009d9f818276b24874f68750cf219006e43ed37c087b49bf408b5d7b8dda97e12d4c5721375d237c7df2e5f WHIRLPOOL 2fde0ea0daafc4180cb949506b2595962998ffe50bb5bf09ce7ded90f29bd3350da74c10f6c4e24b259a6e097a072df37d8f28bef2ba5003ecfec0e4f20e1674
AUX calculate-update-3.2.0_alpha7-r1.patch 1086 SHA256 4de503ac11c623bae15c770e2d8a66679972dd3d358cb1852c34c553ebde77aa SHA512 eaa0e099441e4e55e0d98818c679590bdc421ac3029df4111ac280847921bb100fbc2af7886917e48582f3d1220e0b3e221d5537cf1a029265d790f1077b209a WHIRLPOOL 6b00347e85c4ee747a43e4cf0ad6dc411b9529d62c8296f0ed82291ccdd68823f45f110d3f23347a637e822f9a4407c57a3f3dd4aafbd0953ba83f935d4f3b1f
DIST calculate-update-3.2.0_alpha10.tar.bz2 25298 SHA256 8a20822ceea8fee9fc5cd9c790463f389f776ccb8cd80a9ddc56019913e48805 SHA512 ea66987e0e276f8050c218f863f6bb2b9c3fbc604c1427982f740a929a85a8dabe4fbdf1e776e61320642e47a117c301c5fe63b4f3ebc69d190dcd33bc00749f WHIRLPOOL 4910453edce2d21e020dbd7558e718983b1547efbce99e94f151980a0a8c09fd1bb8d4870d4f04c8e0d421696cb31977b422506a05249bff880d4b4c4b046135
DIST calculate-update-3.2.0_alpha6.tar.bz2 24918 SHA256 ba6c633330d68761bc426750dd5b3bb52d75843c1e5adc6f1ee41daa032e1e2e SHA512 c44e02e158758e5f1bfb26d1f1f276d27664e072df9aa3485840d4853320671a0323dc03ccfc31e78f1ae66003416d5723383967991fefbb5c427ec8447dccee WHIRLPOOL 14d5fbec32105e18f31304d7c70f1c57b98b4c3ffd83ca4bc209c622b71df218f2c63f006fb15b5804676c0421b86c05ac6ffef26651e1336a5cf820701900ff
@ -6,6 +7,7 @@ DIST calculate-update-3.2.0_alpha7.tar.bz2 25167 SHA256 73354a7256acf3939c988fd0
DIST calculate-update-3.2.0_alpha8.tar.bz2 25248 SHA256 2bd5d35565644588b96584d1a18461c01b09e676bae739a0c3ca13307c8b0eef SHA512 0cc82eed222f27ceeae24c1dd528ecdb589e95ff21d7e5e09be1d42d39e3f4430cf6b3325f36c8a39deba116e5726433552ced6481944d3d06980bb0be7ea75a WHIRLPOOL c116e6f363a3a1a64f4e62192bb4cd86577e3faa247d4726504762950e995238b5fb620b334be3dd16a9ebaa73e104bd20c6d94b16b9f86926b9c85172d3a56e
DIST calculate-update-3.2.0_alpha9.tar.bz2 25265 SHA256 d482ab158fa2d3ed1742627056861eeaa9bcf1833b41d3676bd9d1d85f8d19bb SHA512 f0a547d6e36852407d158a4e4c629ee08aae08b9d0ec0641428f9522eada6ad0df4bb839a7f2bcb89362baeb816d38b62b21ff03783a6e6c0e17931dddd6cddf WHIRLPOOL 5fb767e73ac233a57e9f62e6f0359e23b3c6ec0924ce4725278d009023c863cc74cb3a2767d7d8a2f13ce8c0fff01f58b5ed7c4a247786969867cb66aac45515
EBUILD calculate-update-3.2.0_alpha10-r1.ebuild 770 SHA256 f09748ea4bf9588a568b0abb8e8eb83428a6d4f2ffc30ba770b90467cf25f5d9 SHA512 eb7eb345b9789a734f2a62048d56cc75867cb6a81f9acd55157dc76afbbdc82819dd098ad51bfda7d9624e7a0e1af02d918da3617b665b2030c941f5d3a20047 WHIRLPOOL cd69fb9155d0d238c63432e62ceb61fc3a7ee24373716e6f65b9bd9754495b479c7d0a762d095041e032a065942ed2fb7459e1a4258038d7d901dde207187c7e
EBUILD calculate-update-3.2.0_alpha10-r2.ebuild 770 SHA256 c6ed49be093c18419890081ef26fed41f9fafa923b445d211c26bc30e02503ca SHA512 f7f252c6a99bee219e655dd53e3bcba8bcd0c9ea07693a29301b53cbcddd0b2e39fb75854ca1ef7681ce18c6dc0e62c86a207759d0e9b1cb100dafb81fa43348 WHIRLPOOL f8f742e5781d0874217ce9f65d5130054fb20d623f6f87c67e32aab9691413e149508caf4ad4595efb6890b222ac39398c2bd70e4fb84581c438c72fca4270e9
EBUILD calculate-update-3.2.0_alpha10.ebuild 625 SHA256 fcf7c67110cd4b726c5acd91dbc121488261ee03fa02c1ce987cd1a552c3af74 SHA512 f0cdb147661c97907926db8a70c9dbd8142c91110b2a3caf56791dab5d7c53a821800ed777ea15765fbeea5e1c3e4b26fda614b4d9a1b1fcd48793185b440133 WHIRLPOOL d2323042d9d6db1d13f322877279cd2d39bee97a371ba393b8b8ed17df7fbcb3c141e26f02d1b3d9faf309d4b1458515fe277ff656cc5ff399ec416463c2e3f3
EBUILD calculate-update-3.2.0_alpha6.ebuild 613 SHA256 926d0feedb17e6ed88239296a28cc8113a9e81f3d2369d587f1647bb778bfb7b SHA512 141b324867ea1f744141a3facef0b87a33947085b53e8894387e402855dbab95bce203855f1923ea55c9ceae239227cae44cc840baeabca944ac07fd156a3720 WHIRLPOOL adf9914f598fc16f76c4a9b95115d22ff0a993f5e0c0823ff31e45395bfd9becf0f5dc23f41ff69a911a20673e7d3be45b08be1d7bf9cfc550ccdcc7c7515252
EBUILD calculate-update-3.2.0_alpha7-r1.ebuild 757 SHA256 b7991c8c837ea3be6ba82abe88fe80db1cdb1ab3b13daca86286884beb7dd06b SHA512 ba0604f395d14855146aa6a6fc1eab087789cb3379db7f7925fd13a3eed094459dcdcfc7fff7cfea99a398fe5dad307147711749c2d2eca308aca4e7d6eedd8d WHIRLPOOL d30db8bf3fe1ce41c12b49289be83801d5338970b06add9c63b49a6bf9d8b348f059cfb30025a1b5a56e44b983316a54e2a1ebc301fc3a42fa06a0210e2f37f8

@ -0,0 +1,33 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of update Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.2.0_alpha10
~sys-apps/calculate-install-3.2.0_alpha10
dev-python/pexpect"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-update-3.2.0_alpha10-r2.patch"
}

@ -0,0 +1,457 @@
diff --git update/emerge_parser.py update/emerge_parser.py
index 80d012b..a319a80 100644
--- update/emerge_parser.py
+++ update/emerge_parser.py
@@ -447,7 +447,7 @@ class EmergeingErrorBlock(EmergeInformationBlock):
return self.text_converter.transform(readFile(self.result))
def action(self, child):
- raise EmergeError(_("Emerge %s is failed") % self.package)
+ raise EmergeError(_("Failed to emerge %s") % self.package)
class RevdepPercentBlock(NotifierInformationBlock):
diff --git update/package_tools.py update/package_tools.py
index dd86cbd..61c319f 100644
--- update/package_tools.py
+++ update/package_tools.py
@@ -140,11 +140,11 @@ class Git:
if path.exists(rpath):
if not path.isdir(rpath):
raise GitError(
- _("Repository {path} is not directory").format(
+ _("Repository {path} is not a directory").format(
path=rpath))
if not path.isdir(self._gitDir(rpath)):
raise GitError(
- _("Repository {path} is not git").format(
+ _("Repository {path} is not Git").format(
path=rpath))
return True
return False
@@ -155,7 +155,7 @@ class Git:
"""
git = getProgPath("/usr/bin/git")
if not git:
- raise GitError(_("Git utility is not found"))
+ raise GitError(_("The Git tool is not found"))
return git
@staticmethod
@@ -191,9 +191,9 @@ class Git:
error = gitClone.read()
if "Remote branch %s not found" % branch in error:
raise GitError(
- _("Branch {branch} not found in {url} repository").format(
+ _("Branch {branch} not found in repository {url}").format(
branch=branch, url=url))
- raise GitError(_("Failed to clone {url} repository").format(
+ raise GitError(_("Failed to clone repository {url}").format(
url=url), error)
return True
@@ -272,7 +272,7 @@ class Git:
if command("get_rev_tag") or command("fetchshallow"):
if not command("has_branch"):
raise GitError(
- _("Branch {branch} not found in {url} repository"
+ _("Branch {branch} not found in repository {url}"
).format(branch=branch, url=url))
# если среди коммитов есть указанный коммит
if command("has_revision"):
@@ -281,7 +281,7 @@ class Git:
return True
elif command("checkout"):
return False
- raise GitError(_("Failed to clone {url} repository").format(
+ raise GitError(_("Failed to clone repository {url}").format(
url=url), error[-1])
def pullRepository(self, rpath, quiet_error=False, cb_progress=None):
@@ -294,7 +294,7 @@ class Git:
if not quiet_error:
error = gitPull.read()
raise GitError(
- _("Failed to update repository in {rpath}").format(
+ _("Failed to update the repository in {rpath}").format(
rpath=rpath), error)
return False
return True
@@ -316,7 +316,7 @@ class Git:
if gitFetch.failed():
error = gitFetch.read()
raise GitError(
- _("Failed to update repository in {rpath}").format(
+ _("Failed to update the repository in {rpath}").format(
rpath=rpath), error)
return True
@@ -332,7 +332,7 @@ class Git:
return not any(x.strip() for x in git_status)
else:
raise GitError(
- _("Wrong repository in {rpath} directory").format(
+ _("Wrong repository in the {rpath} directory").format(
rpath=rpath))
def parseStatusInfo(self, data):
@@ -376,8 +376,7 @@ class Git:
return git_show.read().strip()
else:
raise GitError(
- _("Failed to get status of repository in "
- "{rpath} directory").format(
+ _("Failed to get the repository status for {rpath}").format(
rpath=rpath))
def getStatusInfo(self, rpath):
@@ -395,13 +394,12 @@ class Git:
retDict = self.parseStatusInfo(git_status.read())
if not retDict:
raise GitError(
- _("Failed to get status of repository in "
- "{rpath} directory").format(
+ _("Failed to get the repository status for {rpath}").format(
rpath=rpath))
return retDict
else:
raise GitError(
- _("Wrong repository in {rpath} directory").format(
+ _("Wrong repository in the {rpath} directory").format(
rpath=rpath))
def resetRepository(self, rpath, to_origin=False, to_rev=None, info=None):
@@ -434,7 +432,7 @@ class Git:
rpath,
"clean", "-fd", stderr=STDOUT)
if git_reset.failed() or git_clean.failed():
- raise GitError(_("Failed to clean {rpath} repository").format(
+ raise GitError(_("Failed to clean the {rpath} repository").format(
rpath=rpath))
return True
@@ -456,11 +454,11 @@ class Git:
error = git_checkout.read()
if "pathspec '%s' did not match" % branch in error:
raise GitError(
- _("Branch {branch} not found in {rpath} repository").format(
+ _("Branch {branch} not found in repository {rpath}").format(
branch=branch, rpath=rpath))
raise GitError(
- _("Failed to change branch to {branch} in "
- "{rpath} repository").format(branch=branch,
+ _("Failed to change branch to {branch} in the {rpath} "
+ "repository").format(branch=branch,
rpath=rpath), error)
return True
diff --git update/update.py update/update.py
index 2f867f4..ebd0757 100644
--- update/update.py
+++ update/update.py
@@ -116,7 +116,7 @@ class Update:
raise UpdateError(_("Update is already running. "
"Try to run later."))
else:
- self.startTask(_("Waiting for complete another update"))
+ self.startTask(_("Waiting for another update to be complete"))
while any(ifilter(lambda x: os.getpid() != x,
search_worked_process('update', dv))):
time.sleep(0.3)
@@ -133,8 +133,8 @@ class Update:
"cl_update_rep_rev", "cl_update_branch_name"],
where="cl_update_rep_name", eq=repname, limit=1))
if not url or not rpath:
- raise UpdateError(_("Variables with repositories settings "
- "is not configured"))
+ raise UpdateError(_("Configuration variables for repositories "
+ "are not setup"))
self.addProgress()
if clean_on_error:
try:
@@ -148,7 +148,7 @@ class Update:
self.printWARNING(str(e))
self.endTask(False)
self.startTask(
- _("Re-fetch {name} repository").format(name=repname))
+ _("Re-fetching the {name} repository").format(name=repname))
self.addProgress()
try:
rpath_new = "%s_new" % rpath
@@ -157,7 +157,7 @@ class Update:
removeDir(rpath)
os.rename(rpath_new, rpath)
except OSError:
- raise UpdateError(_("Permission denied to change "
+ raise UpdateError(_("Permission denied to modify the "
"{repname} repository").format(
repname=repname))
finally:
@@ -179,7 +179,7 @@ class Update:
"""
layman = getProgPath('/usr/bin/layman')
if not layman:
- raise UpdateError(_("Layman utility is not found"))
+ raise UpdateError(_("The Layman tool is not found"))
rpath = self.clVars.Select('cl_update_other_rep_path',
where='cl_update_other_rep_name', eq=repname,
limit=1)
@@ -193,7 +193,7 @@ class Update:
p = process(layman, "-s", repname, stderr=STDOUT)
if p.failed():
raise UpdateError(
- _("Failed to update repository {rname}").format(rname=repname),
+ _("Failed to update the {rname} repository").format(rname=repname),
addon=p.read())
return True
@@ -203,12 +203,12 @@ class Update:
"""
egenCache = getProgPath('/usr/bin/egencache')
if not egenCache:
- raise UpdateError(_("Portage utility is not found"))
+ raise UpdateError(_("The Portage tool is not found"))
cpu_num = self.clVars.Get('hr_cpu_num')
p = process(egenCache, "--repo=%s" % repname, "--update",
"--jobs=%s" % cpu_num, stderr=STDOUT)
if p.failed():
- raise UpdateError(_("Failed to update cache of {rname} "
+ raise UpdateError(_("Failed to update the cache of the {rname} "
"repository").format(rname=repname),
addon=p.read())
return True
@@ -219,7 +219,7 @@ class Update:
"""
emerge = getProgPath("/usr/bin/emerge")
if not emerge:
- raise UpdateError(_("Emerge utility is not found"))
+ raise UpdateError(_("The Emerge tool is not found"))
self.addProgress()
p = PercentProgress(emerge, "--metadata", part=1, atty=True)
for perc in p.progress():
@@ -238,7 +238,7 @@ class Update:
"""
eixupdate = getProgPath("/usr/bin/eix-update")
if not eixupdate:
- raise UpdateError(_("Eix utility is not found"))
+ raise UpdateError(_("The Eix tool is not found"))
self.addProgress()
excludeList = []
if self.clVars.Get('cl_update_eixupdate_force') == 'force':
@@ -337,7 +337,7 @@ class Update:
"""
cmd_path = getProgPath(cmd)
if not cmd_path:
- raise UpdateError(_("Failed to find %s command") % cmd)
+ raise UpdateError(_("Failed to find the %s command") % cmd)
with EmergeParser(
emerge_parser.CommandExecutor(cmd_path, params)) as emerge:
self._startEmerging(emerge)
@@ -349,7 +349,7 @@ class Update:
"""
cmd_path = getProgPath(cmd)
if not cmd_path:
- raise UpdateError(_("Failed to find %s command") % cmd)
+ raise UpdateError(_("Failed to find the %s command") % cmd)
with EmergeParser(
emerge_parser.CommandExecutor(cmd_path, params)) as emerge:
revdep = RevdepPercentBlock(emerge)
@@ -409,7 +409,7 @@ class Update:
self._display_pretty_package_list(pkglist)
if emerge.install_packages.remove_list:
self.printSUCCESS(_print(
- _("List removal packages")))
+ _("Listing packages for removal")))
self._display_pretty_package_list(
emerge.install_packages.remove_list, remove_list=True)
if str(emerge.download_size) != "0 kB":
@@ -427,7 +427,7 @@ class Update:
_print = self.color_print
pkglist = emerge.uninstall_packages.list
self.printSUCCESS(_print.bold(
- _("List removal packages")))
+ _("Listing packages for removal")))
self._display_pretty_package_list(pkglist, remove_list=True)
def getCacheOnWorld(self, params, packages, check=False):
diff --git update/utils/cl_update.py update/utils/cl_update.py
index 2ac2c36..35ff534 100644
--- update/utils/cl_update.py
+++ update/utils/cl_update.py
@@ -151,7 +151,7 @@ class ClUpdateAction(Action):
]
},
{'name': 'update_other:depclean',
- 'group': __("Cleaning system from needless packages"),
+ 'group': __("Cleaning the system from needless packages"),
'tasks': [
{'name': 'update_other:update_depclean',
'message': __("Calculating dependencies"),
@@ -209,19 +209,19 @@ class ClUpdateAction(Action):
'tasks': [
{'name': 'sync_reps',
'foreach': 'cl_update_sync_rep',
- 'message': __("Syncing {eachvar:capitalize} repository"),
+ 'message': __("Syncing the {eachvar:capitalize} repository"),
'method': 'Update.syncRepositories(eachvar)',
'condition': lambda Get: Get('cl_update_sync_rep')
},
{'name': 'sync_other_reps',
'foreach': 'cl_update_other_rep_name',
- 'message': __("Syncing {eachvar:capitalize} repository"),
+ 'message': __("Syncing the {eachvar:capitalize} repository"),
'method': 'Update.syncLaymanRepository(eachvar)',
'condition': lambda Get: Get('cl_update_other_set') == 'on'
},
{'name': 'sync_reps:regen_cache',
'foreach': 'cl_update_sync_overlay_rep',
- 'message': __("Updating {eachvar:capitalize} repository cache"),
+ 'message': __("Updating the {eachvar:capitalize} repository cache"),
'essential': False,
'method': 'Update.regenCache(eachvar)',
'condition': (
@@ -231,12 +231,12 @@ class ClUpdateAction(Action):
},
{'name': 'sync_other_reps:regen_other_cache',
'foreach': 'cl_update_other_rep_name',
- 'message': __("Updating {eachvar:capitalize} repository cache"),
+ 'message': __("Updating the {eachvar:capitalize} repository cache"),
'method': 'Update.regenCache(eachvar)',
'essential': False,
},
{'name': 'emerge_metadata',
- 'message': __("Metadata trasfer"),
+ 'message': __("Metadata transfer"),
'method': 'Update.emergeMetadata()',
'condition': (
lambda Get: (Get('cl_update_outdate_set') == 'on' and
@@ -244,7 +244,7 @@ class ClUpdateAction(Action):
Get('cl_update_metadata_force') == 'force'))
},
{'name': 'eix_update',
- 'message': __("Updating eix cache"),
+ 'message': __("Updating the eix cache"),
'method': 'Update.eixUpdate()',
'condition': (
lambda Get: (Get('cl_update_outdate_set') == 'on' and
diff --git update/variables/update.py update/variables/update.py
index 01eedf8..0276858 100644
--- update/variables/update.py
+++ update/variables/update.py
@@ -74,8 +74,8 @@ class VariableClUpdateRevSet(Variable):
"cl_update_eixupdate_force"]
def init(self):
- self.help = _("revision update")
- self.label = _("Revision update")
+ self.help = _("make a revision update")
+ self.label = _("Make a revision update")
class VariableClUpdateRep(Variable):
"""
@@ -122,7 +122,7 @@ class VariableClUpdateSystemProfile(ReadonlyVariable):
path.join(path.dirname(make_profile),
os.readlink(make_profile)))
except:
- raise VariableError(_("Failed to determine system profile"))
+ raise VariableError(_("Failed to determine the system profile"))
class VariableClUpdateLaymanStorage(ReadonlyVariable):
"""
@@ -239,8 +239,8 @@ class VariableClUpdateSyncRep(Variable):
untrusted = True
def init(self):
- self.help = _("synchronize repositories (all by default)")
- self.label = _("Synchronize repositories")
+ self.help = _("synchronized repositories (all by default)")
+ self.label = _("Synchronized repositories")
def set(self,value):
orderList = self.Get('cl_update_rep_name')
@@ -288,15 +288,15 @@ class VariableClUpdateMetadataForce(Variable):
#untrusted = True
def init(self):
- self.help = ("'force' - " + _("force update ebuilds metadata") +
- ",\n'skip' - " + _("skip update ebuilds metadata") +
- ",\n'auto' - " + _("update metadata if they are outdated"))
+ self.help = ("'force' - " + _("force the update ebuilds metadata") +
+ ",\n'skip' - " + _("skip the ebuild metadata update") +
+ ",\n'auto' - " + _("update metadata if it is outdated"))
self.label = _("Update metadata")
def choice(self):
return [("force", _("Force")),
("skip", _("Skip")),
- ("auto", _("By need"))]
+ ("auto", _("If needed"))]
class VariableClUpdateEixupdateForce(Variable):
"""
@@ -310,15 +310,16 @@ class VariableClUpdateEixupdateForce(Variable):
#untrusted = True
def init(self):
- self.help = ("'force' - " + _("force update eix cache") +
- ",\n'skip' - " + _("skip update eix cache") +
- ",\n'auto' - " + _("update eix cache if it is outdated"))
- self.label = _("Update eix cache")
+ self.help = ("'force' - " + _("force the eix cache update") +
+ ",\n'skip' - " + _("skip the eix cache update") +
+ ",\n'auto' - " + _("update the eix cache if it "
+ "is outdated"))
+ self.label = _("Update the eix cache")
def choice(self):
return [("force", _("Force")),
("skip", _("Skip")),
- ("auto", _("By need"))]
+ ("auto", _("If needed"))]
class VariableClUpdateOtherSet(Variable):
"""
@@ -389,9 +390,10 @@ class VariableClUpdatePretendSet(Variable):
opt = ["-p", "--pretend"]
def init(self):
- self.label = _("Pretend package update")
- self.help = _("instead of actually performing packages update, "
- "simply only display what have been installed")
+ self.label = _("Pretend a package update")
+ self.help = _("instead of actually performing the update, "
+ "simply display the list of packages that "
+ "will be installed")
class VariableClUpdateSyncOnlySet(Variable):
"""
@@ -423,5 +425,5 @@ class VariableClUpdateWaitAnotherSet(Variable):
opt = ["--wait-another-update"]
def init(self):
- self.label = _("Wait for complete another update")
- self.help = _("wait until the other updates or abort")
+ self.label = _("Wait for another update to be complete")
+ self.help = _("wait until the running update is finished")
diff --git update/wsdl_update.py update/wsdl_update.py
index 10ec376..9bd535e 100644
--- update/wsdl_update.py
+++ update/wsdl_update.py
@@ -39,7 +39,7 @@ class Wsdl(WsdlBase):
# категория метода
'category': __('Update'),
# заголовок метода
- 'title': __("Update System"),
+ 'title': __("Update the System"),
# иконка для графической консоли
'image': 'software-properties,preferences-desktop',
# метод присутствует в графической консоли
@@ -60,7 +60,7 @@ class Wsdl(WsdlBase):
'setvars': {'cl_action!': 'sync'},
# описание груп (список лямбда функций)
'groups': [
- lambda group: group(_("Update system"),
+ lambda group: group(_("Update the system"),
normal=(),
expert=(
'cl_rebuild_world_set', 'cl_update_rev_set',

@ -1,4 +1,5 @@
EBUILD calculate-utilities-3.2.0_alpha10-r1.ebuild 842 SHA256 44749a0235d8542111cc94a2fcab68c0a3f9f8525ed386562ae3f16a05c74748 SHA512 257062e73d4656c78182c46c333cd13abae9e8bb4e4b2706557a9e9090ce221ef571d3b4f82515354b70efb68b588b33d1c9981c12d181514436b1a95ced715c WHIRLPOOL 248419a891dfb6a57a54b598685c03c0ce3940deb76336b85e188dec884dfda850530598f2bc7b91516a413790ec09f673c89aec6eebf84e027a5fd959f2b1d4
EBUILD calculate-utilities-3.2.0_alpha10-r2.ebuild 842 SHA256 62a6fa86d44b51242d08753510c382076378aeaaba1b927f322d06fa0b17bca0 SHA512 5a39b25013adfe53d1d50efa87354308b384e956aff0a3a2b7072345df7b9c67d2642666a9dae2ccd77406870161ff88c150cf07eedacd9a6b541631d11de940 WHIRLPOOL 66ecd6e470ad72a7643227deba42125baa8ee72bfa67c7e4fbed71b6095c10a51ea601045f66f8612404cef60cdeb77372eb63a6a0cf932cfab759fd5d09cd6e
EBUILD calculate-utilities-3.2.0_alpha10.ebuild 821 SHA256 84c2e5778fcc8d03c0e518ba8959b51da31d6214323a37ebce50be1a88ac1fb0 SHA512 df256adf9ad7aa728d9404171857686e4ced31a08bcd9a8c08c5da87e366da47bd7b656b189d321b0bbc490245a3bd64eac0dce69248748e2da2902ef44a3d54 WHIRLPOOL 853ab051ebb8619b013f224ee12d6d8fd225a6534a1abb92321fb40212d40269d2d713e504a4dfa3a2d8866dbfe480320ba24eb340b416a3a7b92afe938ad6ee
EBUILD calculate-utilities-3.2.0_alpha6-r1.ebuild 827 SHA256 943e1949dec30c2f0ffd5a7cd065c8101ee6e999acc09d2ebd256f67b44b13bb SHA512 a9fede957dd87532feac22f631935b2ee6933541e8b589abe892ec45960a09063b9b0009298fccb346ab74dbfd6d5889d13f9fbfe4a42b56ec086e7140d12bad WHIRLPOOL c75eea5fc5d82a42615346dbc72664dfec75dbf87ab61b2ff3cb2bbf15ae78634befa815aed95f09ae00e268b618e966815a87e309128777b3455ac08e793e0c
EBUILD calculate-utilities-3.2.0_alpha6.ebuild 812 SHA256 21f5c205fbb62622da8c262be1be8f3e5d7da7b64e3c93c7b33ca04693452490 SHA512 025b503372989e498fc6b50609d3ebbf13f3376b8e66c5123e3dcebeb0722ff586212c08cf085ee9bd02e215c7ac03d9876b00f73ff1f636a14a1f5d146c3869 WHIRLPOOL 259a86930a618b530515322cf73a4cb0ab8f16a44f8531ae478f30173e1f376272afbdd3b80c6e195e65cbdf10ec19544eae990e262726a51097f01650b5d1cb

@ -0,0 +1,26 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.2.0_alpha10-r1
=sys-apps/calculate-i18n-3.2.0_alpha10-r2
=sys-apps/calculate-lib-3.2.0_alpha10-r1
=sys-apps/calculate-core-3.2.0_alpha10-r1
=sys-apps/calculate-update-3.2.0_alpha10-r2
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha10-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha10 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha10 )
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha10-r1 )
"
Loading…
Cancel
Save