Typo fixes, message changes for easier i18n

Signed-off-by: Jan Kara <jack@suse.cz>

8 files changed, 40 insertions, 38 deletions

diff --git a/convertquota.c b/convertquota.c
index 7df948e..efaee71 100644
--- a/convertquota.c
+++ b/convertquota.c
@@ -314,12 +314,12 @@ static int convert_format(int type, struct mount_entry *mnt)
 	
 	if (!(qo = init_io(mnt, type, infmt, IOI_INITSCAN))) {
 		errstr(_("Cannot open old format file for %ss on %s\n"),
-			type2name(type), mnt->me_dir);
+			_(type2name(type)), mnt->me_dir);
 		return -1;
 	}
 	if (!(qn = new_io(mnt, type, outfmt))) {
 		errstr(_("Cannot create file for %ss for new format on %s: %s\n"),
-			type2name(type), mnt->me_dir, strerror(errno));
+			_(type2name(type)), mnt->me_dir, strerror(errno));
 		end_io(qo);
 		return -1;
 	}
diff --git a/quota.c b/quota.c
index a154f21..56e71a8 100644
--- a/quota.c
+++ b/quota.c
@@ -121,7 +121,7 @@ static void heading(int type, qid_t id, char *name, char *tag)
 	else
 		spacehdr = _("blocks");
 
