Fix more spelling errors found by translators and add pluralization

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

4 files changed, 18 insertions, 7 deletions

diff --git a/misc/fsck.c b/misc/fsck.c
index 9700f18c..13cfa57b 100644
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -366,7 +366,8 @@ static void load_fs_info(const char *filename)
 	fclose(f);
 
 	if (old_fstab && filesys_info) {
-		fputs(_("\007\007\007"
+		fputs("\007\007\007", stderr);
+		fputs(_(
 		"WARNING: Your /etc/fstab does not contain the fsck passno\n"
 		"	field.  I will kludge around things for you, but you\n"
 		"	should fix your /etc/fstab file as soon as you can.\n\n"), stderr);
diff --git a/misc/nls-enable.h b/misc/nls-enable.h
index e365fbdd..a91dcc13 100644
--- a/misc/nls-enable.h
+++ b/misc/nls-enable.h
@@ -7,6 +7,7 @@
 #else
 #define N_(a) (a)
 #endif
+#define P_(singular, plural, n) (ngettext (singular, plural, n))
 #ifndef NLS_CAT_NAME
 #define NLS_CAT_NAME "e2fsprogs"
 #endif
@@ -16,4 +17,5 @@
 #else
 #define _(a) (a)
 #define N_(a) a
+#define P_(singular, plural, n) ((n) == 1 ? (singular) : (plural))
 #endif
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 36368fb9..5c44607b 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -1164,8 +1164,11 @@ static int parse_extended_opts(ext2_filsys fs, const char *opts)
 				r_usage++;
 				continue;
 			}
-			printf(_("Setting multiple mount protection update "
-				 "interval to %lu seconds\n"), interval);
+			printf(P_("Setting multiple mount protection update "
+				  "interval to %lu second\n",
+				  "Setting multiple mount protection update "
+				  "interval to %lu seconds\n", interval),
+			       interval);
 			fs->super->s_mmp_update_interval = interval;
 			ext2fs_mark_super_dirty(fs);
 		} else if (!strcmp(token, "test_fs")) {
@@ -1709,7 +1712,7 @@ static int resize_inode(ext2_filsys fs, unsigned long new_size)
 	}
 	retval = ext2fs_read_block_bitmap(fs);
 	if (retval) {
-		fputs(_("Failed to read blockbitmap\n"), stderr);
+		fputs(_("Failed to read block bitmap\n"), stderr);
 		return retval;
 	}
 	INIT_LIST_HEAD(&blk_move_list);
diff --git a/misc/uuidd.c b/misc/uuidd.c
index 37e031a5..2e255ba1 100644
--- a/misc/uuidd.c
+++ b/misc/uuidd.c
@@ -396,8 +396,11 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 			uuid__generate_time(uu, &num);
 			if (debug) {
 				uuid_unparse(uu, str);
-				printf(_("Generated time UUID %s and %d "
-					 "following\n"), str, num);
+				printf(P_("Generated time UUID %s and "
+					  "subsequent UUID\n",
+					  "Generated time UUID %s and %d "
+					  "subsequent UUIDs\n", num),
+				       str, num);
 			}
 			memcpy(reply_buf, uu, sizeof(uu));
 			reply_len = sizeof(uu);
@@ -537,7 +540,9 @@ int main(int argc, char **argv)
 
 			uuid_unparse((unsigned char *) buf, str);
 
-			printf(_("%s and subsequent %d UUID's\n"), str, num);
+			printf(P_("%s and subsequent UUID\n",
+				  "%s and subsequent %d UUIDs\n", num),
+			       str, num);
 		} else {
 			printf(_("List of UUID's:\n"));
 			cp = buf + 4;