The following commit has been merged in the master branch:
commit 1f75b16ea5c48bfb26ead6aa3248b717ab8aa5fc
Author: Guillem Jover <[email protected]>
Date: Mon Nov 8 08:00:16 2010 +0100
u-a: Unify similar strings
diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
index 0d4fc3b..7f327bf 100644
--- a/utils/update-alternatives.c
+++ b/utils/update-alternatives.c
@@ -1089,7 +1089,7 @@ alternative_parse_slave(struct alternative *a, struct
altdb_context *ctx)
if (alternative_has_slave(a, name)) {
sl = alternative_get_slave(a, name);
free(name);
- ctx->bad_format(ctx, _("duplicate slave %s"), sl->name);
+ ctx->bad_format(ctx, _("duplicate slave name %s"), sl->name);
}
linkname = altdb_get_line(ctx, _("slave link"));
@@ -1203,7 +1203,7 @@ alternative_load(struct alternative *a, bool must_not_die)
if (errno == ENOENT)
return false;
else
- error(_("unable to stat %s: %s"), ctx.filename,
+ error(_("cannot stat %s: %s"), ctx.filename,
strerror(errno));
}
if (st.st_size == 0) {
@@ -2093,14 +2093,14 @@ main(int argc, char **argv)
badusage(_("link %s is both primary and slave"),
slink);
if (alternative_has_slave(inst_alt, sname))
- badusage(_("slave name %s duplicated"), sname);
+ badusage(_("duplicate slave name %s"), sname);
for (sl = inst_alt->slaves; sl; sl = sl->next) {
const char *linkname = sl->link;
if (linkname == NULL)
linkname = "";
if (strcmp(linkname, slink) == 0)
- badusage(_("slave link %s duplicated"),
+ badusage(_("duplicate slave link %s"),
slink);
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