-	printf(_("Disk quotas for %s %s (%cid %u): %s\n"), type2name(type),
+	printf(_("Disk quotas for %s %s (%cid %u): %s\n"), _(type2name(type)),
 	       name, *type2name(type), (uint) id, tag);
 	if (!(flags & FL_QUIET) && !tag[0]) {
 		printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n", _("Filesystem"),
diff --git a/quotacheck.c b/quotacheck.c
index 2da562b..d8cbe87 100644
--- a/quotacheck.c
+++ b/quotacheck.c
@@ -125,7 +125,7 @@ static int store_dlinks(int type, ino_t i_num)
 	struct dlinks *lptr;
 	uint hash = hash_ino(i_num);
 
-	debug(FL_DEBUG, _("Adding hardlink for ino %llu\n"), (unsigned long long)i_num);
+	debug(FL_DEBUG, _("Adding hardlink for inode %llu\n"), (unsigned long long)i_num);
 
 	for (lptr = links_hash[type][hash]; lptr; lptr = lptr->next)
 		if (lptr->i_num == i_num)
@@ -432,12 +432,12 @@ static int ext2_direct_scan(const char *device)
 	}
 
 	if ((error = ext2fs_allocate_inode_bitmap(fs, "in-use inode map", &inode_used_map))) {
-		errstr(_("error (%d) while allocating inode file bitmap\n"), (int)error);
+		errstr(_("error (%d) while allocating file inode bitmap\n"), (int)error);
 		return -1;
 	}
 
 	if ((error = ext2fs_allocate_inode_bitmap(fs, "directory inode map", &inode_dir_map))) {
-		errstr(_("errstr (%d) while allocating inode directory bitmap\n"), (int)error);
+		errstr(_("errstr (%d) while allocating directory inode bitmap\n"), (int)error);
 		return -1;
 	}
 
@@ -525,7 +525,7 @@ static int scan_dir(const char *pathname)
 			blit(NULL);
 
 		if ((lstat(de->d_name, &st)) == -1) {
-			errstr(_("lstat Cannot stat `%s/%s': %s\nGuess you'd better run fsck first !\nexiting...\n"),
+			errstr(_("lstat: Cannot stat `%s/%s': %s\nGuess you'd better run fsck first !\nexiting...\n"),
 				pathname, de->d_name, strerror(errno));
 			goto out;
 		}
@@ -618,14 +618,14 @@ static int process_file(struct mount_entry *mnt, int type)
 	char *qfname = NULL;
 	int fd = -1, ret;
 
-	debug(FL_DEBUG, _("Going to check %s quota file of %s\n"), type2name(type),
+	debug(FL_DEBUG, _("Going to check %s quota file of %s\n"), _(type2name(type)),
 	      mnt->me_dir);
 
 	if (kern_quota_on(mnt, type, cfmt) >= 0) {	/* Is quota enabled? */
 		if (!(flags & FL_FORCE)) {
 			if (flags & FL_INTERACTIVE) {
-				printf(_("Quota for %ss is enabled on mountpoint %s so quotacheck might damage the file.\n"), type2name(type), mnt->me_dir);
-				if (!ask_yn(_("Should I continue"), 0)) {
+				printf(_("Quota for %ss is enabled on mountpoint %s so quotacheck might damage the file.\n"), _(type2name(type)), mnt->me_dir);
+				if (!ask_yn(_("Should I continue?"), 0)) {
 					printf(_("As you wish... Canceling check of this file.\n"));
 					return -1;
 				}
@@ -788,7 +788,7 @@ static int dump_to_file(struct mount_entry *mnt, int type)
 	struct quota_handle *h;
 	unsigned int commit = 0;
 
-	debug(FL_DEBUG, _("Dumping gathered data for %ss.\n"), type2name(type));
+	debug(FL_DEBUG, _("Dumping gathered data for %ss.\n"), _(type2name(type)));
 	if (cfmt == QF_XFS) {
 		if (!(h = init_io(mnt, type, cfmt, IOI_READONLY))) {
 			errstr(_("Cannot initialize IO on xfs/gfs2 quotafile: %s\n"),
@@ -832,12 +832,12 @@ static int dump_to_file(struct mount_entry *mnt, int type)
 		char *filename;
 
 		if (get_qf_name(mnt, type, cfmt, NF_FORMAT, &filename) < 0)
-			errstr(_("Cannot find checked quota file for %ss on %s!\n"), type2name(type), mnt->me_devname);
+			errstr(_("Cannot find checked quota file for %ss on %s!\n"), _(type2name(type)), mnt->me_devname);
 		else {
 			if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_QUOTAOFF : Q_6_5_QUOTAOFF, type),
 				     mnt->me_devname, 0, NULL) < 0)
 				errstr(_("Cannot turn %s quotas off on %s: %s\nKernel won't know about changes quotacheck did.\n"),
-					type2name(type), mnt->me_devname, strerror(errno));
+					_(type2name(type)), mnt->me_devname, strerror(errno));
 			else {
 				int ret;
 
@@ -850,7 +850,7 @@ static int dump_to_file(struct mount_entry *mnt, int type)
 					ret = quotactl(QCMD(Q_6_5_QUOTAON, type), mnt->me_devname, 0, filename);
 				if (ret < 0)
 					errstr(_("Cannot turn %s quotas on on %s: %s\nKernel won't know about changes quotacheck did.\n"),
-						type2name(type), mnt->me_devname, strerror(errno));
+						_(type2name(type)), mnt->me_devname, strerror(errno));
 			}
 			free(filename);
 		}
@@ -871,14 +871,14 @@ static int sub_quota_file(struct mount_entry *mnt, int qtype, int ftype)
 	struct dquot *d;
 	qid_t id;
 
-	debug(FL_DEBUG, _("Substracting space used by old %s quota file.\n"), type2name(ftype));
+	debug(FL_DEBUG, _("Substracting space used by old %s quota file.\n"), _(type2name(ftype)));
 	if (get_qf_name(mnt, ftype, cfmt, 0, &filename) < 0) {
-		debug(FL_VERBOSE, _("Old %s file name could not been determined. Usage will not be substracted.\n"), type2name(ftype));
+		debug(FL_VERBOSE, _("Old %s file name could not been determined. Usage will not be substracted.\n"), _(type2name(ftype)));
 		return 0;
 	}
 
 	if (stat(filename, &st) < 0) {
-		debug(FL_VERBOSE, _("Cannot stat old %s quota file %s: %s. Usage will not be substracted.\n"), type2name(ftype), filename, strerror(errno));
+		debug(FL_VERBOSE, _("Cannot stat old %s quota file %s: %s. Usage will not be substracted.\n"), _(type2name(ftype)), filename, strerror(errno));
 		free(filename);
 		return 0;
 	}
@@ -890,7 +890,7 @@ static int sub_quota_file(struct mount_entry *mnt, int qtype, int ftype)
 	else
 		id = st.st_gid;
 	if ((d = lookup_dquot(id, qtype)) == NODQUOT) {
-		errstr(_("Quota structure for %s owning quota file not present! Something is really wrong...\n"), type2name(qtype));
+		errstr(_("Quota structure for %s owning quota file not present! Something is really wrong...\n"), _(type2name(qtype)));
 		return -1;
 	}
 	d->dq_dqb.dqb_curinodes--;
@@ -936,7 +936,7 @@ static int check_dir(struct mount_entry *mnt)
 		     NULL) < 0 && !(flags & FL_FORCEREMOUNT)) {
 			if (flags & FL_INTERACTIVE) {
 				printf(_("Cannot remount filesystem mounted on %s read-only. Counted values might not be right.\n"), mnt->me_dir);
-				if (!ask_yn(_("Should I continue"), 0)) {
+				if (!ask_yn(_("Should I continue?"), 0)) {
 					printf(_("As you wish... Canceling check of this file.\n"));
 					failed = -1;
 					goto out;
diff --git a/quotacheck_v2.c b/quotacheck_v2.c
index 77afde3..c85cba0 100644
--- a/quotacheck_v2.c
+++ b/quotacheck_v2.c
@@ -193,7 +193,7 @@ static int buffer_entry(dqbuf_t buf, uint blk, int *corrupted, uint * lblk, int
 					(long long)fdq->dqb_bsoftlimit, (long long)mdq.dqb_bsoftlimit,
 					(long long)fdq->dqb_ihardlimit, (long long)mdq.dqb_ihardlimit,
 					(long long)fdq->dqb_isoftlimit, (long long)mdq.dqb_isoftlimit);
-				if (ask_yn(_("Should I use new values"), 0)) {
+				if (ask_yn(_("Should I use new values?"), 0)) {
 					fdq->dqb_bhardlimit = mdq.dqb_bhardlimit;
 					fdq->dqb_bsoftlimit = mdq.dqb_bsoftlimit;
 					fdq->dqb_ihardlimit = mdq.dqb_ihardlimit;
diff --git a/quotaon.c b/quotaon.c
index a8e780f..0c82893 100644
--- a/quotaon.c
+++ b/quotaon.c
@@ -65,7 +65,7 @@ static void usage(void)
 {
 	errstr(_("Usage:\n\t%s [-guvp] [-F quotaformat] [-x state] -a\n\
 \t%s [-guvp] [-F quotaformat] [-x state] filesys ...\n\n\
--a, --all                turn quotas %s for all filesystems\n\
+-a, --all                %s\n\
 -f, --off                turn quotas off\n\
 -u, --user               operate on user quotas\n\
 -g, --group              operate on group quotas\n\
@@ -75,7 +75,9 @@ static void usage(void)
 -v, --verbose            print more messages\n\
 -h, --help               display this help text and exit\n\
 -V, --version            display version information and exit\n"),
- progname, progname, strcmp(progname, "quotaon") ? _("off") : _("on"));
+ progname, progname,
+ strcmp(progname, "quotaon") ? _("turn quotas off for all filesystems") :
+			       _("turn quotas on for all filesystems"));
 	exit(1);
 }
 
diff --git a/set_limits_example.c b/set_limits_example.c
index 4147bba..99a1b21 100644
--- a/set_limits_example.c
+++ b/set_limits_example.c
@@ -30,7 +30,7 @@ static int copy_user_quota_limits(const char *block_device, uid_t from, uid_t to
 	}
 }
 
-static int copy_group_quota_limits(const char *block_device, gid_t from, gid_t to)
+tatic int copy_group_quota_limits(const char *block_device, gid_t from, gid_t to)
 {
 	struct dqblk dq;
 
@@ -40,14 +40,14 @@ static int copy_group_quota_limits(const char *block_device, gid_t from, gid_t t
 		}
 		else {
 			errstr(
-				_("copy_group_quota_limits: Failed to set groupquota for uid %ld : %s\n"),
+				_("copy_group_quota_limits: Failed to set groupquota for gid %ld : %s\n"),
 				to, strerror(errno));
 			return (1);
 		}
 	}
 	else {
 		errstr(
-			_("copy_group_quota_limits: Failed to get groupquota for uid %ld : %s\n"),
+			_("copy_group_quota_limits: Failed to get groupquota for gid %ld : %s\n"),
 			from, strerror(errno));
 		return (1);
 	}
diff --git a/setquota.c b/setquota.c
index 57bd580..905c788 100644
--- a/setquota.c
+++ b/setquota.c
@@ -87,7 +87,7 @@ static qsize_t parse_unum(char *str, char *msg)
 	qsize_t ret = strtoull(str, &errch, 0);
 
 	if (*errch) {
-		errstr(_("Bad %s: %s\n"), msg, str);
+		errstr(_("%s: %s\n"), msg, str);
 		usage();
 	}
 	return ret;
@@ -226,17 +226,17 @@ static void parse_options(int argcnt, char **argstr)
 	if (!(flags & (FL_GRACE | FL_BATCH))) {
 		id = name2id(argstr[optind++], flag2type(flags), !!(flags & FL_NUMNAMES), NULL);
 		if (!(flags & (FL_GRACE | FL_INDIVIDUAL_GRACE | FL_PROTO))) {
-			toset.dqb_bsoftlimit = parse_unum(argstr[optind++], _("block softlimit"));
-			toset.dqb_bhardlimit = parse_unum(argstr[optind++], _("block hardlimit"));
-			toset.dqb_isoftlimit = parse_unum(argstr[optind++], _("inode softlimit"));
-			toset.dqb_ihardlimit = parse_unum(argstr[optind++], _("inode hardlimit"));
+			toset.dqb_bsoftlimit = parse_unum(argstr[optind++], _("Bad block softlimit"));
+			toset.dqb_bhardlimit = parse_unum(argstr[optind++], _("Bad block hardlimit"));
+			toset.dqb_isoftlimit = parse_unum(argstr[optind++], _("Bad inode softlimit"));
+			toset.dqb_ihardlimit = parse_unum(argstr[optind++], _("Bad inode hardlimit"));
 		}
 		else if (flags & FL_PROTO)
 			protoid = name2id(protoname, flag2type(flags), !!(flags & FL_NUMNAMES), NULL);
 	}
 	if (flags & FL_GRACE) {
-		toset.dqb_btime = parse_unum(argstr[optind++], _("block grace time"));
-		toset.dqb_itime = parse_unum(argstr[optind++], _("inode grace time"));
+		toset.dqb_btime = parse_unum(argstr[optind++], _("Bad block grace time"));
+		toset.dqb_itime = parse_unum(argstr[optind++], _("Bad inode grace time"));
 	}
 	else if (flags & FL_INDIVIDUAL_GRACE) {
 		time_t now;
@@ -247,13 +247,13 @@ static void parse_options(int argcnt, char **argstr)
 			optind++;
 		}
 		else
-			toset.dqb_btime = now + parse_unum(argstr[optind++], _("block grace time"));
+			toset.dqb_btime = now + parse_unum(argstr[optind++], _("Bad block grace time"));
 		if (!strcmp(argstr[optind], _("unset"))) {
 			toset.dqb_itime = 0;
 			optind++;
 		}
 		else
-			toset.dqb_itime = now + parse_unum(argstr[optind++], _("inode grace time"));
+			toset.dqb_itime = now + parse_unum(argstr[optind++], _("Bad inode grace time"));
 	}
 	if (!(flags & FL_ALL)) {
 		mntcnt = argcnt - optind;
diff --git a/warnquota.c b/warnquota.c
index 3b81909..08827f2 100644
--- a/warnquota.c
+++ b/warnquota.c
@@ -327,7 +327,7 @@ static FILE *run_mailer(char *command)
 		default:
 			close(pipefd[0]);
 			if (!(f = fdopen(pipefd[1], "w")))
-				errstr(_("Cannot open pine: %s\n"), strerror(errno));
+				errstr(_("Cannot open pipe: %s\n"), strerror(errno));
 			return f;
 	}
 }
@@ -439,12 +439,12 @@ static int mail_user(struct offenderlist *offender, struct configparams *config)
 				cnt = ldap_count_entries(ldapconn, result);
 
 				if(cnt > 1) {
-					errstr(_("Multiple entries found for client %s, %d not sending mail.\n"), 
+					errstr(_("Multiple entries found for client %s (%d). Not sending mail.\n"), 
 						offender->offender_name, cnt);
 					return 0;
 				} else if(cnt == 0) {
-					errstr(_("Entry not found for client %s, %d not sending mail.\n"), 
-						offender->offender_name, cnt);
+					errstr(_("Entry not found for client %s. Not sending mail.\n"), 
+						offender->offender_name);
 					return 0;
 				} else {
 					/* get the attr */