Fix more spelling errors found by translators and add pluralization

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

e2fsck/prof_err.et

@@ -15,7 +15,7 @@ error_code	PROF_SECTION_WITH_VALUE,
 error_code	PROF_BAD_LINK_LIST, 	"Bad linked list in profile structures"
 error_code	PROF_BAD_GROUP_LVL, 	"Bad group level in profile structures"
 error_code	PROF_BAD_PARENT_PTR, 	
-	"Bad parent pointer in profile strctures"
+	"Bad parent pointer in profile structures"
 error_code	PROF_MAGIC_ITERATOR,	"Bad magic value in profile iterator"
 error_code	PROF_SET_SECTION_VALUE,	"Can't set value on section node"
 error_code	PROF_EINVAL,		"Invalid argument passed to profile library"

e2fsck/unix.c

@@ -231,9 +231,11 @@ static void check_mount(e2fsck_t ctx)
 	printf(_("%s is mounted.  "), ctx->filesystem_name);
 	if (!ctx->interactive)
 		fatal_error(ctx, _("Cannot continue, aborting.\n\n"));
-	printf(_("\n\n\007\007\007\007WARNING!!!  "
+	puts("\007\007\007\007");
+	printf(_("\n\nWARNING!!!  "
 	       "The filesystem is mounted.   If you continue you ***WILL***\n"
-	       "cause ***SEVERE*** filesystem damage.\007\007\007\n\n"));
+	       "cause ***SEVERE*** filesystem damage.\n\n"));
+	puts("\007\007\007");
 	cont = ask_yn(_("Do you really want to continue"), 0);
 	if (!cont) {
 		printf (_("check aborted.\n"));

lib/ext2fs/ext2_err.et.in

@@ -120,7 +120,7 @@ ec	EXT2_ET_SHORT_READ,
 	"Attempt to read block from filesystem resulted in short read"
 
 ec	EXT2_ET_SHORT_WRITE,
-	"Attempt to write block from filesystem resulted in short write"
+	"Attempt to write block to filesystem resulted in short write"
 
 ec	EXT2_ET_DIR_NO_SPACE,
 	"No free space in the directory"
@@ -294,7 +294,7 @@ ec	EXT2_ET_RESIZE_INODE_CORRUPT,
 	"Resize inode is corrupt"
 
 ec	EXT2_ET_SET_BMAP_NO_IND,
-	"Missing indirect block not present"
+	"Tried to set block bmap with missing indirect block"
 
 ec	EXT2_ET_TDB_SUCCESS,
 	"TDB: Success"

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);

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

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 "
+			printf(P_("Setting multiple mount protection update "
-				 "interval to %lu seconds\n"), interval);
+				  "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);

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 "
+				printf(P_("Generated time UUID %s and "
-					 "following\n"), str, num);
+					  "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;

po/Makevars

@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

resize/online.c

@@ -90,7 +90,8 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
 	if ((ext2fs_blocks_count(sb) > MAX_32_NUM) ||
 	    (*new_size > MAX_32_NUM)) {
 		com_err(program_name, 0,
-			_("Kernel does not resizing a file system this large"));
+			_("Kernel does not support resizing a file system "
+			  "this large"));
 		exit(1);
 	}
 	size = ext2fs_blocks_count(sb);