From 2b70fe1e31c8751681c29e95ba1a99d6675c60c7 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Fri, 2 Mar 2012 00:01:19 +0100 Subject: Further i18n fixes Signed-off-by: Jan Kara --- quot.c | 2 +- quotaon.c | 6 +++--- quotaon_xfs.c | 30 +++++++++++++++--------------- quotaops.c | 6 +++--- quotasync.c | 4 ++-- repquota.c | 2 +- rquota_svc.c | 10 +++++----- setquota.c | 2 +- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/quot.c b/quot.c index efff122..6311f77 100644 --- a/quot.c +++ b/quot.c @@ -192,7 +192,7 @@ static void report(const char *file, const char *fsdir, int type) { du_t *dp; - printf(_("%s (%s) %s:\n"), file, fsdir, type? "groups" : "users"); + printf(_("%s (%s) %ss:\n"), file, fsdir, _(type2name(type))); if (!qflag) qsort(du[type], ndu[type], sizeof(du[type][0]), (int (*)(const void *, const void *))qcmp); for (dp = du[type]; dp < &du[type][ndu[type]]; dp++) { diff --git a/quotaon.c b/quotaon.c index 0c82893..507d0bb 100644 --- a/quotaon.c +++ b/quotaon.c @@ -212,7 +212,7 @@ static int quotaonoff(const char *quotadev, const char *quotadir, char *quotafil errstr(_("quotactl on %s [%s]: %s\n"), quotadev, quotadir, strerror(errno)); return 1; } - pinfo(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type)); + pinfo(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, _(type2name(type))); return 0; } if (kernel_iface == IFACE_GENERIC) { @@ -234,7 +234,7 @@ static int quotaonoff(const char *quotadev, const char *quotadir, char *quotafil errstr(_("Quota format not supported in kernel.\n")); return 1; } - pinfo(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type)); + pinfo(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, _(type2name(type))); return 0; } @@ -339,7 +339,7 @@ static int print_state(struct mount_entry *mnt, int type) else if (kern_qfmt_supp(QF_VFSOLD)) on = kern_quota_on(mnt, type, QF_VFSOLD) != -1; - printf(_("%s quota on %s (%s) is %s\n"), type2name(type), mnt->me_dir, mnt->me_devname, + printf(_("%s quota on %s (%s) is %s\n"), _(type2name(type)), mnt->me_dir, mnt->me_devname, on ? _("on") : _("off")); return on; diff --git a/quotaon_xfs.c b/quotaon_xfs.c index a271e71..ed47221 100644 --- a/quotaon_xfs.c +++ b/quotaon_xfs.c @@ -60,11 +60,11 @@ static int xfs_state_check(int qcmd, int type, int flags, const char *dev, int r case Q_XFS_QUOTAON: if (roothack) { pinfo(_("Enabling %s quota on root filesystem" - " (reboot to take effect)\n"), type2name(type)); + " (reboot to take effect)\n"), _(type2name(type))); return 1; } errstr(_("Enable XFS %s quota accounting during mount\n"), - type2name(type)); + _(type2name(type))); return -1; case Q_XFS_QUOTAOFF: return 0; /* noop */ @@ -75,29 +75,29 @@ static int xfs_state_check(int qcmd, int type, int flags, const char *dev, int r case Q_XFS_QUOTARM: errstr(_("Cannot delete %s quota on %s - " "switch quota accounting off first\n"), - type2name(type), dev); + _(type2name(type)), dev); return -1; case Q_XFS_QUOTAON: if (roothack) { pinfo(_("Enabling %s quota on root filesystem" - " (reboot to take effect)\n"), type2name(type)); + " (reboot to take effect)\n"), _(type2name(type))); return 1; } if (xopts & XFS_QUOTA_UDQ_ENFD || xopts & XFS_QUOTA_GDQ_ENFD) { - pinfo(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev); + pinfo(_("Enabling %s quota enforcement on %s\n"), _(type2name(type)), dev); return 1; } errstr(_("Already accounting %s quota on %s\n"), - type2name(type), dev); + _(type2name(type)), dev); return -1; case Q_XFS_QUOTAOFF: if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) { pinfo(_("Disabling %s quota accounting on %s\n"), - type2name(type), dev); + _(type2name(type)), dev); return 1; } errstr(_("Quota enforcement already disabled for %s on %s\n"), - type2name(type), dev); + _(type2name(type)), dev); return -1; } break; @@ -107,23 +107,23 @@ static int xfs_state_check(int qcmd, int type, int flags, const char *dev, int r case Q_XFS_QUOTARM: errstr(_("Cannot delete %s quota on %s - " "switch quota enforcement and accounting off first\n"), - type2name(type), dev); + _(type2name(type)), dev); return -1; case Q_XFS_QUOTAON: errstr(_("Enforcing %s quota already on %s\n"), - type2name(type), dev); + _(type2name(type)), dev); return -1; case Q_XFS_QUOTAOFF: if (xopts == XFS_QUOTA_UDQ_ACCT || xopts == XFS_QUOTA_GDQ_ACCT) { errstr(_("Cannot switch off %s quota " "accounting on %s when enforcement is on\n"), - type2name(type), dev); + _(type2name(type)), dev); return -1; } if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) acctstr = _("and accounting "); pinfo(_("Disabling %s quota enforcement %son %s\n"), - type2name(type), acctstr, dev); + _(type2name(type)), acctstr, dev); return 1; } break; @@ -147,9 +147,9 @@ static int xfs_onoff(const char *dev, int type, int flags, int roothack, int xop return 1; } if (qoff) - pinfo(_("%s: %s quotas turned off\n"), dev, type2name(type)); + pinfo(_("%s: %s quotas turned off\n"), dev, _(type2name(type))); else - pinfo(_("%s: %s quotas turned on\n"), dev, type2name(type)); + pinfo(_("%s: %s quotas turned on\n"), dev, _(type2name(type))); return 0; } @@ -168,7 +168,7 @@ static int xfs_delete(const char *dev, int type, int flags, int roothack, int xo return 1; } - pinfo(_("%s: deleted %s quota blocks\n"), dev, type2name(type)); + pinfo(_("%s: deleted %s quota blocks\n"), dev, _(type2name(type))); return 0; } diff --git a/quotaops.c b/quotaops.c index 7b2f035..d4699f4 100644 --- a/quotaops.c +++ b/quotaops.c @@ -259,7 +259,7 @@ int writeprivs(struct dquot *qlist, int outfd, char *name, int quotatype) die(1, _("Cannot duplicate descriptor of file to write to: %s\n"), strerror(errno)); fprintf(fd, _("Disk quotas for %s %s (%cid %d):\n"), - type2name(quotatype), name, *type2name(quotatype), qlist->dq_id); + _(type2name(quotatype)), name, *type2name(quotatype), qlist->dq_id); fprintf(fd, _(" Filesystem blocks soft hard inodes soft hard\n")); @@ -384,7 +384,7 @@ int writeindividualtimes(struct dquot *qlist, int outfd, char *name, int quotaty die(1, _("Cannot duplicate descriptor of file to write to: %s\n"), strerror(errno)); fprintf(fd, _("Times to enforce softlimit for %s %s (%cid %d):\n"), - type2name(quotatype), name, *type2name(quotatype), qlist->dq_id); + _(type2name(quotatype)), name, *type2name(quotatype), qlist->dq_id); fprintf(fd, _("Time units may be: days, hours, minutes, or seconds\n")); fprintf(fd, _(" Filesystem block grace inode grace\n")); @@ -486,7 +486,7 @@ int writetimes(struct quota_handle **handles, int outfd) die(1, _("Cannot duplicate descriptor of file to edit: %s\n"), strerror(errno)); fprintf(fd, _("Grace period before enforcing soft limits for %ss:\n"), - type2name(handles[0]->qh_type)); + _(type2name(handles[0]->qh_type))); fprintf(fd, _("Time units may be: days, hours, minutes, or seconds\n")); fprintf(fd, _(" Filesystem Block grace period Inode grace period\n")); diff --git a/quotasync.c b/quotasync.c index a9e2dda..dd8ade9 100644 --- a/quotasync.c +++ b/quotasync.c @@ -86,7 +86,7 @@ static int syncquotas(int type) if (flags & FL_ALL) { if (sync_one(type, NULL) < 0) - errstr(_("%s quota sync failed: %s\n"), type2name(type), + errstr(_("%s quota sync failed: %s\n"), _(type2name(type)), strerror(errno)); return -1; } @@ -98,7 +98,7 @@ static int syncquotas(int type) h = handles[i]; if (sync_one(type, h->qh_quotadev)) { errstr(_("%s quota sync failed for %s: %s\n"), - type2name(type), h->qh_quotadev, strerror(errno)); + _(type2name(type)), h->qh_quotadev, strerror(errno)); ret = -1; } } diff --git a/repquota.c b/repquota.c index 8436e66..43de31d 100644 --- a/repquota.c +++ b/repquota.c @@ -293,7 +293,7 @@ static void report_it(struct quota_handle *h, int type) else spacehdr = _("Block"); - printf(_("*** Report for %s quotas on device %s\n"), type2name(type), h->qh_quotadev); + printf(_("*** Report for %s quotas on device %s\n"), _(type2name(type)), h->qh_quotadev); time2str(h->qh_info.dqi_bgrace, bgbuf, TF_ROUND); time2str(h->qh_info.dqi_igrace, igbuf, TF_ROUND); printf(_("Block grace time: %s; Inode grace time: %s\n"), bgbuf, igbuf); diff --git a/rquota_svc.c b/rquota_svc.c index 17a92f4..338b70f 100644 --- a/rquota_svc.c +++ b/rquota_svc.c @@ -455,26 +455,26 @@ int main(int argc, char **argv) exit(1); } if (!svc_register(transp, RQUOTAPROG, RQUOTAVERS, rquotaprog_1, IPPROTO_UDP)) { - errstr(_("unable to register (RQUOTAPROG, RQUOTAVERS, udp).\n")); + errstr(_("unable to register (RQUOTAPROG, RQUOTAVERS, UDP).\n")); exit(1); } if (!svc_register(transp, RQUOTAPROG, EXT_RQUOTAVERS, rquotaprog_2, IPPROTO_UDP)) { - errstr(_("unable to register (RQUOTAPROG, EXT_RQUOTAVERS, udp).\n")); + errstr(_("unable to register (RQUOTAPROG, EXT_RQUOTAVERS, UDP).\n")); exit(1); } sock = svctcp_socket(RQUOTAPROG, port, 1); transp = svctcp_create(sock == -1 ? RPC_ANYSOCK : sock, 0, 0); if (transp == NULL) { - errstr(_("cannot create tcp service.\n")); + errstr(_("cannot create TCP service.\n")); exit(1); } if (!svc_register(transp, RQUOTAPROG, RQUOTAVERS, rquotaprog_1, IPPROTO_TCP)) { - errstr(_("unable to register (RQUOTAPROG, RQUOTAVERS, tcp).\n")); + errstr(_("unable to register (RQUOTAPROG, RQUOTAVERS, TCP).\n")); exit(1); } if (!svc_register(transp, RQUOTAPROG, EXT_RQUOTAVERS, rquotaprog_2, IPPROTO_TCP)) { - errstr(_("unable to register (RQUOTAPROG, EXT_RQUOTAVERS, tcp).\n")); + errstr(_("unable to register (RQUOTAPROG, EXT_RQUOTAVERS, TCP).\n")); exit(1); } diff --git a/setquota.c b/setquota.c index 905c788..f609dc7 100644 --- a/setquota.c +++ b/setquota.c @@ -409,7 +409,7 @@ static int setindivgraces(struct quota_handle **handles) errstr(_("Not setting inode grace time on %s because softlimit is not exceeded.\n"), q->dq_h->qh_quotadev); } if (putprivs(curprivs, COMMIT_TIMES) == -1) { - errstr(_("cannot write times for %s. Maybe kernel does not support such operation?\n"), type2name(flags & FL_USER ? USRQUOTA : GRPQUOTA)); + errstr(_("cannot write times for %s. Maybe kernel does not support such operation?\n"), _(type2name(flags & FL_USER ? USRQUOTA : GRPQUOTA))); ret = -1; } freeprivs(curprivs); -- cgit v1.2.1