e2fsck: add xgettext:no-c-format tags

The xgettext program is incorrectly marking e2fsck problem
descriptions as being c-style printf strings.  Override its mistakes.

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

1 files changed, 105 insertions, 0 deletions

diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 75b49ba3f..c45c6b785 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -167,6 +167,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Relocate hint */
 	{ PR_0_RELOCATE_HINT,
+	  /* xgettext:no-c-format */
 	  N_("Note: if several inode or block bitmap blocks or part\n"
 	  "of the inode table require relocation, you may wish to try\n"
 	  "running e2fsck with the '-b %S' option first.  The problem\n"
@@ -181,6 +182,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error determining physical device size of filesystem */
 	{ PR_0_GETSIZE_ERROR,
+	  /* xgettext:no-c-format */
 	  N_("Error determining size of the physical @v: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
@@ -195,6 +197,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Superblock has an invalid journal (inode inum) */
 	{ PR_0_JOURNAL_BAD_INODE,
+	  /* xgettext:no-c-format */
 	  N_("@S has an @n @j (@i %i).\n"),
 	  PROMPT_CLEAR, PR_PREEN_OK, 0, 0, 0 },
 
@@ -274,11 +277,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Illegal orphan inode in superblock */
 	{ PR_0_ORPHAN_ILLEGAL_HEAD_INODE,
+	  /* xgettext:no-c-format */
 	  N_("@I @o @i %i in @S.\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Illegal inode in orphaned inode list */
 	{ PR_0_ORPHAN_ILLEGAL_INODE,
+	  /* xgettext:no-c-format */
 	  N_("@I @i %i in @o @i list.\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -299,11 +304,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Moving journal from /file to hidden inode */
 	{ PR_0_MOVE_JOURNAL,
+	  /* xgettext:no-c-format */
 	  N_("Moving @j from /%s to hidden @i.\n\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Error moving journal to hidden file */
 	{ PR_0_ERR_MOVE_JOURNAL,
+	  /* xgettext:no-c-format */
 	  N_("Error moving @j: %m\n\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -357,6 +364,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Superblock hint for external superblock should be xxxx */
 	{ PR_0_EXTERNAL_JOURNAL_HINT,
+	  /* xgettext:no-c-format */
 	  N_("@S hint for external superblock @s %X.  "),
 	     PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
@@ -372,6 +380,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* group descriptor N marked uninitialized without feature set. */
 	{ PR_0_GDT_UNINIT,
+	  /* xgettext:no-c-format */
 	  N_("@g descriptor %g marked uninitialized without feature set.\n"),
 	     PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
@@ -387,6 +396,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Journal transaction was corrupt, replay was aborted */
 	{ PR_0_JNL_TXN_CORRUPT,
+	  /* xgettext:no-c-format */
 	  N_("Journal transaction %i was corrupt, replay was aborted.\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -439,11 +449,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Opening file system failed */
 	{ PR_0_OPEN_FAILED,
+	  /* xgettext:no-c-format */
 	  N_("ext2fs_open2: %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Checking group descriptor failed */
 	{ PR_0_CHECK_DESC_FAILED,
+	  /* xgettext:no-c-format */
 	  N_("ext2fs_check_desc: %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -481,6 +493,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error initializing quota context */
 	{ PR_0_QUOTA_INIT_CTX,
+	  /* xgettext:no-c-format */
 	  N_("Error initializing quota context in support library: %m\n"),
 	  PROMPT_NULL, PR_FATAL, 0, 0, 0 },
 
@@ -533,16 +546,19 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Deleted inode inum has zero dtime */
 	{ PR_1_ZERO_DTIME,
+	  /* xgettext:no-c-format */
 	  N_("@D @i %i has zero dtime.  "),
 	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
 	/* Inode inum is in use, but has dtime set */
 	{ PR_1_SET_DTIME,
+	  /* xgettext:no-c-format */
 	  N_("@i %i is in use, but has dtime set.  "),
 	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
 	/* Inode inum is a zero-length directory */
 	{ PR_1_ZERO_LENGTH_DIR,
+	  /* xgettext:no-c-format */
 	  N_("@i %i is a @z @d.  "),
 	  PROMPT_CLEAR, PR_PREEN_OK, 0, 0, 0 },
 
@@ -593,11 +609,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Inode has illegal blocks (latch question) */
 	{ PR_1_INODE_BLOCK_LATCH,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has illegal @b(s).  "),
 	  PROMPT_CLEAR, 0, 0, 0, 0 },
 
 	/* Too many illegal blocks in inode */
 	{ PR_1_TOO_MANY_BAD_BLOCKS,
+	  /* xgettext:no-c-format */
 	  N_("Too many illegal @bs in @i %i.\n"),
 	  PROMPT_CLEAR_INODE, PR_NO_OK, 0, 0, 0 },
 
@@ -675,6 +693,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Allocating block buffer for relocating process */
 	{ PR_1_RELOC_MEMORY_ALLOCATE,
+	  /* xgettext:no-c-format */
 	  N_("@A @b buffer for relocating %s\n"),
 	  PROMPT_NONE, PR_PREEN_OK, 0, 0, 0 },
 
@@ -685,6 +704,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Relocating group number's information to X */
 	{ PR_1_RELOC_TO,
+	  /* xgettext:no-c-format */
 	  N_("Relocating @g %g's %s to %c...\n"), /* xgettext:no-c-format */
 	  PROMPT_NONE, PR_PREEN_OK, 0, 0, 0 },
 
@@ -710,21 +730,25 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error allocating icount link information */
 	{ PR_1_ALLOCATE_ICOUNT,
+	  /* xgettext:no-c-format */
 	  N_("@A icount link information: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
 	/* Error allocating directory block array */
 	{ PR_1_ALLOCATE_DBCOUNT,
+	  /* xgettext:no-c-format */
 	  N_("@A @d @b array: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
 	/* Error while scanning inodes */
 	{ PR_1_ISCAN_ERROR,
+	  /* xgettext:no-c-format */
 	  N_("Error while scanning @is (%i): %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
 	/* Error while iterating over blocks in inode */
 	{ PR_1_BLOCK_ITERATE,
+	  /* xgettext:no-c-format */
 	  N_("Error while iterating over @bs in @i %i: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
@@ -741,6 +765,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error reading inode (for clearing) */
 	{ PR_1_READ_INODE,
+	  /* xgettext:no-c-format */
 	  N_("Error reading @i %i: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
@@ -749,17 +774,20 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Imagic number has imagic flag set when fs doesn't support it */
 	{ PR_1_SET_IMAGIC,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has imagic flag set.  "),
 	  PROMPT_CLEAR, 0, 0, 0, 0 },
 
 	/* Immutable flag set on a device or socket inode */
 	{ PR_1_SET_IMMUTABLE,
+	  /* xgettext:no-c-format */
 	  N_("Special (@v/socket/fifo/symlink) file (@i %i) has immutable\n"
 	     "or append-only flag set.  "),
 	  PROMPT_CLEAR, PR_PREEN_OK | PR_PREEN_NO | PR_NO_OK, 0, 0, 0 },
 
 	/* Non-zero size for device, fifo or socket inode */
 	{ PR_1_SET_NONZSIZE,
+	  /* xgettext:no-c-format */
 	  N_("Special (@v/socket/fifo) @i %i has non-zero size.  "),
 	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
@@ -780,6 +808,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Inode that was part of the orphan list */
 	{ PR_1_LOW_DTIME,
+	  /* xgettext:no-c-format */
 	  N_("@i %i was part of the @o @i list.  "),
 	  PROMPT_FIX, PR_LATCH_LOW_DTIME, 0, 0, 0 },
 
@@ -846,6 +875,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Inode number is too big (latch question) */
 	{ PR_1_INODE_TOOBIG,
+	  /* xgettext:no-c-format */
 	  N_("@i %i is too big.  "), PROMPT_TRUNCATE, 0, 0, 0, 0 },
 
 	/* Problem causes directory to be too big */
@@ -865,16 +895,19 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Inode has INDEX_FL flag set on filesystem without htree support  */
 	{ PR_1_HTREE_SET,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has INDEX_FL flag set on @f without htree support.\n"),
 	  PROMPT_CLEAR_HTREE, PR_PREEN_OK, 0, 0, 0 },
 
 	/* Inode number has INDEX_FL flag set but is on a directory */
 	{ PR_1_HTREE_NODIR,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has INDEX_FL flag set but is not a @d.\n"),
 	  PROMPT_CLEAR_HTREE, PR_PREEN_OK, 0, 0, 0 },
 
 	/* htree directory has an invalid root node */
 	{ PR_1_HTREE_BADROOT,
+	  /* xgettext:no-c-format */
 	  N_("@h %i has an @n root node.\n"),
 	  PROMPT_CLEAR_HTREE, PR_PREEN_OK, 0, 0, 0 },
 
@@ -885,6 +918,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Htree directory uses an Incompatible htree root node flag */
 	{ PR_1_HTREE_INCOMPAT,
+	  /* xgettext:no-c-format */
 	  N_("@h %i uses an incompatible htree root node flag.\n"),
 	  PROMPT_CLEAR_HTREE, PR_PREEN_OK, 0, 0, 0 },
 
@@ -902,6 +936,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Resize inode (re)creation failed */
 	{ PR_1_RESIZE_INODE_CREATE,
+	  /* xgettext:no-c-format */
 	  N_("Resize @i (re)creation failed: %m."),
 	  PROMPT_CONTINUE, 0, 0, 0, 0 },
 
@@ -942,6 +977,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error while reading extent tree in inode */
 	{ PR_1_READ_EXTENT,
+	  /* xgettext:no-c-format */
 	  N_("Error while reading over @x tree in @i %i: %m\n"),
 	  PROMPT_CLEAR_INODE, 0, 0, 0, 0 },
 
@@ -963,21 +999,25 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* inode has EXTENTS_FL flag set on filesystem without extents support*/
 	{ PR_1_EXTENTS_SET,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has EXTENTS_FL flag set on @f without extents support.\n"),
 	  PROMPT_CLEAR, 0, 0, 0, 0 },
 
 	/* inode is in extents format, but superblock is missing EXTENTS feature */
 	{ PR_1_EXTENT_FEATURE,
+	  /* xgettext:no-c-format */
 	  N_("@i %i is in extent format, but @S is missing EXTENTS feature\n"),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
 	/* inode missing EXTENTS_FL, but is an extent inode */
 	{ PR_1_UNSET_EXTENT_FL,
+	  /* xgettext:no-c-format */
 	  N_("@i %i missing EXTENT_FL, but is in extents format\n"),
 	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
 	/* Fast symlink has EXTENTS_FL set */
 	{ PR_1_FAST_SYMLINK_EXTENT_FL,
+	  /* xgettext:no-c-format */
 	  N_("Fast symlink %i has EXTENT_FL set.  "),
 	  PROMPT_CLEAR, 0, 0, 0, 0 },
 
@@ -992,6 +1032,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Failed to convert subcluster block bitmap */
 	{ PR_1_CONVERT_SUBCLUSTER,
+	  /* xgettext:no-c-format */
 	  N_("Error converting subcluster @b @B: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
@@ -1022,16 +1063,19 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* inode seems to contain garbage */
 	{ PR_1_INODE_IS_GARBAGE,
+	  /* xgettext:no-c-format */
 	  N_("@i %i seems to contain garbage.  "),
 	  PROMPT_CLEAR, 0, 0, 0, 0 },
 
 	/* inode passes checks, but checksum does not match inode */
 	{ PR_1_INODE_ONLY_CSUM_INVALID,
+	  /* xgettext:no-c-format */
 	  N_("@i %i passes checks, but checksum does not match @i.  "),
 	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
 	/* Inode extended attribute is corrupt (allocation collision) */
 	{ PR_1_INODE_EA_ALLOC_COLLISION,
+	  /* xgettext:no-c-format */
 	  N_("@i %i @a is corrupt (allocation collision).  "),
 	  PROMPT_CLEAR, 0, 0, 0, 0},
 
@@ -1065,11 +1109,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Inode has inline data, but superblock is missing INLINE_DATA feature */
 	{ PR_1_INLINE_DATA_FEATURE,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has inline data, but @S is missing INLINE_DATA feature\n"),
 	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
 	/* inode has INLINE_DATA_FL flag on filesystem without inline data */
 	{ PR_1_INLINE_DATA_SET,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has INLINE_DATA_FL flag on @f without inline data support.\n"),
 	  PROMPT_CLEAR, 0, 0, 0, 0 },
 
@@ -1077,6 +1123,7 @@ static struct e2fsck_problem problem_table[] = {
 	 * Inode block conflicts with critical metadata, skipping block checks
 	 */
 	{ PR_1_CRITICAL_METADATA_COLLISION,
+	  /* xgettext:no-c-format */
 	  N_("@i %i block %b conflicts with critical metadata, skipping block checks.\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -1087,6 +1134,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Extents/inlinedata flag set on a device or socket inode */
 	{ PR_1_UNINIT_DBLOCK,
+	  /* xgettext:no-c-format */
 	  N_("@d @i %i has @x marked uninitialized at @b %c.  "),
 	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
@@ -1097,33 +1145,39 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Inode has INLINE_DATA_FL flag but extended attribute not found */
 	{ PR_1_INLINE_DATA_NO_ATTR,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has INLINE_DATA_FL flag but @a not found.  "),
 	  PROMPT_TRUNCATE, 0, 0, 0, 0 },
 
 	/* Special (device/socket/fifo) file (inode num) has extents
 	 * or inline-data flag set */
 	{ PR_1_SPECIAL_EXTENTS_IDATA,
+	  /* xgettext:no-c-format */
 	  N_("Special (@v/socket/fifo) file (@i %i) has extents\n"
 	     "or inline-data flag set.  "),
 	  PROMPT_CLEAR, PR_PREEN_OK | PR_PREEN_NO | PR_NO_OK, 0, 0, 0 },
 
 	/* Inode has extent header but inline data flag is set */
 	{ PR_1_CLEAR_INLINE_DATA_FOR_EXTENT,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has @x header but inline data flag is set.\n"),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
 	/* Inode seems to have inline data but extent flag is set */
 	{ PR_1_CLEAR_EXTENT_FOR_INLINE_DATA,
+	  /* xgettext:no-c-format */
 	  N_("@i %i seems to have inline data but @x flag is set.\n"),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
 	/* Inode seems to have block map but inline data and extent flags set */
 	{ PR_1_CLEAR_EXTENT_INLINE_DATA_FLAGS,
+	  /* xgettext:no-c-format */
 	  N_("@i %i seems to have @b map but inline data and @x flags set.\n"),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
 	/* Inode has inline data and extent flags but i_block contains junk */
 	{ PR_1_CLEAR_EXTENT_INLINE_DATA_INODE,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has inline data and @x flags set but i_block contains junk.\n"),
 	  PROMPT_CLEAR_INODE, 0, 0, 0, 0 },
 
@@ -1154,16 +1208,19 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* inode num on bigalloc filesystem cannot be block mapped */
 	{ PR_1_NO_BIGALLOC_BLOCKMAP_FILES,
+	  /* xgettext:no-c-format */
 	  N_("@i %i on bigalloc @f cannot be @b mapped.  "),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
 	/* Inode has corrupt extent header */
 	{ PR_1_MISSING_EXTENT_HEADER,
+	  /* xgettext:no-c-format */
 	  N_("@i %i has corrupt @x header.  "),
 	  PROMPT_CLEAR_INODE, 0, 0, 0, 0 },
 
 	/* Timestamp(s) on inode beyond 2310-04-04 are likely pre-1970. */
 	{ PR_1_EA_TIME_OUT_OF_RANGE,
+	  /* xgettext:no-c-format */
 	  N_("Timestamp(s) on @i %i beyond 2310-04-04 are likely pre-1970.\n"),
 	  PROMPT_FIX, PR_PREEN_OK | PR_NO_OK, 0, 0, 0 },
 
@@ -1194,6 +1251,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Duplicate/bad block(s) header */
 	{ PR_1B_DUP_BLOCK_HEADER,
+	  /* xgettext:no-c-format */
 	  N_("@m @b(s) in @i %i:"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -1209,16 +1267,19 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error while scanning inodes */
 	{ PR_1B_ISCAN_ERROR,
+	  /* xgettext:no-c-format */
 	  N_("Error while scanning inodes (%i): %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
 	/* Error allocating inode bitmap */
 	{ PR_1B_ALLOCATE_IBITMAP_ERROR,
+	  /* xgettext:no-c-format */
 	  N_("@A @i @B (@i_dup_map): %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
 	/* Error while iterating over blocks */
 	{ PR_1B_BLOCK_ITERATE,
+	  /* xgettext:no-c-format */
 	  N_("Error while iterating over @bs in @i %i (%s): %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -1279,6 +1340,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Couldn't clone file (error) */
 	{ PR_1D_CLONE_ERROR,
+	  /* xgettext:no-c-format */
 	  N_("Couldn't clone file: %m\n"), PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Pass 1E Extent tree optimization	*/
@@ -1290,6 +1352,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Failed to optimize extent tree */
 	{ PR_1E_OPTIMIZE_EXT_ERR,
+	  /* xgettext:no-c-format */
 	  N_("Failed to optimize @x tree %p (%i): %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -1332,6 +1395,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Bad inode number for '.' */
 	{ PR_2_BAD_INODE_DOT,
+	  /* xgettext:no-c-format */
 	  N_("@n @i number for '.' in @d @i %i.\n"),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
@@ -1372,11 +1436,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Missing '.' in directory inode */
 	{ PR_2_MISSING_DOT,
+	  /* xgettext:no-c-format */
 	  N_("Missing '.' in @d @i %i.\n"),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
 	/* Missing '..' in directory inode */
 	{ PR_2_MISSING_DOT_DOT,
+	  /* xgettext:no-c-format */
 	  N_("Missing '..' in @d @i %i.\n"),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
@@ -1437,11 +1503,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* '.' is not NULL terminated */
 	{ PR_2_DOT_NULL_TERM,
+	  /* xgettext:no-c-format */
 	  N_("'.' @d @e in @d @i %i is not NULL terminated\n"),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
 	/* '..' is not NULL terminated */
 	{ PR_2_DOT_DOT_NULL_TERM,
+	  /* xgettext:no-c-format */
 	  N_("'..' @d @e in @d @i %i is not NULL terminated\n"),
 	  PROMPT_FIX, 0, 0, 0, 0 },
 
@@ -1467,6 +1535,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Internal error: couldn't find dir_info */
 	{ PR_2_NO_DIRINFO,
+	  /* xgettext:no-c-format */
 	  N_("Internal error: couldn't find dir_info for %i.\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
@@ -1477,11 +1546,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error allocating icount structure */
 	{ PR_2_ALLOCATE_ICOUNT,
+	  /* xgettext:no-c-format */
 	  N_("@A icount structure: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
 	/* Error iterating over directory blocks */
 	{ PR_2_DBLIST_ITERATE,
+	  /* xgettext:no-c-format */
 	  N_("Error iterating over @d @bs: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
@@ -1497,16 +1568,19 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error allocating new directory block */
 	{ PR_2_ALLOC_DIRBOCK,
+	  /* xgettext:no-c-format */
 	  N_("@A new @d @b for @i %i (%s): %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Error deallocating inode */
 	{ PR_2_DEALLOC_INODE,
+	  /* xgettext:no-c-format */
 	  N_("Error deallocating @i %i: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
 	/* Directory entry for '.' is big.  Split? */
 	{ PR_2_SPLIT_DOT,
+	  /* xgettext:no-c-format */
 	  N_("@d @e for '.' in %p (%i) is big.\n"),
 	  PROMPT_SPLIT, PR_NO_OK, 0, 0, 0 },
 
@@ -1591,6 +1665,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Invalid HTREE root node */
 	{ PR_2_HTREE_BAD_ROOT,
+	  /* xgettext:no-c-format */
 	  N_("@p @h %d: root node is @n\n"),
 	  PROMPT_CLEAR_HTREE, PR_PREEN_OK, 0, 0, 0 },
 
@@ -1656,11 +1731,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* htree root node fails checksum */
 	{ PR_2_HTREE_ROOT_CSUM_INVALID,
+	  /* xgettext:no-c-format */
 	  N_("@p @h %d: root node fails checksum.\n"),
 	  PROMPT_CLEAR_HTREE, PR_PREEN_OK, 0, 0, 0 },
 
 	/* htree internal node fails checksum */
 	{ PR_2_HTREE_NODE_CSUM_INVALID,
+	  /* xgettext:no-c-format */
 	  N_("@p @h %d: internal node fails checksum.\n"),
 	  PROMPT_CLEAR_HTREE, PR_PREEN_OK, 0, 0, 0 },
 
@@ -1681,6 +1758,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* fixing size of inline directory inode failed */
 	{ PR_2_FIX_INLINE_DIR_FAILED,
+	  /* xgettext:no-c-format */
 	  N_("Fixing size of inline @d @i %i failed.\n"),
 	  PROMPT_TRUNCATE, 0, 0, 0, 0 },
 
@@ -1708,6 +1786,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Unconnected directory inode */
 	{ PR_3_UNCONNECTED_DIR,
+	  /* xgettext:no-c-format */
 	  N_("Unconnected @d @i %i (%p)\n"),
 	  PROMPT_CONNECT, 0, 0, 0, 0 },
 
@@ -1723,56 +1802,67 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Bad or non-existent /lost+found.  Cannot reconnect */
 	{ PR_3_NO_LPF,
+	  /* xgettext:no-c-format */
 	  N_("Bad or non-existent /@l.  Cannot reconnect.\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Could not expand /lost+found */
 	{ PR_3_CANT_EXPAND_LPF,
+	  /* xgettext:no-c-format */
 	  N_("Could not expand /@l: %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Could not reconnect inode */
 	{ PR_3_CANT_RECONNECT,
+	  /* xgettext:no-c-format */
 	  N_("Could not reconnect %i: %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Error while trying to find /lost+found */
 	{ PR_3_ERR_FIND_LPF,
+	  /* xgettext:no-c-format */
 	  N_("Error while trying to find /@l: %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Error in ext2fs_new_block while creating /lost+found */
 	{ PR_3_ERR_LPF_NEW_BLOCK,
+	  /* xgettext:no-c-format */
 	  N_("ext2fs_new_@b: %m while trying to create /@l @d\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Error in ext2fs_new_inode while creating /lost+found */
 	{ PR_3_ERR_LPF_NEW_INODE,
+	  /* xgettext:no-c-format */
 	  N_("ext2fs_new_@i: %m while trying to create /@l @d\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Error in ext2fs_new_dir_block while creating /lost+found */
 	{ PR_3_ERR_LPF_NEW_DIR_BLOCK,
+	  /* xgettext:no-c-format */
 	  N_("ext2fs_new_dir_@b: %m while creating new @d @b\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Error while writing directory block for /lost+found */
 	{ PR_3_ERR_LPF_WRITE_BLOCK,
+	  /* xgettext:no-c-format */
 	  N_("ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Error while adjusting inode count */
 	{ PR_3_ADJUST_INODE,
+	  /* xgettext:no-c-format */
 	  N_("Error while adjusting @i count on @i %i\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Couldn't fix parent directory -- error */
 	{ PR_3_FIX_PARENT_ERR,
+	  /* xgettext:no-c-format */
 	  N_("Couldn't fix parent of @i %i: %m\n\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
 	/* Couldn't fix parent directory -- couldn't find it */
 	{ PR_3_FIX_PARENT_NOFIND,
+	  /* xgettext:no-c-format */
 	  N_("Couldn't fix parent of @i %i: Couldn't find parent @d @e\n\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -1783,11 +1873,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error creating root directory */
 	{ PR_3_CREATE_ROOT_ERROR,
+	  /* xgettext:no-c-format */
 	  N_("Error creating root @d (%s): %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
 	/* Error creating lost and found directory */
 	{ PR_3_CREATE_LPF_ERROR,
+	  /* xgettext:no-c-format */
 	  N_("Error creating /@l @d (%s): %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -1808,6 +1900,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Lost+found not a directory */
 	{ PR_3_LPF_NOTDIR,
+	  /* xgettext:no-c-format */
 	  N_("/@l is not a @d (ino=%i)\n"),
 	  PROMPT_UNLINK, 0, 0, 0, 0 },
 
@@ -1840,6 +1933,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error iterating over directories */
 	{ PR_3A_OPTIMIZE_ITER,
+	  /* xgettext:no-c-format */
 	  N_("Failed to create dirs_to_hash iterator: %m\n"),
 	  PROMPT_NONE, 0, 0, 0, 0 },
 
@@ -1872,11 +1966,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Unattached zero-length inode */
 	{ PR_4_ZERO_LEN_INODE,
+	  /* xgettext:no-c-format */
 	  N_("@u @z @i %i.  "),
 	  PROMPT_CLEAR, PR_PREEN_OK|PR_NO_OK, 0, 0, 0 },
 
 	/* Unattached inode */
 	{ PR_4_UNATTACHED_INODE,
+	  /* xgettext:no-c-format */
 	  N_("@u @i %i\n"),
 	  PROMPT_CONNECT, 0, 0, 0, 0 },
 
@@ -2000,11 +2096,13 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error copying in replacement inode bitmap */
 	{ PR_5_COPY_IBITMAP_ERROR,
+	  /* xgettext:no-c-format */
 	  N_("Error copying in replacement @i @B: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
 	/* Error copying in replacement block bitmap */
 	{ PR_5_COPY_BBITMAP_ERROR,
+	  /* xgettext:no-c-format */
 	  N_("Error copying in replacement @b @B: %m\n"),
 	  PROMPT_NONE, PR_FATAL, 0, 0, 0 },
 
@@ -2034,21 +2132,25 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Group N block(s) in use but group is marked BLOCK_UNINIT */
 	{ PR_5_BLOCK_UNINIT,
+	  /* xgettext:no-c-format */
 	  N_("@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n"),
 	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
 	/* Group N inode(s) in use but group is marked INODE_UNINIT */
 	{ PR_5_INODE_UNINIT,
+	  /* xgettext:no-c-format */
 	  N_("@g %g @i(s) in use but @g is marked INODE_UNINIT\n"),
 	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
 
 	/* Group N inode bitmap does not match checksum */
 	{ PR_5_INODE_BITMAP_CSUM_INVALID,
+	  /* xgettext:no-c-format */
 	  N_("@g %g @i @B does not match checksum.\n"),
 	  PROMPT_FIX, PR_LATCH_IBITMAP | PR_PREEN_OK, 0, 0, 0 },
 
 	/* Group N block bitmap does not match checksum */
 	{ PR_5_BLOCK_BITMAP_CSUM_INVALID,
+	  /* xgettext:no-c-format */
 	  N_("@g %g @b @B does not match checksum.\n"),
 	  PROMPT_FIX, PR_LATCH_BBITMAP | PR_PREEN_OK, 0, 0, 0 },
 
@@ -2066,16 +2168,19 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Error setting block group checksum info */
 	{ PR_6_SET_BG_CHECKSUM,
+	  /* xgettext:no-c-format */
 	  N_("Error setting @b @g checksum info: %m\n"),
 	  PROMPT_NULL, PR_FATAL, 0, 0, 0 },
 
 	/* Error writing file system info */
 	{ PR_6_FLUSH_FILESYSTEM,
+	  /* xgettext:no-c-format */
 	  N_("Error writing file system info: %m\n"),
 	  PROMPT_NULL, PR_FATAL, 0, 0, 0 },
 
 	/* Error flushing writes to storage device */
 	{ PR_6_IO_FLUSH,
+	  /* xgettext:no-c-format */
 	  N_("Error flushing writes to storage device: %m\n"),
 	  PROMPT_NULL, PR_FATAL, 0, 0, 0 },