gfs2-utils: master - strings: Clean up strings

Steven Whitehouse swhiteho at fedoraproject.org
Fri Dec 3 14:54:16 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=2154e48026467c4c6fd69062b9686454380eb385
Commit:        2154e48026467c4c6fd69062b9686454380eb385
Parent:        fab89dc7afd8672037f76a16b37f229a3d86950c
Author:        Steven Whitehouse <swhiteho at redhat.com>
AuthorDate:    Fri Dec 3 14:45:19 2010 +0000
Committer:     Steven Whitehouse <swhiteho at redhat.com>
CommitterDate: Fri Dec 3 14:45:19 2010 +0000

strings: Clean up strings

This patch is a step towards having strings which are suitable
for translation. Most of the change is due to removal of the PRIxx
format strings and replacement with %llu etc. This helps to make
the strings easier to understand and also since there was a mix
of the two kind of format specicifer, now everything uses a single
type.

There are some exceptions... I've not bothered making the changes in
programs which are likely to be dropped in the future, since we
don't extract strings from them anyway. Also I've not made any
changes in the library, since we want to eliminate all user output
from the library.

Along the way I've found a few incorrect format specifiers (%lld
instead of %llu) fixed a few strings which incorrect spacing,
merged a few duplicate strings (which were almost the same but
are now exactly the same) and removed one or two strings which
shouldn't be translated.

There is still plenty to do in this area, but this sorts out most
of the easy stuff.

Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
---
 gfs2/convert/gfs2_convert.c |   27 +-
 gfs2/edit/extended.c        |   14 +-
 gfs2/edit/gfs2hex.c         |    4 +-
 gfs2/edit/hexedit.c         |   26 +-
 gfs2/edit/savemeta.c        |   36 +-
 gfs2/fsck/initialize.c      |   14 +-
 gfs2/fsck/link.c            |   36 +-
 gfs2/fsck/main.c            |   12 +-
 gfs2/fsck/metawalk.c        |   31 +-
 gfs2/fsck/pass1.c           |   36 +-
 gfs2/fsck/pass1b.c          |   15 +-
 gfs2/fsck/pass1c.c          |   16 +-
 gfs2/fsck/pass2.c           |   73 +-
 gfs2/fsck/pass3.c           |   56 +-
 gfs2/fsck/pass4.c           |   37 +-
 gfs2/fsck/pass5.c           |   24 +-
 gfs2/fsck/rgrepair.c        |   65 +-
 gfs2/fsck/util.c            |    3 +-
 gfs2/mkfs/main.c            |    2 +-
 gfs2/mkfs/main_grow.c       |   28 +-
 gfs2/mkfs/main_jadd.c       |    4 +-
 gfs2/mkfs/main_mkfs.c       |   26 +-
 gfs2/quota/check.c          |   12 +-
 gfs2/tune/main.c            |    2 +-
 po/gfs2-utils.pot           | 2215 +++++++++++++++++++++----------------------
 25 files changed, 1415 insertions(+), 1399 deletions(-)

diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index 9e9a6f4..88674d9 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -1006,8 +1006,8 @@ static int inode_renumber(struct gfs2_sbd *sbp, uint64_t root_inode_addr, osi_li
 			/* doesn't think we hung.  (This may take a long time).       */
 			if (tv.tv_sec - seconds) {
 				seconds = tv.tv_sec;
-				log_notice("\r%" PRIu64" inodes from %d rgs "
-					   "converted.", sbp->md.next_inum,
+				log_notice("\r%llu inodes from %d rgs converted.",
+					   (unsigned long long)sbp->md.next_inum,
 					   rgs_processed);
 				fflush(stdout);
 			}
@@ -1058,8 +1058,8 @@ static int inode_renumber(struct gfs2_sbd *sbp, uint64_t root_inode_addr, osi_li
 			first = 0;
 		} /* while 1 */
 	} /* for all rgs */
-	log_notice("\r%" PRIu64" inodes from %d rgs converted.",
-		   sbp->md.next_inum, rgs_processed);
+	log_notice("\r%llu inodes from %d rgs converted.",
+		   (unsigned long long)sbp->md.next_inum, rgs_processed);
 	fflush(stdout);
 	return 0;
 }/* inode_renumber */
@@ -1124,8 +1124,9 @@ static int process_dirent_info(struct gfs2_inode *dip, struct gfs2_sbd *sbp,
 		dirents_fixed++;
 		if (tv.tv_sec - seconds) {
 			seconds = tv.tv_sec;
-			log_notice("\r%" PRIu64 " directories, %" PRIu64 " dirents fixed.",
-					   dirs_fixed, dirents_fixed);
+			log_notice("\r%llu directories, %llu dirents fixed.",
+				   (unsigned long long)dirs_fixed,
+				   (unsigned long long)dirents_fixed);
 			fflush(stdout);
 		}
 		/* fix the dirent's inode number based on the inode */
@@ -1244,7 +1245,8 @@ static int fix_one_directory_exhash(struct gfs2_sbd *sbp, struct gfs2_inode *dip
 		/* read the leaf buffer in */
 		error = gfs2_get_leaf(dip, leaf_block, &bh_leaf);
 		if (error) {
-			log_crit("Error reading leaf %" PRIx64 "\n", leaf_block);
+			log_crit("Error reading leaf %llx\n",
+				 (unsigned long long)leaf_block);
 			break;
 		}
 		gfs2_leaf_in(&leaf, bh_leaf); /* buffer to structure */
@@ -1833,7 +1835,7 @@ static void update_inode_file(struct gfs2_sbd *sdp)
 	if (count != sizeof(uint64_t))
 		die("update_inode_file\n");
 	
-	log_debug("\nNext Inum: %"PRIu64"\n", sdp->md.next_inum);
+	log_debug("\nNext Inum: %llu\n", (unsigned long long)sdp->md.next_inum);
 }/* update_inode_file */
 
 /* ------------------------------------------------------------------------- */
@@ -2102,8 +2104,9 @@ int main(int argc, char **argv)
 	/* ---------------------------------------------- */
 	if (!error) {
 		error = fix_directory_info(&sb2, (osi_list_t *)&dirs_to_fix);
-		log_notice("\r%" PRIu64 " directories, %" PRIu64 " dirents fixed.",
-				   dirs_fixed, dirents_fixed);
+		log_notice("\r%llu directories, %llu dirents fixed.",
+			   (unsigned long long)dirs_fixed,
+			   (unsigned long long)dirents_fixed);
 		fflush(stdout);
 		if (error)
 			log_crit("\n%s: Error fixing directories.\n", device);
@@ -2113,8 +2116,8 @@ int main(int argc, char **argv)
 	/* ---------------------------------------------- */
 	if (!error) {
 		error = fix_cdpn_symlinks(&sb2, (osi_list_t *)&cdpns_to_fix);
-		log_notice("\r%" PRIu64 " cdpn symlinks moved to empty directories.",
-			   cdpns_fixed);
+		log_notice("\r%llu cdpn symlinks moved to empty directories.",
+			   (unsigned long long)cdpns_fixed);
 		fflush(stdout);
 		if (error)
 			log_crit("\n%s: Error fixing cdpn symlinks.\n", device);
diff --git a/gfs2/edit/extended.c b/gfs2/edit/extended.c
index 6874c28..1e710fa 100644
--- a/gfs2/edit/extended.c
+++ b/gfs2/edit/extended.c
@@ -200,9 +200,9 @@ static int display_indirect(struct iinfo *ind, int indblocks, int level,
 			if (edit_row[dmode] >= 0 &&
 			    line - start_line ==
 			    edit_row[dmode] - start_row[dmode]) { 
-				sprintf(estring, "%"PRIx64,
-					ind->ii[print_entry_ndx].block);
-				strcpy(edit_fmt, "%"PRIx64);
+				sprintf(estring, "%llx",
+					(unsigned long long)ind->ii[print_entry_ndx].block);
+				strcpy(edit_fmt, "%llx");
 				edit_size[dmode] = strlen(estring);
 				COLORS_NORMAL;
 			}
@@ -347,9 +347,9 @@ static int display_leaf(struct iinfo *ind)
 				    line - start_line - 1 ==
 				    edit_row[dmode] - start_row[dmode]) {
 					COLORS_HIGHLIGHT;
-					sprintf(estring, "%"PRIx64,
-						ind->ii[0].dirent[d].block);
-					strcpy(edit_fmt, "%"PRIx64);
+					sprintf(estring, "%llx",
+						(unsigned long long)ind->ii[0].dirent[d].block);
+					strcpy(edit_fmt, "%llx");
 				}
 			}
 			print_gfs2("%d. (%d). %lld (0x%llx): ",
@@ -480,7 +480,7 @@ static int print_jindex(struct gfs2_inode *dij)
 			if (edit_row[dmode] == print_entry_ndx) {
 				COLORS_HIGHLIGHT;
 				strcpy(efield, "ji_addr");
-				sprintf(estring, "%" PRIx64, ji.ji_addr);
+				sprintf(estring, "%llx", (unsigned long long)ji.ji_addr);
 			}
 			print_gfs2("Journal #%d", print_entry_ndx);
 			eol(0);
diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c
index c3c3956..8dbd7e5 100644
--- a/gfs2/edit/gfs2hex.c
+++ b/gfs2/edit/gfs2hex.c
@@ -451,10 +451,10 @@ static void gfs2_inum_print2(const char *title,struct gfs2_inum *no)
 	}
 	else
 		printf("  %s:",title);
-	pv2(no, no_formal_ino, "%lld", "0x%"PRIx64);
+	pv2(no, no_formal_ino, "%llu", "0x%llx");
 	if (!termlines)
 		printf("        addr:");
-	pv2(no, no_addr, "%lld", "0x%"PRIx64);
+	pv2(no, no_addr, "%llu", "0x%llx");
 }
 
 /**
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index 80cbd26..2472bbf 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -1057,7 +1057,7 @@ int display_block_type(int from_restore)
 	if (block == RGLIST_DUMMY_BLOCK)
 		print_gfs2("RG List       ");
 	else
-		print_gfs2("%lld    (0x%"PRIx64")", block, block);
+		print_gfs2("%lld    (0x%llx)", block, block);
 	if (termlines) {
 		if (edit_row[dmode] == -1)
 			COLORS_NORMAL;
@@ -1066,8 +1066,7 @@ int display_block_type(int from_restore)
 	else
 		print_gfs2(" ");
 	if (!from_restore) {
-		print_gfs2("of %" PRIu64 " (0x%" PRIx64 ")", max_block,
-			   max_block);
+		print_gfs2("of %llu (0x%llx)", max_block, max_block);
 		if (termlines)
 			move(line, 55);
 		else
@@ -1298,9 +1297,9 @@ static int hexdump(uint64_t startaddr, int len)
 			COLORS_OFFSETS; /* cyan for offsets */
 		}
 		if (startaddr < 0xffffffff)
-			print_gfs2("%.8"PRIx64, startaddr + l);
+			print_gfs2("%.8llx", startaddr + l);
 		else
-			print_gfs2("%.16"PRIx64, startaddr + l);
+			print_gfs2("%.16llx", startaddr + l);
 		if (termlines) {
 			if (l < struct_len)
 				COLORS_NORMAL; /* normal part of structure */
@@ -1801,8 +1800,8 @@ static void read_superblock(int fd)
 	block = 0x10 * (GFS2_DEFAULT_BSIZE / sbd.bsize);
 	device_geometry(&sbd);
 	if (fix_device_geometry(&sbd)) {
-		fprintf(stderr, "Device is too small (%"PRIu64" bytes)\n",
-				sbd.device.length << GFS2_BASIC_BLOCK_SHIFT);
+		fprintf(stderr, "Device is too small (%llu bytes)\n",
+			(unsigned long long)sbd.device.length << GFS2_BASIC_BLOCK_SHIFT);
 		exit(-1);
 	}
 	if(gfs1) {
@@ -2204,7 +2203,7 @@ static uint64_t find_metablockoftype(const char *strtype, int print)
 /* ------------------------------------------------------------------------ */
 uint64_t check_keywords(const char *kword)
 {
-	uint64_t blk = 0;
+	unsigned long long blk = 0;
 
 	if (!strcmp(kword, "sb") ||!strcmp(kword, "superblock"))
 		blk = 0x10 * (4096 / sbd.bsize); /* superblock */
@@ -2256,9 +2255,9 @@ uint64_t check_keywords(const char *kword)
 	} else if (kword[0]=='/') /* search */
 		blk = find_metablockoftype(&kword[1], 0);
 	else if (kword[0]=='0' && kword[1]=='x') /* hex addr */
-		sscanf(kword, "%"SCNx64, &blk);/* retrieve in hex */
+		sscanf(kword, "%llx", &blk);/* retrieve in hex */
 	else
-		sscanf(kword, "%" PRIu64, &blk); /* retrieve decimal */
+		sscanf(kword, "%llu", &blk); /* retrieve decimal */
 
 	return blk;
 }
@@ -2272,7 +2271,7 @@ static uint64_t goto_block(void)
 	int ch, delta;
 
 	memset(string, 0, sizeof(string));
-	sprintf(string,"%"PRId64, block);
+	sprintf(string,"%lld", (long long)block);
 	if (bobgets(string, 1, 7, 16, &ch)) {
 		if (isalnum(string[0]) || string[0] == '/')
 			temp_blk = check_keywords(string);
@@ -3455,8 +3454,9 @@ static void process_parameters(int argc, char *argv[], int pass)
 		else if (!strcmp(argv[i], "identify"))
 			identify = TRUE;
 		else if (!strcmp(argv[i], "size")) {
-			printf("Device size: %" PRIu64 " (0x%" PRIx64 ")\n",
-			       max_block, max_block);
+			printf("Device size: %llu (0x%llx)\n",
+			       (unsigned long long)max_block,
+			       (unsigned long long)max_block);
 			exit(EXIT_SUCCESS);
 		} else if (!strcmp(argv[i], "rgcount"))
 			rgcount();
diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
index 290d5b4..fa2b9bf 100644
--- a/gfs2/edit/savemeta.c
+++ b/gfs2/edit/savemeta.c
@@ -184,9 +184,9 @@ static void warm_fuzzy_stuff(uint64_t wfsblock, int force)
 		if (last_fs_block) {
 			printf("\r");
 			percent = (wfsblock * 100) / last_fs_block;
-			printf("%" PRIu64 " metadata blocks (%"
-			       PRIu64 "%%) processed, ", wfsblock,
-			       percent);
+			printf("%llu metadata blocks (%llu%%) processed, ",
+			       (unsigned long long)wfsblock,
+			       (unsigned long long)percent);
 			if (force)
 				printf("\n");
 			fflush(stdout);
@@ -557,8 +557,8 @@ void savemeta(char *out_fn, int saveoption)
 			exit(-1);
 		}
 		if (fix_device_geometry(&sbd)) {
-			fprintf(stderr, "Device is too small (%"PRIu64" bytes)\n",
-				sbd.device.length << GFS2_BASIC_BLOCK_SHIFT);
+			fprintf(stderr, "Device is too small (%llu bytes)\n",
+				(unsigned long long)sbd.device.length << GFS2_BASIC_BLOCK_SHIFT);
 			exit(-1);
 		}
 		osi_list_init(&sbd.rglist);
@@ -590,8 +590,8 @@ void savemeta(char *out_fn, int saveoption)
 		}
 	}
 	last_fs_block = lseek(sbd.device_fd, 0, SEEK_END) / sbd.bsize;
-	printf("There are %" PRIu64 " blocks of %u bytes in the destination "
-	       "device.\n", last_fs_block, sbd.bsize);
+	printf("There are %llu blocks of %u bytes in the destination "
+	       "device.\n", (unsigned long long)last_fs_block, sbd.bsize);
 	if (!slow) {
 		if (gfs1) {
 			sbd.md.riinode = inode_read(&sbd,
@@ -773,18 +773,19 @@ static int restore_data(int fd, int in_fd, int printblocksonly,
 		    last_fs_block && savedata->blk >= last_fs_block) {
 			fprintf(stderr, "Error: File system is too small to "
 				"restore this metadata.\n");
-			fprintf(stderr, "File system is %" PRIu64 " blocks, ",
-				last_fs_block);
-			fprintf(stderr, "Restore block = %" PRIu64 "\n",
-				savedata->blk);
+			fprintf(stderr, "File system is %llu blocks, ",
+				(unsigned long long)last_fs_block);
+			fprintf(stderr, "Restore block = %llu\n",
+				(unsigned long long)savedata->blk);
 			return -1;
 		}
 		rs = read(in_fd, &buf16, sizeof(uint16_t));
 		savedata->siglen = be16_to_cpu(buf16);
 		if (savedata->siglen > sizeof(savedata->buf)) {
-			fprintf(stderr, "\nBad record length: %d for block #%"
-				PRIu64 " (0x%" PRIx64").\n", savedata->siglen,
-				savedata->blk, savedata->blk);
+			fprintf(stderr, "\nBad record length: %d for block #%llu"
+				" (0x%llx).\n", savedata->siglen,
+				(unsigned long long)savedata->blk,
+				(unsigned long long)savedata->blk);
 			return -1;
 		}
 		if (savedata->siglen &&
@@ -819,10 +820,9 @@ static int restore_data(int fd, int in_fd, int printblocksonly,
 			else if (!printblocksonly) {
 				last_fs_block =
 					lseek(fd, 0, SEEK_END) / sbd.bsize;
-				printf("There are %" PRIu64 " blocks of " \
-				       "%u bytes in the destination"	\
-				       " device.\n\n",
-				       last_fs_block, sbd.bsize);
+				printf("There are %llu blocks of %u bytes in "
+				       "the destination device.\n\n",
+				       (unsigned long long)last_fs_block, sbd.bsize);
 			} else {
 				printf("This is %s metadata\n", gfs1 ?
 				       "gfs (not gfs2)" : "gfs2");
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index e04198a..8859032 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -164,8 +164,9 @@ static int set_block_ranges(struct gfs2_sbd *sdp)
 	first_data_block = rmin;
 
 	if(fsck_lseek(sdp->device_fd, (last_fs_block * sdp->sd_sb.sb_bsize))){
-		log_crit( _("Can't seek to last block in file system: %"
-				 PRIu64" (0x%" PRIx64 ")\n"), last_fs_block, last_fs_block);
+		log_crit( _("Can't seek to last block in file system: %llu"
+			 " (0x%llx)\n"), (unsigned long long)last_fs_block,
+			 (unsigned long long)last_fs_block);
 		goto fail;
 	}
 
@@ -173,8 +174,9 @@ static int set_block_ranges(struct gfs2_sbd *sdp)
 	error = read(sdp->device_fd, buf, sdp->sd_sb.sb_bsize);
 	if (error != sdp->sd_sb.sb_bsize){
 		log_crit( _("Can't read last block in file system (error %u), "
-				 "last_fs_block: %"PRIu64" (0x%" PRIx64 ")\n"), error,
-				 last_fs_block, last_fs_block);
+			 "last_fs_block: %llu (0x%llx)\n"), error,
+			 (unsigned long long)last_fs_block,
+			 (unsigned long long)last_fs_block);
 		goto fail;
 	}
 
@@ -521,7 +523,7 @@ static int init_system_inodes(struct gfs2_sbd *sdp)
 
 	bl = gfs2_bmap_create(sdp, last_fs_block+1, &addl_mem_needed);
 	if (!bl) {
-		log_crit( _("This system doesn't have enough memory + swap space to fsck this file system.\n"));
+		log_crit( _("This system doesn't have enough memory and swap space to fsck this file system.\n"));
 		log_crit( _("Additional memory needed is approximately: %lluMB\n"),
 			 (unsigned long long)(addl_mem_needed / 1048576ULL));
 		log_crit( _("Please increase your swap space by that amount and run gfs2_fsck again.\n"));
@@ -1006,7 +1008,7 @@ static int fill_super_block(struct gfs2_sbd *sdp)
 
 	if(sizeof(struct gfs2_sb) > sdp->sd_sb.sb_bsize){
 		log_crit( _("GFS superblock is larger than the blocksize!\n"));
-		log_debug( _("sizeof(struct gfs2_sb) > sdp->sd_sb.sb_bsize\n"));
+		log_debug("sizeof(struct gfs2_sb) > sdp->sd_sb.sb_bsize\n");
 		return -1;
 	}
 
diff --git a/gfs2/fsck/link.c b/gfs2/fsck/link.c
index 213a643..f2ff013 100644
--- a/gfs2/fsck/link.c
+++ b/gfs2/fsck/link.c
@@ -16,8 +16,6 @@
 int set_link_count(uint64_t inode_no, uint32_t count)
 {
 	struct inode_info *ii;
-	/*log_debug( _("Setting link count to %u for %" PRIu64
-	  " (0x%" PRIx64 ")\n"), count, inode_no, inode_no);*/
 	/* If the list has entries, look for one that matches inode_no */
 	ii = inodetree_find(inode_no);
 	if (!ii)
@@ -40,17 +38,19 @@ int increment_link(uint64_t inode_no, uint64_t referenced_from,
 	if (ii) {
 		ii->counted_links++;
 		log_debug( _("Directory %lld (0x%llx) incremented counted "
-			     "links to %u for %"PRIu64" (0x%" PRIx64 ") "
-			     "via %s\n"),
+			     "links to %u for %llu (0x%llx) via %s\n"),
 			   (unsigned long long)referenced_from,
 			   (unsigned long long)referenced_from,
-			   ii->counted_links, inode_no, inode_no, why);
+			   ii->counted_links, (unsigned long long)inode_no,
+			   (unsigned long long)inode_no, why);
 		return 0;
 	}
-	log_debug( _("Ref: %lld (0x%llx) No match found when incrementing "
-		     "link for %" PRIu64 " (0x%" PRIx64 ")!\n"),
+	log_debug( _("Ref: %llu (0x%llx) No match found when incrementing "
+		     "link for %llu (0x%llx)!\n"),
 		   (unsigned long long)referenced_from,
-		   (unsigned long long)referenced_from, inode_no, inode_no);
+		   (unsigned long long)referenced_from,
+		   (unsigned long long)inode_no,
+		   (unsigned long long)inode_no);
 	/* If no match was found, add a new entry and set its
 	 * counted links to 1 */
 	ii = inodetree_insert(inode_no);
@@ -71,24 +71,26 @@ int decrement_link(uint64_t inode_no, uint64_t referenced_from,
 	 * inode_no */
 	if(ii) {
 		if (!ii->counted_links) {
-			log_debug( _("Directory %lld (0x%llx)'s link to "
-			     " %"PRIu64" (0x%" PRIx64 ") via %s is zero!\n"),
+			log_debug( _("Directory %llu (0x%llx)'s link to "
+			     " %llu (0x%llx) via %s is zero!\n"),
 			   (unsigned long long)referenced_from,
 			   (unsigned long long)referenced_from,
-			   inode_no, inode_no, why);
+			   (unsigned long long)inode_no,
+			   (unsigned long long)inode_no, why);
 			return 0;
 		}
 		ii->counted_links--;
-		log_debug( _("Directory %lld (0x%llx) decremented counted "
-			     "links to %u for %"PRIu64" (0x%" PRIx64 ") "
-			     "via %s\n"),
+		log_debug( _("Directory %llu (0x%llx) decremented counted "
+			     "links to %u for %llu (0x%llx) via %s\n"),
 			   (unsigned long long)referenced_from,
 			   (unsigned long long)referenced_from,
-			   ii->counted_links, inode_no, inode_no, why);
+			   ii->counted_links, (unsigned long long)inode_no,
+			   (unsigned long long)inode_no, why);
 		return 0;
 	}
-	log_debug( _("No match found when decrementing link for %" PRIu64
-			  " (0x%" PRIx64 ")!\n"), inode_no, inode_no);
+	log_debug( _("No match found when decrementing link for %llu"
+		     " (0x%llx)!\n"), (unsigned long long)inode_no,
+		  (unsigned long long)inode_no);
 	return -1;
 
 }
diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c
index a5763b4..157ed02 100644
--- a/gfs2/fsck/main.c
+++ b/gfs2/fsck/main.c
@@ -56,7 +56,7 @@ static void version(void)
 {
 	printf( _("GFS2 fsck %s (built %s %s)\n"),
 	       VERSION, __DATE__, __TIME__);
-	printf( _(REDHAT_COPYRIGHT "\n"));
+	printf(REDHAT_COPYRIGHT "\n");
 }
 
 static int read_cmdline(int argc, char **argv, struct gfs2_options *gopts)
@@ -102,8 +102,7 @@ static int read_cmdline(int argc, char **argv, struct gfs2_options *gopts)
 			fprintf(stderr, _("Please use '-h' for usage.\n"));
 			return FSCK_USAGE;
 		default:
-			fprintf(stderr, _("Bad programmer! You forgot to catch"
-				" the %c flag\n"), c);
+			fprintf(stderr, _("Unknown option %c\n"), c);
 			return FSCK_USAGE;
 
 		}
@@ -129,8 +128,9 @@ static void interrupt(int sig)
 	if (!last_reported_block || last_reported_block == last_fs_block)
 		sprintf(progress, _("progress unknown.\n"));
 	else
-		sprintf(progress, _("processing block %" PRIu64 " out of %"
-			PRIu64 "\n"), last_reported_block, last_fs_block);
+		sprintf(progress, _("processing block %llu out of %llu\n"),
+			(unsigned long long)last_reported_block,
+			(unsigned long long)last_fs_block);
 	
 	response = generic_interrupt("gfs2_fsck", pass, progress,
 				     _("Do you want to abort gfs2_fsck, skip " \
@@ -356,7 +356,7 @@ int main(int argc, char **argv)
 		log_notice( _("Writing changes to disk\n"));
 	fsync(sbp->device_fd);
 	destroy(sbp);
-	log_notice( _("gfs2_fsck complete    \n"));
+	log_notice( _("gfs2_fsck complete\n"));
 
 	if (!error) {
 		if (!errors_found)
diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c
index e3c0eff..8415b15 100644
--- a/gfs2/fsck/metawalk.c
+++ b/gfs2/fsck/metawalk.c
@@ -37,7 +37,7 @@ int check_n_fix_bitmap(struct gfs2_sbd *sdp, uint64_t blk,
 
 	old_bitmap_state = gfs2_get_bitmap(sdp, blk, rgd);
 	if (old_bitmap_state < 0) {
-		log_err( _("Block %lld (0x%llx) is not represented in the"
+		log_err( _("Block %llu (0x%llx) is not represented in the "
 			   "system bitmap; part of an rgrp or superblock.\n"),
 			 (unsigned long long)blk, (unsigned long long)blk);
 		return -1;
@@ -320,8 +320,9 @@ static int check_entries(struct gfs2_inode *ip, struct gfs2_buffer_head *bh,
 	else if (type == DIR_EXHASH) {
 		dent = (struct gfs2_dirent *)(bh->b_data + sizeof(struct gfs2_leaf));
 		leaf = (struct gfs2_leaf *)bh->b_data;
-		log_debug( _("Checking leaf %" PRIu64 " (0x%" PRIx64 ")\n"),
-				  bh->b_blocknr, bh->b_blocknr);
+		log_debug( _("Checking leaf %llu (0x%llu)\n"),
+			  (unsigned long long)bh->b_blocknr,
+			  (unsigned long long)bh->b_blocknr);
 	}
 	else {
 		log_err( _("Invalid directory type %d specified\n"), type);
@@ -700,7 +701,7 @@ static int check_leaf_blks(struct gfs2_inode *ip, struct metawalk_fxns *pass)
 			 * values and replace them with the correct value. */
 
 			if (leaf.lf_dirent_format == (GFS2_FORMAT_DE << 16)) {
-				log_debug( _("incorrect lf_dirent_format at leaf #%" PRIu64 "\n"), leaf_no);
+				log_debug( _("incorrect lf_dirent_format at leaf #%llu\n"), (unsigned long long)leaf_no);
 				leaf.lf_dirent_format = GFS2_FORMAT_DE;
 				gfs2_leaf_out(&leaf, lbh);
 				log_debug( _("Fixing lf_dirent_format.\n"));
@@ -875,8 +876,9 @@ static int check_leaf_eattr(struct gfs2_inode *ip, uint64_t block,
 	struct gfs2_buffer_head *bh = NULL;
 	int error = 0;
 
-	log_debug( _("Checking EA leaf block #%"PRIu64" (0x%" PRIx64 ").\n"),
-			  block, block);
+	log_debug( _("Checking EA leaf block #%llu (0x%llx).\n"),
+		  (unsigned long long)block,
+		  (unsigned long long)block);
 
 	if(pass->check_eattr_leaf) {
 		error = pass->check_eattr_leaf(ip, block, parent, &bh,
@@ -975,8 +977,9 @@ static int check_indirect_eattr(struct gfs2_inode *ip, uint64_t indirect,
 	int first_ea_is_bad = 0;
 	uint64_t di_eattr_save = ip->i_di.di_eattr;
 
-	log_debug( _("Checking EA indirect block #%"PRIu64" (0x%" PRIx64 ").\n"),
-			  indirect, indirect);
+	log_debug( _("Checking EA indirect block #%llu (0x%llx).\n"),
+		  (unsigned long long)indirect,
+		  (unsigned long long)indirect);
 
 	if (!pass->check_eattr_indir)
 		return 0;
@@ -1182,9 +1185,9 @@ static int build_and_check_metalist(struct gfs2_inode *ip, osi_list_t *mlp,
 				if(err > 0) {
 					if (!error)
 						error = err;
-					log_debug( _("Skipping block %" PRIu64
-						     " (0x%" PRIx64 ")\n"),
-						   block, block);
+					log_debug( _("Skipping block %llu (0x%llx)\n"),
+						   (unsigned long long)block,
+						   (unsigned long long)block);
 					continue;
 				}
 				if (gfs2_check_range(ip->i_sbd, block)) {
@@ -1430,8 +1433,10 @@ int remove_dentry_from_dir(struct gfs2_sbd *sbp, uint64_t dir,
 	uint8_t q;
 	int error;
 
-	log_debug( _("Removing dentry %" PRIu64 " (0x%" PRIx64 ") from directory %"
-			  PRIu64" (0x%" PRIx64 ")\n"), dentryblock, dentryblock, dir, dir);
+	log_debug( _("Removing dentry %llu (0x%llx) from directory %llu"
+		     " (0x%llx)\n"), (unsigned long long)dentryblock,
+		  (unsigned long long)dentryblock,
+		  (unsigned long long)dir, (unsigned long long)dir);
 	if(gfs2_check_range(sbp, dir)) {
 		log_err( _("Parent directory out of range\n"));
 		return 1;
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index b891d1b..96c2310 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -548,9 +548,6 @@ static int check_eattr_indir(struct gfs2_inode *ip, uint64_t indirect,
 	/* This inode contains an eattr - it may be invalid, but the
 	 * eattr attributes points to a non-zero block */
 	if(gfs2_check_range(sdp, indirect)) {
-		/*log_warn("EA indirect block #%"PRIu64" is out of range.\n",
-			indirect);
-			fsck_blockmap_set(parent, "bad", bad_block);*/
 		/* Doesn't help to mark this here - this gets checked
 		 * in pass1c */
 		return 1;
@@ -1154,9 +1151,10 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh)
 	ip = fsck_inode_get(sdp, bh);
 	q = block_type(block);
 	if(q != gfs2_block_free) {
-		log_err( _("Found a duplicate inode block at #%" PRIu64
-			   " (0x%" PRIx64 ") previously marked as a %s\n"),
-			 block, block, block_type_string(q));
+		log_err( _("Found a duplicate inode block at #%llu"
+			   " (0x%llx) previously marked as a %s\n"),
+			 (unsigned long long)block,
+			 (unsigned long long)block, block_type_string(q));
 		add_duplicate_ref(ip, block, ref_as_meta, 0, INODE_VALID);
 		fsck_inode_put(&ip);
 		return 0;
@@ -1168,14 +1166,16 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh)
 			(unsigned long long)block,
 			(unsigned long long)ip->i_di.di_num.no_addr,
 			(unsigned long long)ip->i_di.di_num.no_addr);
-		if(query( _("Fix address in inode at block #%"
-			    PRIu64 " (0x%" PRIx64 ")? (y/n) "),
-			  block, block)) {
+		if(query( _("Fix address in inode at block #%llu"
+			    " (0x%llx)? (y/n) "),
+			  (unsigned long long)block, (unsigned long long)block)) {
 			ip->i_di.di_num.no_addr = ip->i_di.di_num.no_formal_ino = block;
 			bmodified(ip->i_bh);
 		} else
-			log_err( _("Address in inode at block #%" PRIu64
-				 " (0x%" PRIx64 ") not fixed\n"), block, block);
+			log_err( _("Address in inode at block #%llu"
+				 " (0x%llx) not fixed\n"),
+				(unsigned long long)block,
+				(unsigned long long)block);
 	}
 	error = handle_ip(sdp, ip);
 	fsck_inode_put(&ip);
@@ -1201,9 +1201,10 @@ static int check_system_inode(struct gfs2_sbd *sdp,
 		/* Read in the system inode, look at its dentries, and start
 		 * reading through them */
 		iblock = (*sysinode)->i_di.di_num.no_addr;
-		log_info( _("System inode for '%s' is located at block %"
-			 PRIu64 " (0x%" PRIx64 ")\n"), filename,
-			 iblock, iblock);
+		log_info( _("System inode for '%s' is located at block %llu"
+			 " (0x%llx)\n"), filename,
+			 (unsigned long long)iblock,
+			 (unsigned long long)iblock);
 		if (gfs2_check_meta((*sysinode)->i_bh, GFS2_METATYPE_DI)) {
 			log_err( _("Found invalid system dinode at block #"
 				   "%llu (0x%llx)\n"),
@@ -1399,8 +1400,8 @@ int pass1(struct gfs2_sbd *sbp)
 	 */
 	for (tmp = sbp->rglist.next; tmp != &sbp->rglist;
 	     tmp = tmp->next, rg_count++) {
-		log_debug( _("Checking metadata in Resource Group #%" PRIu64 "\n"),
-				 rg_count);
+		log_debug( _("Checking metadata in Resource Group #%llu\n"),
+				 (unsigned long long)rg_count);
 		rgd = osi_list_entry(tmp, struct rgrp_list, list);
 		for (i = 0; i < rgd->ri.ri_length; i++) {
 			log_debug( _("rgrp block %lld (0x%llx) "
@@ -1446,9 +1447,6 @@ int pass1(struct gfs2_sbd *sbp)
 			}
 			bh = bread(sbp, block);
 
-			/*log_debug( _("Checking metadata block #%" PRIu64
-			  " (0x%" PRIx64 ")\n"), block, block);*/
-
 			if (gfs2_check_meta(bh, GFS2_METATYPE_DI)) {
 				log_err( _("Found invalid inode at block #"
 					   "%llu (0x%llx)\n"),
diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c
index 12b6a3b..090b412 100644
--- a/gfs2/fsck/pass1b.c
+++ b/gfs2/fsck/pass1b.c
@@ -233,9 +233,10 @@ static int clear_dup_metalist(struct gfs2_inode *ip, uint64_t block,
 			 (unsigned long long)ip->i_di.di_num.no_addr,
 			 (unsigned long long)ip->i_di.di_num.no_addr,
 			 (unsigned long long)block, (unsigned long long)block);
-		log_err( _("Inode %s is in directory %"PRIu64" (0x%" PRIx64 ")\n"),
-			 dh->id->name ? dh->id->name : "", dh->id->parent,
-			 dh->id->parent);
+		log_err( _("Inode %s is in directory %llu (0x%llx)\n"),
+			 dh->id->name ? dh->id->name : "",
+			 (unsigned long long)dh->id->parent,
+			 (unsigned long long)dh->id->parent);
 	}
 	/* We return 1 not 0 because we need build_and_check_metalist to
 	   bypass adding the metadata below it to the metalist.  If that
@@ -326,9 +327,6 @@ static int find_block_ref(struct gfs2_sbd *sbp, uint64_t inode)
 	int error = 0;
 
 	ip = fsck_load_inode(sbp, inode); /* bread, inode_get */
-	/*log_debug( _("Checking inode %" PRIu64 " (0x%" PRIx64 ")'s "
-		     "metatree for references to duplicate blocks)\n"),
-		     inode, inode);*/
 	/* double-check the meta header just to be sure it's metadata */
 	if (ip->i_di.di_header.mh_magic != GFS2_MAGIC ||
 	    ip->i_di.di_header.mh_type != GFS2_METATYPE_DI) {
@@ -618,8 +616,9 @@ int pass1b(struct gfs2_sbd *sbp)
 	/* Rescan the fs looking for pointers to blocks that are in
 	 * the duplicate block map */
 	log_info( _("Scanning filesystem for inodes containing duplicate blocks...\n"));
-	log_debug( _("Filesystem has %"PRIu64" (0x%" PRIx64 ") blocks total\n"),
-			  last_fs_block, last_fs_block);
+	log_debug( _("Filesystem has %llu (0x%llx) blocks total\n"),
+		  (unsigned long long)last_fs_block,
+		  (unsigned long long)last_fs_block);
 	for(i = 0; i < last_fs_block; i++) {
 		if (skip_this_pass || fsck_abort) /* if asked to skip the rest */
 			goto out;
diff --git a/gfs2/fsck/pass1c.c b/gfs2/fsck/pass1c.c
index 45d71c0..0782459 100644
--- a/gfs2/fsck/pass1c.c
+++ b/gfs2/fsck/pass1c.c
@@ -26,9 +26,10 @@ static int remove_eattr_entry(struct gfs2_sbd *sdp,
 		if (curr->ea_flags & GFS2_EAFLAG_LAST)
 			prev->ea_flags |= GFS2_EAFLAG_LAST;	
 	}
-	log_err( _("Bad Extended Attribute at block #%"PRIu64
-		   " (0x%" PRIx64 ") removed.\n"),
-		 leaf_bh->b_blocknr, leaf_bh->b_blocknr);
+	log_err( _("Bad Extended Attribute at block #%llu"
+		   " (0x%llx) removed.\n"),
+		 (unsigned long long)leaf_bh->b_blocknr,
+		 (unsigned long long)leaf_bh->b_blocknr);
 	bmodified(leaf_bh);
 	return 0;
 }
@@ -146,7 +147,7 @@ static int check_eattr_entry(struct gfs2_inode *ip,
 	uint32_t max_size = sdp->sd_sb.sb_bsize;
 
 	if(!ea_hdr->ea_name_len){
-		log_err( _("EA has name length == 0\n"));
+		log_err( _("EA has name length of zero\n"));
 		return ask_remove_eattr_entry(sdp, leaf_bh, ea_hdr,
 					      ea_hdr_prev, 1, 1);
 	}
@@ -162,7 +163,7 @@ static int check_eattr_entry(struct gfs2_inode *ip,
 					      ea_hdr_prev, 0, 0);
 	}
 	if(!ea_hdr->ea_name_len){
-		log_err( _("EA has name length == 0\n"));
+		log_err( _("EA has name length of zero\n"));
 		return ask_remove_eattr_entry(sdp, leaf_bh, ea_hdr,
 					      ea_hdr_prev, 0, 0);
 	}
@@ -247,8 +248,9 @@ int pass1c(struct gfs2_sbd *sbp)
 			return FSCK_OK;
 		bh = bread(sbp, block_no);
 		if (!gfs2_check_meta(bh, GFS2_METATYPE_DI)) { /* if a dinode */
-			log_info( _("EA in inode %"PRIu64" (0x%" PRIx64 ")\n"),
-				 block_no, block_no);
+			log_info( _("EA in inode %llu (0x%llx)\n"),
+				 (unsigned long long)block_no,
+				 (unsigned long long)block_no);
 			gfs2_special_clear(&sbp->eattr_blocks, block_no);
 			ip = fsck_inode_get(sbp, bh);
 			ip->bh_owned = 1;
diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c
index dc7c91d..42aa588 100644
--- a/gfs2/fsck/pass2.c
+++ b/gfs2/fsck/pass2.c
@@ -27,21 +27,25 @@ static int set_parent_dir(struct gfs2_sbd *sbp, uint64_t childblock,
 
 	di = dirtree_find(childblock);
 	if(!di) {
-		log_err( _("Unable to find block %"PRIu64" (0x%" PRIx64
-			   ") in dir_info list\n"), childblock, childblock);
+		log_err( _("Unable to find block %llu (0x%llx"
+			   ") in dir_info list\n"),
+			(unsigned long long)childblock,
+			(unsigned long long)childblock);
 		return -1;
 	}
 
 	if(di->dinode == childblock) {
 		if (di->treewalk_parent) {
-			log_err( _("Another directory at block %" PRIu64
-				   " (0x%" PRIx64 ") already contains this "
-				   "child %lld (%llx) - checking parent %"
-				   PRIu64 " (0x%" PRIx64 ")\n"),
-				 di->treewalk_parent, di->treewalk_parent,
+			log_err( _("Another directory at block %llu"
+				   " (0x%llx) already contains this "
+				   "child %llu (%llx) - checking parent %llu"
+				   " (0x%llx)\n"),
+				 (unsigned long long)di->treewalk_parent,
+				 (unsigned long long)di->treewalk_parent,
 				 (unsigned long long)childblock,
 				 (unsigned long long)childblock,
-				 parentblock, parentblock);
+				 (unsigned long long)parentblock,
+				 (unsigned long long)parentblock);
 			return 1;
 		}
 		log_debug( _("Child %lld (0x%llx) has parent %lld (0x%llx)\n"),
@@ -70,16 +74,21 @@ static int set_dotdot_dir(struct gfs2_sbd *sbp, uint64_t childblock,
 			   != di->dinode) {
 				/* This should never happen */
 				log_crit( _("Dotdot parent already set for"
-						 " block %"PRIu64" (0x%" PRIx64 ") -> %" PRIu64
-						 " (0x%" PRIx64 ")\n"), childblock, childblock,
-						 di->dotdot_parent, di->dotdot_parent);
+					    " block %llu (0x%llx) -> %llu"
+					    " (0x%llx)\n"),
+					 (unsigned long long)childblock,
+					 (unsigned long long)childblock,
+					 (unsigned long long)di->dotdot_parent,
+					 (unsigned long long)di->dotdot_parent);
 				return -1;
 			}
 			di->dotdot_parent = parentblock;
 		}
 	} else {
-		log_err( _("Unable to find block %"PRIu64" (0x%" PRIx64
-				") in dir_info list\n"), childblock, childblock);
+		log_err( _("Unable to find block %llu (0x%llx"
+			   ") in dir_info list\n"),
+			(unsigned long long)childblock,
+			(unsigned long long)childblock);
 		return -1;
 	}
 
@@ -478,8 +487,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent,
 	/*log_debug( _("Found plain directory dentry\n"));*/
 	error = set_parent_dir(sbp, entryblock, ip->i_di.di_num.no_addr);
 	if(error > 0) {
-		log_err( _("%s: Hard link to block %" PRIu64" (0x%" PRIx64
-			   ") detected.\n"), tmp_name, entryblock, entryblock);
+		log_err( _("%s: Hard link to block %llu (0x%llx"
+			   ") detected.\n"), tmp_name,
+			(unsigned long long)entryblock,
+			(unsigned long long)entryblock);
 
 		if(query( _("Clear hard link to directory? (y/n) ")))
 			goto nuke_dentry;
@@ -684,8 +695,8 @@ int pass2(struct gfs2_sbd *sbp)
 		if(q != gfs2_inode_dir)
 			continue;
 
-		log_debug( _("Checking directory inode at block %"PRIu64" (0x%"
-				  PRIx64 ")\n"), dirblk, dirblk);
+		log_debug( _("Checking directory inode at block %llu (0x%llx)\n"),
+			  (unsigned long long)dirblk, (unsigned long long)dirblk);
 
 		memset(&ds, 0, sizeof(ds));
 		pass2_fxns.private = (void *) &ds;
@@ -714,10 +725,12 @@ int pass2(struct gfs2_sbd *sbp)
 				return FSCK_ERROR;
 			}
 			if(query( _("Remove directory entry for bad"
-				    " inode %"PRIu64" (0x%" PRIx64 ") in %"PRIu64
-				    " (0x%" PRIx64 ")? (y/n)"), dirblk,
-				  dirblk, di->treewalk_parent,
-				  di->treewalk_parent)) {
+				    " inode %llu (0x%llx) in %llu"
+				    " (0x%llx)? (y/n)"),
+				  (unsigned long long)dirblk,
+				  (unsigned long long)dirblk,
+				  (unsigned long long)di->treewalk_parent,
+				  (unsigned long long)di->treewalk_parent)) {
 				error = remove_dentry_from_dir(sbp, di->treewalk_parent,
 							       dirblk);
 				if(error < 0) {
@@ -725,12 +738,13 @@ int pass2(struct gfs2_sbd *sbp)
 					return FSCK_ERROR;
 				}
 				if(error > 0) {
-					log_warn( _("Unable to find dentry for %"
-						    PRIu64 " (0x%" PRIx64 ") in %" PRIu64
-						    " (0x%" PRIx64 ")\n"),
-						  dirblk, dirblk,
-						  di->treewalk_parent,
-						  di->treewalk_parent);
+					log_warn( _("Unable to find dentry for %llu"
+						    " (0x%llx) in %llu"
+						    " (0x%llx)\n"),
+						  (unsigned long long)dirblk,
+						  (unsigned long long)dirblk,
+						  (unsigned long long)di->treewalk_parent,
+						  (unsigned long long)di->treewalk_parent);
 				}
 				log_warn( _("Directory entry removed\n"));
 			} else
@@ -747,8 +761,9 @@ int pass2(struct gfs2_sbd *sbp)
 		ip = fsck_load_inode(sbp, dirblk);
 		if(!ds.dotdir) {
 			log_err(_("No '.' entry found for directory inode at "
-				  "block %"PRIu64" (0x%" PRIx64 ")\n"),
-				dirblk, dirblk);
+				  "block %llu (0x%llx)\n"),
+				(unsigned long long)dirblk,
+				(unsigned long long)dirblk);
 
 			if (query( _("Is it okay to add '.' entry? (y/n) "))) {
 				uint64_t cur_blks;
diff --git a/gfs2/fsck/pass3.c b/gfs2/fsck/pass3.c
index 50b15da..6c6099c 100644
--- a/gfs2/fsck/pass3.c
+++ b/gfs2/fsck/pass3.c
@@ -82,12 +82,15 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sbp,
 		return NULL;
 
 	if(di->dotdot_parent != di->treewalk_parent) {
-		log_warn( _("Directory '..' and treewalk connections disagree for inode %"
-				 PRIu64 " (0x%" PRIx64 ")\n"), di->dinode, di->dinode);
-		log_notice( _("'..' has %" PRIu64" (0x%" PRIx64 "), treewalk has %"
-				   PRIu64" (0x%" PRIx64 ")\n"), di->dotdot_parent,
-				   di->dotdot_parent, di->treewalk_parent,
-				   di->treewalk_parent);
+		log_warn( _("Directory '..' and treewalk connections disagree for inode %llu"
+				 " (0x%llx)\n"), (unsigned long long)di->dinode,
+			(unsigned long long)di->dinode);
+		log_notice( _("'..' has %llu (0x%llx), treewalk has %llu"
+			      " (0x%llx)\n"),
+			   (unsigned long long)di->dotdot_parent,
+			   (unsigned long long)di->dotdot_parent,
+			   (unsigned long long)di->treewalk_parent,
+			   (unsigned long long)di->treewalk_parent);
 		q_dotdot = block_type(di->dotdot_parent);
 		q_treewalk = block_type(di->treewalk_parent);
 		/* if the dotdot entry isn't a directory, but the
@@ -104,8 +107,9 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sbp,
 			}
 			else {
 				log_warn( _("Treewalk parent is correct,"
-						 " fixing dotdot -> %"PRIu64" (0x%" PRIx64 ")\n"),
-						 di->treewalk_parent, di->treewalk_parent);
+					    " fixing dotdot -> %llu (0x%llx)\n"),
+					 (unsigned long long)di->treewalk_parent,
+					 (unsigned long long)di->treewalk_parent);
 				attach_dotdot_to(sbp, di->treewalk_parent,
 								 di->dotdot_parent, di->dinode);
 				di->dotdot_parent = di->treewalk_parent;
@@ -119,9 +123,12 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sbp,
 				/* FIXME: add a dinode for this entry instead? */
 
 				if(query( _("Remove directory entry for bad"
-					    " inode %"PRIu64" (0x%" PRIx64 ") in %"PRIu64
-					    " (0x%" PRIx64 ")? (y/n)"), di->dinode, di->dinode,
-					  di->treewalk_parent, di->treewalk_parent)) {
+					    " inode %llu (0x%llx) in %llu"
+					    " (0x%llx)? (y/n)"),
+					(unsigned long long)di->dinode,
+					(unsigned long long)di->dinode,
+					(unsigned long long)di->treewalk_parent,
+					(unsigned long long)di->treewalk_parent)) {
 					error = remove_dentry_from_dir(sbp, di->treewalk_parent,
 												   di->dinode);
 					if(error < 0) {
@@ -129,10 +136,12 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sbp,
 						return NULL;
 					}
 					if(error > 0) {
-						log_warn( _("Unable to find dentry for block %"
-								 PRIu64" (0x%" PRIx64 ") in %" PRIu64 " (0x%"
-								 PRIx64 ")\n"),di->dinode, di->dinode,
-								 di->treewalk_parent, di->treewalk_parent);
+						log_warn( _("Unable to find dentry for block %llu"
+							" (0x%llx) in %llu (0x%llx)\n"),
+							 (unsigned long long)di->dinode,
+							(unsigned long long)di->dinode,
+							(unsigned long long)di->treewalk_parent,
+							(unsigned long long)di->treewalk_parent);
 					}
 					log_warn( _("Directory entry removed\n"));
 				} else {
@@ -156,8 +165,9 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sbp,
 	else {
 		q_dotdot = block_type(di->dotdot_parent);
 		if(q_dotdot != gfs2_inode_dir) {
-			log_err( _("Orphaned directory at block %" PRIu64 " (0x%" PRIx64
-					") moved to lost+found\n"), di->dinode, di->dinode);
+			log_err( _("Orphaned directory at block %llu (0x%llx) moved to lost+found\n"),
+				(unsigned long long)di->dinode,
+				(unsigned long long)di->dinode);
 			return NULL;
 		}
 	}
@@ -207,9 +217,9 @@ int pass3(struct gfs2_sbd *sbp)
 			tdi = mark_and_return_parent(sbp, di);
 
 			if (tdi) {
-				log_debug( _("Directory at block %" PRIu64
-					     " (0x%" PRIx64 ") connected\n"),
-					   di->dinode, di->dinode);
+				log_debug( _("Directory at block %llu (0x%llx) connected\n"),
+					   (unsigned long long)di->dinode,
+					   (unsigned long long)di->dinode);
 				di = tdi;
 				continue;
 			}
@@ -261,9 +271,9 @@ int pass3(struct gfs2_sbd *sbp)
 				break;
 			}
 
-			log_err( _("Found unlinked directory at block %" PRIu64
-				   " (0x%" PRIx64 ")\n"), di->dinode,
-				 di->dinode);
+			log_err( _("Found unlinked directory at block %llu"
+				   " (0x%llx)\n"), (unsigned long long)di->dinode,
+				 (unsigned long long)di->dinode);
 			ip = fsck_load_inode(sbp, di->dinode);
 			/* Don't skip zero size directories with eattrs */
 			if(!ip->i_di.di_size && !ip->i_di.di_eattr){
diff --git a/gfs2/fsck/pass4.c b/gfs2/fsck/pass4.c
index da98523..9233ea7 100644
--- a/gfs2/fsck/pass4.c
+++ b/gfs2/fsck/pass4.c
@@ -59,8 +59,9 @@ static int scan_inode_list(struct gfs2_sbd *sbp) {
 			exit(FSCK_ERROR);
 		}
 		if(ii->counted_links == 0) {
-			log_err( _("Found unlinked inode at %" PRIu64 " (0x%" PRIx64 ")\n"),
-					ii->inode, ii->inode);
+			log_err( _("Found unlinked inode at %llu (0x%llx)\n"),
+				(unsigned long long)ii->inode,
+				(unsigned long long)ii->inode);
 			q = block_type(ii->inode);
 			if(q == gfs2_bad_block) {
 				log_err( _("Unlinked inode %llu (0x%llx) contains"
@@ -142,29 +143,35 @@ static int scan_inode_list(struct gfs2_sbd *sbp) {
 			fsck_inode_put(&ip);
 		} /* if(ii->counted_links == 0) */
 		else if(ii->link_count != ii->counted_links) {
-			log_err( _("Link count inconsistent for inode %" PRIu64
-					" (0x%" PRIx64 ") has %u but fsck found %u.\n"), ii->inode, 
-					ii->inode, ii->link_count, ii->counted_links);
+			log_err( _("Link count inconsistent for inode %llu"
+				" (0x%llx) has %u but fsck found %u.\n"),
+				(unsigned long long)ii->inode, 
+				(unsigned long long)ii->inode, ii->link_count,
+				ii->counted_links);
 			/* Read in the inode, adjust the link count,
 			 * and write it back out */
-			if(query( _("Update link count for inode %" PRIu64
-				    " (0x%" PRIx64 ") ? (y/n) "),
-				  ii->inode, ii->inode)) {
+			if(query( _("Update link count for inode %llu"
+				    " (0x%llx) ? (y/n) "),
+				  (unsigned long long)ii->inode,
+				  (unsigned long long)ii->inode)) {
 				ip = fsck_load_inode(sbp, ii->inode); /* bread, inode_get */
 				fix_link_count(ii, ip);
 				ii->link_count = ii->counted_links;
 				fsck_inode_put(&ip); /* out, brelse, free */
 				log_warn( _("Link count updated to %d for "
-					    "inode %" PRIu64 " (0x%"
-					    PRIx64 ") \n"), ii->link_count,
-					  ii->inode, ii->inode);
+					    "inode %llu (0x%llx)\n"),
+					ii->link_count,
+					(unsigned long long)ii->inode,
+					(unsigned long long)ii->inode);
 			} else {
-				log_err( _("Link count for inode %" PRIu64 " (0x%" PRIx64
-						") still incorrect\n"), ii->inode, ii->inode);
+				log_err( _("Link count for inode %llu (0x%llx) still incorrect\n"),
+					(unsigned long long)ii->inode,
+					(unsigned long long)ii->inode);
 			}
 		}
-		log_debug( _("block %" PRIu64 " (0x%" PRIx64 ") has link count %d\n"),
-				  ii->inode, ii->inode, ii->link_count);
+		log_debug( _("block %llu (0x%llx) has link count %d\n"),
+			 (unsigned long long)ii->inode,
+			 (unsigned long long)ii->inode, ii->link_count);
 	} /* osi_list_foreach(tmp, list) */
 
 	if (lf_addition) {
diff --git a/gfs2/fsck/pass5.c b/gfs2/fsck/pass5.c
index df90d5e..685aa77 100644
--- a/gfs2/fsck/pass5.c
+++ b/gfs2/fsck/pass5.c
@@ -98,32 +98,36 @@ static int check_block_status(struct gfs2_sbd *sbp, char *buffer, unsigned int b
 						(unsigned long long)block,
 						(unsigned long long)block);
 			} else {
-				log_info( _("Unlinked block found at block %"
-					    PRIu64" (0x%" PRIx64 "), left "
-					    "unchanged.\n"), block, block);
+				log_info( _("Unlinked block found at block %llu"
+					    " (0x%llx), left unchanged.\n"),
+					(unsigned long long)block,
+					(unsigned long long)block);
 			}
 		} else if (rg_status != block_status) {
 			const char *blockstatus[] = {"Free", "Data",
 						     "Unlinked", "inode"};
 
 			log_err( _("Ondisk and fsck bitmaps differ at"
-					" block %"PRIu64" (0x%" PRIx64 ") \n"), block, block);
+					" block %llu (0x%llx) \n"),
+				(unsigned long long)block,
+				(unsigned long long)block);
 			log_err( _("Ondisk status is %u (%s) but FSCK thinks it should be "),
 					rg_status, blockstatus[rg_status]);
 			log_err("%u (%s)\n", block_status, blockstatus[block_status]);
 			log_err( _("Metadata type is %u (%s)\n"), q,
 					block_type_string(q));
 
-			if(query(_("Fix bitmap for block %" PRIu64
-				   " (0x%" PRIx64 ") ? (y/n) "),
-				 block, block)) {
+			if(query(_("Fix bitmap for block %llu (0x%llx) ? (y/n) "),
+				 (unsigned long long)block,
+				 (unsigned long long)block)) {
 				if(gfs2_set_bitmap(sbp, block, block_status))
 					log_err( _("Failed.\n"));
 				else
 					log_err( _("Succeeded.\n"));
 			} else
-				log_err( _("Bitmap at block %"PRIu64" (0x%" PRIx64
-						") left inconsistent\n"), block, block);
+				log_err( _("Bitmap at block %llu (0x%llx) left inconsistent\n"),
+					(unsigned long long)block,
+					(unsigned long long)block);
 		}
 		(*rg_block)++;
 		bit += GFS2_BIT_SIZE;
@@ -204,7 +208,7 @@ int pass5(struct gfs2_sbd *sbp)
 	for(tmp = sbp->rglist.next; tmp != &sbp->rglist; tmp = tmp->next){
 		if (skip_this_pass || fsck_abort) /* if asked to skip the rest */
 			return FSCK_OK;
-		log_info( _("Verifying Resource Group #%" PRIu64 "\n"), rg_count);
+		log_info( _("Verifying Resource Group #%llu\n"), (unsigned long long)rg_count);
 		memset(count, 0, sizeof(count));
 		rgp = osi_list_entry(tmp, struct rgrp_list, list);
 
diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index 5c82ebc..ee062dc 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -19,11 +19,11 @@ struct special_blocks false_rgrps;
 
 #define ri_equal(ondisk, expected, field) (ondisk.field == expected.field)
 
-#define ri_compare(rg, ondisk, expected, field, fmt)	\
+#define ri_compare(rg, ondisk, expected, field, fmt, type)	\
 	if (ondisk.field != expected.field) { \
 		log_warn( _("rindex #%d " #field " discrepancy: index 0x%" \
 			    fmt	" != expected: 0x%" fmt "\n"),		\
-			  rg + 1, ondisk.field, expected.field);	\
+			  rg + 1, (type)ondisk.field, (type)expected.field);	\
 		ondisk.field = expected.field;				\
 		rindex_modified = TRUE;					\
 	}
@@ -58,8 +58,8 @@ static void find_journaled_rgs(struct gfs2_sbd *sdp)
 				break;
 			bh = bread(sdp, dblock);
 			if (!gfs2_check_meta(bh, GFS2_METATYPE_RG)) {
-				log_debug( _("False RG found at block "
-					  "0x%" PRIx64 "\n"), dblock);
+				log_debug( _("False RG found at block 0x%llx\n"),
+					  (unsigned long long)dblock);
 				gfs2_special_set(&false_rgrps, dblock);
 			}
 			brelse(bh);
@@ -134,7 +134,7 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 		if (((blk == sdp->sb_addr + 1) ||
 		    (!gfs2_check_meta(bh, GFS2_METATYPE_RG))) &&
 		    !is_false_rg(blk)) {
-			log_debug( _("RG found at block 0x%" PRIx64 "\n"), blk);
+			log_debug( _("RG found at block 0x%llx\n"), (unsigned long long)blk);
 			if (blk > sdp->sb_addr + 1) {
 				uint64_t rgdist;
 				
@@ -174,9 +174,9 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 	/* first_rg_dist would measure from #1 to #3, which would be bad. */
 	/* We need to take remedial measures to fix it (from the index).  */
 	/* -------------------------------------------------------------- */
-	log_debug( _("First RG distance: 0x%" PRIx64 "\n"), first_rg_dist);
-	log_debug( _("Distance between RGs: 0x%" PRIx64 "\n"),
-		  shortest_dist_btwn_rgs);
+	log_debug( _("First RG distance: 0x%llx\n"), (unsigned long long)first_rg_dist);
+	log_debug( _("Distance between RGs: 0x%llx\n"),
+		  (unsigned long long)shortest_dist_btwn_rgs);
 	if (first_rg_dist >= shortest_dist_btwn_rgs +
 	    (shortest_dist_btwn_rgs / 4)) {
 		/* read in the second RG index entry for this subd. */
@@ -187,17 +187,17 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 		if (tmpndx.ri_addr > sdp->sb_addr + 1) { /* sanity check */
 			log_warn( _("RG 2 is damaged: getting dist from index: "));
 			first_rg_dist = tmpndx.ri_addr - (sdp->sb_addr + 1);
-			log_warn("0x%" PRIx64 "\n", first_rg_dist);
+			log_warn("0x%llx\n", (unsigned long long)first_rg_dist);
 		}
 		else {
 			log_warn( _("RG index 2 is damaged: extrapolating dist: "));
 			first_rg_dist = sdp->device.length -
 				(sdp->rgrps - 1) *
 				(sdp->device.length / sdp->rgrps);
-			log_warn("0x%" PRIx64 "\n", first_rg_dist);
+			log_warn("0x%llx\n", (unsigned long long)first_rg_dist);
 		}
-		log_debug( _("Adjusted first RG distance: 0x%" PRIx64 "\n"),
-			  first_rg_dist);
+		log_debug( _("Adjusted first RG distance: 0x%llx\n"),
+			  (unsigned long long)first_rg_dist);
 	} /* if first RG distance is within tolerance */
 	/* -------------------------------------------------------------- */
 	/* Now go through the RGs and verify their integrity, fixing as   */
@@ -207,7 +207,7 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 	block_bump = first_rg_dist;
 	for (blk = sdp->sb_addr + 1; blk <= sdp->device.length;
 	     blk += block_bump) {
-		log_debug( _("Block 0x%" PRIx64 "\n"), blk);
+		log_debug( _("Block 0x%llx\n"), (unsigned long long)blk);
 		bh = bread(sdp, blk);
 		rg_was_fnd = (!gfs2_check_meta(bh, GFS2_METATYPE_RG));
 		brelse(bh);
@@ -227,9 +227,9 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 			/* ------------------------------------------------- */
 			corrupt_rgs++;
 			if (corrupt_rgs < 5)
-				log_debug( _("Missing or damaged RG at block %" 
-					  PRIu64 " (0x%" PRIx64 ")\n"),
-					  blk, blk);
+				log_debug( _("Missing or damaged RG at block %llu" 
+					     " (0x%llx)\n"),
+					  (unsigned long long)blk, (unsigned long long)blk);
 			else {
 				log_crit( _("Error: too many bad RGs.\n"));
 				return -1;
@@ -267,12 +267,13 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 				GFS2_NBBY;
 			prev_rgd->ri.ri_bitbytes = prev_rgd->ri.ri_data /
 				GFS2_NBBY;
-			log_debug( _("Prev ri_data set to: %" PRIx32 ".\n"),
-				  prev_rgd->ri.ri_data);
+			log_debug( _("Prev ri_data set to: %lx.\n"),
+				  (unsigned long)prev_rgd->ri.ri_data);
 		}
 		number_of_rgs++;
-		log_warn( _("%c RG %d at block 0x%" PRIX64 " %s"),
-			 (rg_was_fnd ? ' ' : '*'), number_of_rgs, blk,
+		log_warn( _("%c RG %d at block 0x%llX %s"),
+			 (rg_was_fnd ? ' ' : '*'), number_of_rgs,
+			 (unsigned long long)blk,
 			 (rg_was_fnd ? "intact" : "*** DAMAGED ***"));
 		prev_rgd = calc_rgd;
 		block_of_last_rg = blk;
@@ -282,7 +283,7 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 		else
 			block_bump = shortest_dist_btwn_rgs;
 		if (block_bump != 1)
-			log_warn( _(" [length 0x%" PRIx64 "]\n"), block_bump);
+			log_warn( _(" [length 0x%llx]\n"), (unsigned long long)block_bump);
 	} /* for each rg block */
 	/* ----------------------------------------------------------------- */
 	/* If we got to the end of the fs, we still need to fix the          */
@@ -298,8 +299,8 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 		prev_rgd->ri.ri_data = rgblocks;
 		prev_rgd->ri.ri_data -= prev_rgd->ri.ri_data % GFS2_NBBY;
 		prev_rgd->ri.ri_bitbytes = prev_rgd->ri.ri_data / GFS2_NBBY;
-		log_debug( _("Prev ri_data set to: %" PRIx32 ".\n"),
-			  prev_rgd->ri.ri_data);
+		log_debug( _("Prev ri_data set to: %lx.\n"),
+			  (unsigned long)prev_rgd->ri.ri_data);
 		prev_rgd = NULL; /* make sure we don't use it later */
 	}
         /* ---------------------------------------------- */
@@ -343,8 +344,8 @@ static int gfs2_rindex_calculate(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 		exit(-1);
 	}
 	if (fix_device_geometry(sdp)) {
-		fprintf(stderr, _("Device is too small (%"PRIu64" bytes)\n"),
-				sdp->device.length << GFS2_BASIC_BLOCK_SHIFT);
+		fprintf(stderr, _("Device is too small (%llu bytes)\n"),
+				(unsigned long long)sdp->device.length << GFS2_BASIC_BLOCK_SHIFT);
 		exit(-1);
 	}
 
@@ -352,8 +353,8 @@ static int gfs2_rindex_calculate(struct gfs2_sbd *sdp, osi_list_t *ret_list,
 	compute_rgrp_layout(sdp, FALSE);
 	build_rgrps(sdp, FALSE); /* FALSE = calc but don't write to disk. */
 	*num_rgs = 0;
-	log_debug( _("fs_total_size = 0x%" PRIX64 " blocks.\n"),
-		  sdp->device.length);
+	log_debug( _("fs_total_size = 0x%llX blocks.\n"),
+		  (unsigned long long)sdp->device.length);
 	/* ----------------------------------------------------------------- */
 	/* Calculate how many RGs there are supposed to be based on the      */
 	/* rindex filesize.  Remember that our trust level is open-minded    */
@@ -552,11 +553,11 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane)
 
 		expected = osi_list_entry(exp, struct rgrp_list, list);
 		actual = osi_list_entry(act, struct rgrp_list, list);
-		ri_compare(rg, actual->ri, expected->ri, ri_addr, "llx");
-		ri_compare(rg, actual->ri, expected->ri, ri_length, PRIx32);
-		ri_compare(rg, actual->ri, expected->ri, ri_data0, "llx");
-		ri_compare(rg, actual->ri, expected->ri, ri_data, PRIx32);
-		ri_compare(rg, actual->ri, expected->ri, ri_bitbytes, PRIx32);
+		ri_compare(rg, actual->ri, expected->ri, ri_addr, "llx", unsigned long long);
+		ri_compare(rg, actual->ri, expected->ri, ri_length, "lx", unsigned long);
+		ri_compare(rg, actual->ri, expected->ri, ri_data0, "llx", unsigned long long);
+		ri_compare(rg, actual->ri, expected->ri, ri_data, "lx", unsigned long);
+		ri_compare(rg, actual->ri, expected->ri, ri_bitbytes, "lx", unsigned long);
 		/* If we modified the index, write it back to disk. */
 		if (rindex_modified) {
 			if (query( _("Fix the index? (y/n)"))) {
diff --git a/gfs2/fsck/util.c b/gfs2/fsck/util.c
index 577dba9..f0f23db 100644
--- a/gfs2/fsck/util.c
+++ b/gfs2/fsck/util.c
@@ -75,7 +75,8 @@ void warm_fuzzy_stuff(uint64_t block)
 			seconds = tv.tv_sec;
 			if (last_fs_block) {
 				percent = (block * 100) / last_fs_block;
-				log_notice( _("\r%" PRIu64 " percent complete.\r"), percent);
+				log_notice( _("\r%llu percent complete.\r"),
+					   (unsigned long long)percent);
 				fflush(stdout);
 			}
 		}
diff --git a/gfs2/mkfs/main.c b/gfs2/mkfs/main.c
index 17b5fd4..c0be01e 100644
--- a/gfs2/mkfs/main.c
+++ b/gfs2/mkfs/main.c
@@ -48,7 +48,7 @@ main(int argc, char *argv[])
 	else if (!strcmp(whoami, "gfs2_grow"))
 		main_grow(argc, argv);
 	else
-		die( _("I don't know who I am!\n"));
+		die( _("Unknown mode\n"));
 
 	free(p);
 
diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c
index d38d34e..21f7f7a 100644
--- a/gfs2/mkfs/main_grow.c
+++ b/gfs2/mkfs/main_grow.c
@@ -74,7 +74,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp)
 		case 'V':
 			printf("%s %s (built %s %s)\n", argv[0],
 			       VERSION, __DATE__, __TIME__);
-			printf( _(REDHAT_COPYRIGHT "\n"));
+			printf(REDHAT_COPYRIGHT "\n");
 			exit(0);
 		case 'h':
 			usage();
@@ -96,8 +96,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp)
 			fprintf(stderr, _("Please use '-h' for usage.\n"));
 			exit(EXIT_FAILURE);
 		default:
-			fprintf(stderr, _("Bad programmer! You forgot"
-				" to catch the %c flag\n"), opt);
+			fprintf(stderr, _("Unknown option %c\n"), opt);
 			exit(EXIT_FAILURE);
 			break;
 		}
@@ -197,7 +196,7 @@ static void fix_rindex(struct gfs2_sbd *sdp, int rindex_fd, int old_rg_count)
 	writelen = rg * sizeof(struct gfs2_rindex);
 	buf = calloc(1, writelen);
 	if (buf == NULL) {
-		fprintf(stderr, _("Out of memory in %s\n"), __FUNCTION__);
+		perror(__FUNCTION__);
 		exit(-1);
 	}
 	/* Now add the new rg entries to the rg index.  Here we     */
@@ -260,13 +259,14 @@ static void print_info(struct gfs2_sbd *sdp)
 {
 	log_notice("FS: Mount Point: %s\n", sdp->path_name);
 	log_notice("FS: Device:      %s\n", sdp->device_name);
-	log_notice("FS: Size:        %" PRIu64 " (0x%" PRIx64 ")\n",
-		   fssize, fssize);
+	log_notice("FS: Size:        %llu (0x%llx)\n",
+		   (unsigned long long)fssize, (unsigned long long)fssize);
 	log_notice("FS: RG size:     %u (0x%x)\n", rgsize, rgsize);
-	log_notice("DEV: Size:       %"PRIu64" (0x%" PRIx64")\n",
-		   sdp->device.length, sdp->device.length);
-	log_notice("The file system grew by %" PRIu64 "MB.\n",
-		   fsgrowth / MB);
+	log_notice("DEV: Size:       %llu (0x%llx)\n",
+		   (unsigned long long)sdp->device.length,
+		   (unsigned long long)sdp->device.length);
+	log_notice("The file system grew by %lluMB.\n",
+		   (unsigned long long)fsgrowth / MB);
 }
 
 /**
@@ -330,8 +330,8 @@ main_grow(int argc, char *argv[])
 			die( _("gfs: Error reading superblock.\n"));
 
 		if (fix_device_geometry(sdp)) {
-			fprintf(stderr, _("Device is too small (%"PRIu64" bytes)\n"),
-				sdp->device.length << GFS2_BASIC_BLOCK_SHIFT);
+			fprintf(stderr, _("Device is too small (%llu bytes)\n"),
+				(unsigned long long)sdp->device.length << GFS2_BASIC_BLOCK_SHIFT);
 			exit(-1);
 		}
 
@@ -363,8 +363,8 @@ main_grow(int argc, char *argv[])
 		if (fsgrowth < rgsize * sdp->bsize) {
 			log_err( _("Error: The device has grown by less than "
 				"one Resource Group (RG).\n"));
-			log_err( _("The device grew by %" PRIu64 "MB.  "),
-				fsgrowth / MB);
+			log_err( _("The device grew by %lluMB. "),
+				(unsigned long long)fsgrowth / MB);
 			log_err( _("One RG is %uMB for this file system.\n"),
 				(rgsize * sdp->bsize) / MB);
 		}
diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c
index 35dab9a..5f65cce 100644
--- a/gfs2/mkfs/main_jadd.c
+++ b/gfs2/mkfs/main_jadd.c
@@ -121,7 +121,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp)
 		case 'V':
 			printf("gfs2_jadd %s (built %s %s)\n", VERSION,
 			       __DATE__, __TIME__);
-			printf( _(REDHAT_COPYRIGHT "\n"));
+			printf(REDHAT_COPYRIGHT "\n");
 			exit(0);
 			break;
 		case 'X':
@@ -136,7 +136,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp)
 			cont = FALSE;
 			break;
 		default:
-			die( _("unknown option: %c\n"), optchar);
+			die( _("Unknown option: %c\n"), optchar);
 			break;
 		};
 	}
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index 42c931f..719893b 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -142,7 +142,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp)
 		case 'V':
 			printf("gfs2_mkfs %s (built %s %s)\n", VERSION,
 			       __DATE__, __TIME__);
-			printf( _(REDHAT_COPYRIGHT "\n"));
+			printf(REDHAT_COPYRIGHT "\n");
 			exit(EXIT_SUCCESS);
 			break;
 
@@ -173,7 +173,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp)
 			break;
 
 		default:
-			die( _("unknown option: %c\n"), optchar);
+			die( _("Unknown option: %c\n"), optchar);
 			break;
 		};
 	}
@@ -501,15 +501,15 @@ print_results(struct gfs2_sbd *sdp, uint64_t real_device_size,
 	printf( _("Device:                    %s\n"), sdp->device_name);
 
 	printf( _("Blocksize:                 %u\n"), sdp->bsize);
-	printf( _("Device Size                %.2f GB (%"PRIu64" blocks)\n"),
+	printf( _("Device Size                %.2f GB (%llu blocks)\n"),
 	       real_device_size / ((float)(1 << 30)),
-	       real_device_size / sdp->bsize);
-	printf( _("Filesystem Size:           %.2f GB (%"PRIu64" blocks)\n"),
-	       sdp->fssize / ((float)(1 << 30)) * sdp->bsize, sdp->fssize);
-
+	       (unsigned long long)real_device_size / sdp->bsize);
+	printf( _("Filesystem Size:           %.2f GB (%llu blocks)\n"),
+	       sdp->fssize / ((float)(1 << 30)) * sdp->bsize,
+	       (unsigned long long)sdp->fssize);
 	printf( _("Journals:                  %u\n"), sdp->md.journals);
-	printf( _("Resource Groups:           %"PRIu64"\n"), sdp->rgrps);
-
+	printf( _("Resource Groups:           %llu\n"),
+	       (unsigned long long)sdp->rgrps);
 	printf( _("Locking Protocol:          \"%s\"\n"), sdp->lockproto);
 	printf( _("Lock Table:                \"%s\"\n"), sdp->locktable);
 
@@ -608,15 +608,15 @@ void main_mkfs(int argc, char *argv[])
 		if (sdp->orig_fssize > sdp->device.length) {
 			fprintf(stderr, _("%s: Specified block count is bigger "
 				"than the actual device.\n"), argv[0]);
-			die( _("Device Size is %.2f GB (%"PRIu64" blocks)\n"),
+			die( _("Device Size is %.2f GB (%llu blocks)\n"),
 			       real_device_size / ((float)(1 << 30)),
-			       real_device_size / sdp->bsize);
+			       (unsigned long long)real_device_size / sdp->bsize);
 		}
 		sdp->device.length = sdp->orig_fssize;
 	}
 	if (fix_device_geometry(sdp)) {
-		fprintf(stderr, _("Device is too small (%"PRIu64" bytes)\n"),
-				sdp->device.length << GFS2_BASIC_BLOCK_SHIFT);
+		fprintf(stderr, _("Device is too small (%llu bytes)\n"),
+			(unsigned long long)sdp->device.length << GFS2_BASIC_BLOCK_SHIFT);
 		exit(-1);
 	}
 
diff --git a/gfs2/quota/check.c b/gfs2/quota/check.c
index 707eeae..9afb0ad 100644
--- a/gfs2/quota/check.c
+++ b/gfs2/quota/check.c
@@ -329,9 +329,9 @@ do_compare(const char *type, osi_list_t *fs_list, osi_list_t *qf_list)
 				continue;
 
 			if (v1->v_blocks != v2->v_blocks) {
-				printf("mismatch: %s %u: scan = %"PRId64", quotafile = %"PRId64"\n",
+				printf("mismatch: %s %u: scan = %lld, quotafile = %lld\n",
 				       type, v1->v_id,
-				       v1->v_blocks, v2->v_blocks);
+				       (long long)v1->v_blocks, (long long)v2->v_blocks);
 				mismatch = TRUE;
 			}
 
@@ -343,9 +343,9 @@ do_compare(const char *type, osi_list_t *fs_list, osi_list_t *qf_list)
 		}
 
 		if (!found) {
-			printf("mismatch: %s %u: scan = %"PRId64", quotafile = %"PRId64"\n",
+			printf("mismatch: %s %u: scan = %lld, quotafile = %lld\n",
 			       type, v1->v_id,
-			       v1->v_blocks, (int64_t)0);
+			       (long long)v1->v_blocks, 0LL);
 			mismatch = TRUE;
 		}
 	}
@@ -353,9 +353,9 @@ do_compare(const char *type, osi_list_t *fs_list, osi_list_t *qf_list)
 	for (tmp2 = qf_list->next; tmp2 != qf_list; tmp2 = tmp2->next) {
 		v2 = osi_list_entry(tmp2, values_t, v_list);
 
-		printf("mismatch: %s %u: scan = %"PRId64", quotafile = %"PRId64"\n",
+		printf("mismatch: %s %u: scan = %lld, quotafile = %lld\n",
 		       type, v2->v_id,
-		       (int64_t)0, v2->v_blocks);
+		       0LL, (long long)v2->v_blocks);
 		mismatch = TRUE;
 	}
 
diff --git a/gfs2/tune/main.c b/gfs2/tune/main.c
index 7b4b53d..48fd59f 100644
--- a/gfs2/tune/main.c
+++ b/gfs2/tune/main.c
@@ -57,7 +57,7 @@ static void usage(char *name)
 
 static void version(void)
 {
-	printf("tunegfs2 (%s %s)\n"), __DATE__, __TIME__);
+	printf("tunegfs2 (%s %s)\n", __DATE__, __TIME__);
 }
 
 int main(int argc, char **argv)
diff --git a/po/gfs2-utils.pot b/po/gfs2-utils.pot
index 4572655..246adee 100644
--- a/po/gfs2-utils.pot
+++ b/po/gfs2-utils.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-02 13:23+0000\n"
+"POT-Creation-Date: 2010-12-03 14:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,610 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gfs2/mkfs/main.c:51
-msgid "I don't know who I am!\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:52
-#, c-format
-msgid ""
-"Usage:\n"
-"\n"
-"gfs2_grow [options] /path/to/filesystem\n"
-"\n"
-"Options:\n"
-"  -h               Usage information\n"
-"  -q               Quiet, reduce verbosity\n"
-"  -T               Test, do everything except update FS\n"
-"  -V               Version information\n"
-"  -v               Verbose, increase verbosity\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:77 gfs2/mkfs/main_jadd.c:124
-#: gfs2/mkfs/main_mkfs.c:145 gfs2/fsck/main.c:59
-#, c-format
-msgid "\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:86
-#, c-format
-msgid "(Test mode--File system will not be changed)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:96 gfs2/mkfs/main_jadd.c:132
-#: gfs2/mkfs/main_mkfs.c:155 gfs2/fsck/main.c:102 gfs2/fsck/main.c:114
-#, c-format
-msgid "Please use '-h' for usage.\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:99 gfs2/fsck/main.c:105
-#, c-format
-msgid "Bad programmer! You forgot to catch the %c flag\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:196
-#, c-format
-msgid "%d new rindex entries.\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:200
-#, c-format
-msgid "Out of memory in %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:305 gfs2/mkfs/main_jadd.c:503
-#, c-format
-msgid "Not a valid GFS2 mount point: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:314 gfs2/mkfs/main_mkfs.c:562
-#, c-format
-msgid "can't open device %s: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:317 gfs2/mkfs/main_mkfs.c:601
-#: gfs2/fsck/rgrepair.c:342
-#, c-format
-msgid "Geometry error\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:320 gfs2/fsck/initialize.c:998
-msgid "Initializing lists...\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:326 gfs2/mkfs/main_jadd.c:519
-#: gfs2/mkfs/main_mkfs.c:593 gfs2/fsck/initialize.c:1014
-#, c-format
-msgid "Bad constants (1)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:330
-msgid "gfs: Error reading superblock.\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:333 gfs2/mkfs/main_mkfs.c:618
-#: gfs2/fsck/rgrepair.c:346
-#, c-format
-msgid "Device is too small (%<PRIu64> bytes)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:339 gfs2/mkfs/main_jadd.c:513
-#, c-format
-msgid "Error mounting GFS2 metafs: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:348
-msgid "GFS2 rindex not found.  Please run gfs2_fsck.\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:364
-msgid "Error: The device has grown by less than one Resource Group (RG).\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:366
-#, c-format
-msgid "The device grew by %<PRIu64>MB.  "
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:368
-#, c-format
-msgid "One RG is %uMB for this file system.\n"
-msgstr ""
-
-#: gfs2/mkfs/main_grow.c:388
-msgid "gfs2_grow complete.\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:38
-#, c-format
-msgid "error doing get flags (%d): %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:45
-#, c-format
-msgid "error doing set flags (%d): %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:56
-msgid "rename2system (1)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:61
-msgid "rename2system (2)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:73
-#, c-format
-msgid ""
-"Usage:\n"
-"\n"
-"%s [options] /path/to/filesystem\n"
-"\n"
-"Options:\n"
-"\n"
-"  -c <MB>           Size of quota change file\n"
-"  -D                Enable debugging code\n"
-"  -h                Print this help, then exit\n"
-"  -J <MB>           Size of journals\n"
-"  -j <num>          Number of journals\n"
-"  -q                Don't print anything\n"
-"  -V                Print program version information, then exit\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:139 gfs2/mkfs/main_mkfs.c:176
-#, c-format
-msgid "unknown option: %c\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:148
-msgid "no path specified (try -h for help)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:151
-#, c-format
-msgid "Unrecognized option: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:154 gfs2/mkfs/main_mkfs.c:194
-#, c-format
-msgid "Command Line Arguments:\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:167 gfs2/mkfs/main_mkfs.c:316
-msgid "no journals specified\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:169 gfs2/mkfs/main_mkfs.c:319
-msgid "bad journal size\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:171 gfs2/mkfs/main_mkfs.c:325
-msgid "bad quota change size\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:191
-#, c-format
-msgid "Filesystem:            %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:192
-#, c-format
-msgid "Old Journals           %u\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:193
-#, c-format
-msgid "New Journals           %u\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:215
-#, c-format
-msgid "can't unlink %s: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:218
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:239 gfs2/mkfs/main_jadd.c:271
-#, c-format
-msgid "write error: %s from %s:%d: offset 0\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:251 gfs2/mkfs/main_jadd.c:283
-#: gfs2/mkfs/main_jadd.c:351 gfs2/mkfs/main_jadd.c:472
-#, c-format
-msgid "can't rename2system %s (%d): %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:310 gfs2/mkfs/main_jadd.c:330
-#: gfs2/mkfs/main_jadd.c:418 gfs2/mkfs/main_jadd.c:448
-#, c-format
-msgid "write error: %s from %s:%d: block %lld (0x%llx)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:342 gfs2/mkfs/main_jadd.c:463
-#, c-format
-msgid "can't fsync: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:360
-#, c-format
-msgid "Could not statfs the filesystem %s: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:377
-#, c-format
-msgid "Could not find the jindex directory in gfs2meta mount! error: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:390
-msgid "There are no journals for this gfs2 fs! Did you mkfs.gfs2 correctly?\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:498
-#, c-format
-msgid "can't open root directory %s: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:49
-#, c-format
-msgid ""
-"Usage:\n"
-"\n"
-"%s [options] <device> [ block-count ]\n"
-"\n"
-"Options:\n"
-"\n"
-"  -b <bytes>       Filesystem block size\n"
-"  -c <MB>          Size of quota change file\n"
-"  -D               Enable debugging code\n"
-"  -h               Print this help, then exit\n"
-"  -J <MB>          Size of journals\n"
-"  -j <num>         Number of journals\n"
-"  -O               Don't ask for confirmation\n"
-"  -p <name>        Name of the locking protocol\n"
-"  -q               Don't print anything\n"
-"  -r <MB>          Resource Group Size\n"
-"  -t <name>        Name of the lock table\n"
-"  -u <MB>          Size of unlinked file\n"
-"  -V               Print program version information, then exit\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:119
-#, c-format
-msgid "lock protocol name %s is too long\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:134
-#, c-format
-msgid "lock table name %s is too long\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:172
-msgid "More than one device specified (try -h for help)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:185
-msgid "no device specified (try -h for help)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:191
-#, c-format
-msgid "Unrecognized argument: %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:204
-#, c-format
-msgid "  rgsize = optimize for best performance\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:233
-msgid "locktable error: contains space characters\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:235
-msgid "locktable error: contains unprintable characters\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:240
-msgid "locktable error: missing colon in the locktable\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:243
-msgid "locktable error: missing cluster name\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:245
-msgid "locktable error: cluster name too long\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:249 gfs2/mkfs/main_mkfs.c:255
-msgid "locktable error: missing filesystem name\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:252
-msgid "locktable error: more than one colon present\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:257
-msgid "locktable error: filesystem name too long\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:259
-#, c-format
-msgid "lockproto error: %s unknown\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:275
-#, c-format
-msgid "block size must be a power of two between 512 and %d\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:279
-#, c-format
-msgid "Error: Block size %d is less than minimum logical block size (%d).\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:285
-#, c-format
-msgid ""
-"WARNING: Block size %d is inefficient because it is less than the physical "
-"block size (%d).\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:291 gfs2/mkfs/main_mkfs.c:443
-#, c-format
-msgid ""
-"\n"
-"Are you sure you want to proceed? [y/n] "
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:293 gfs2/mkfs/main_mkfs.c:445
-msgid "unable to read from stdin\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:296 gfs2/mkfs/main_mkfs.c:448
-msgid "aborted\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:309 gfs2/mkfs/main_mkfs.c:312
-msgid "bad resource group size\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:322
-msgid "bad unlinked size\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:410
-#, c-format
-msgid ""
-"Content of file or device unknown (do you have GNU fileutils installed?)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:414
-#, c-format
-msgid "It appears to contain: %s"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:439
-#, c-format
-msgid "Error: device %s not found.\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:440
-#, c-format
-msgid "This will destroy any data on %s.\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:465
-#, c-format
-msgid "could not stat device %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:467
-#, c-format
-msgid "%s is not a block device\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:473
-#, c-format
-msgid "device %s is busy\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:499
-#, c-format
-msgid "Expert mode:               on\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:501
-#, c-format
-msgid "Device:                    %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:503
-#, c-format
-msgid "Blocksize:                 %u\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:504
-#, c-format
-msgid "Device Size                %.2f GB (%<PRIu64> blocks)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:507
-#, c-format
-msgid "Filesystem Size:           %.2f GB (%<PRIu64> blocks)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:510
-#, c-format
-msgid "Journals:                  %u\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:511
-#, c-format
-msgid "Resource Groups:           %<PRIu64>\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:513
-#, c-format
-msgid "Locking Protocol:          \"%s\"\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:514
-#, c-format
-msgid "Lock Table:                \"%s\"\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:518
-#, c-format
-msgid "Writes:                    %u\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:521
-#, c-format
-msgid "UUID:                      %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:569
-#, c-format
-msgid "Device topology error\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:609
-#, c-format
-msgid "%s: Specified block count is bigger than the actual device.\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:611
-#, c-format
-msgid "Device Size is %.2f GB (%<PRIu64> blocks)\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:656
-#, c-format
-msgid "can't fsync device (%d): %s\n"
-msgstr ""
-
-#: gfs2/mkfs/main_mkfs.c:660
-#, c-format
-msgid "error closing device (%d): %s\n"
-msgstr ""
-
-#: gfs2/tune/main.c:91
-#, c-format
-msgid "Invalid option.\n"
-msgstr ""
-
-#: gfs2/tune/main.c:102
-#, c-format
-msgid "Unable to open device %s\n"
-msgstr ""
-
-#: gfs2/tune/super.c:65
-#, c-format
-msgid "Invalid UUID specified.\n"
-msgstr ""
-
-#: gfs2/tune/super.c:75
-#, c-format
-msgid "uuid %s has an invalid format."
-msgstr ""
-
-#: gfs2/tune/super.c:80
-#, c-format
-msgid "uuid %s has an invalid hex digit '%c' at offset %d.\n"
-msgstr ""
-
-#: gfs2/tune/super.c:99
-#, c-format
-msgid "Error reading from device"
-msgstr ""
-
-#: gfs2/tune/super.c:104
-#, c-format
-msgid "Not a GFS/GFS2 device\n"
-msgstr ""
-
-#: gfs2/tune/super.c:127
-#, c-format
-msgid "Filesystem volume name: %.*s\n"
-msgstr ""
-
-#: gfs2/tune/super.c:129
-#, c-format
-msgid "Filesystem UUID: %s\n"
-msgstr ""
-
-#: gfs2/tune/super.c:130
-#, c-format
-msgid "Filesystem magic number: 0x%X\n"
-msgstr ""
-
-#: gfs2/tune/super.c:131
-#, c-format
-msgid "Block size: %d\n"
-msgstr ""
-
-#: gfs2/tune/super.c:132
-#, c-format
-msgid "Block shift: %d\n"
-msgstr ""
-
-#: gfs2/tune/super.c:133
-#, c-format
-msgid "Root inode: %llu\n"
-msgstr ""
-
-#: gfs2/tune/super.c:135
-#, c-format
-msgid "Master inode: %llu\n"
-msgstr ""
-
-#: gfs2/tune/super.c:136
-#, c-format
-msgid "Lock Protocol: %.*s\n"
-msgstr ""
-
-#: gfs2/tune/super.c:138
-#, c-format
-msgid "Lock table: %.*s\n"
-msgstr ""
-
-#: gfs2/tune/super.c:148
-#, c-format
-msgid "Unable to write super block\n"
-msgstr ""
-
-#: gfs2/tune/super.c:166
-#, c-format
-msgid "Label too long\n"
-msgstr ""
-
-#: gfs2/tune/super.c:179
-#, c-format
-msgid "UUID can be changed for a GFS2"
-msgstr ""
-
-#: gfs2/tune/super.c:180
-#, c-format
-msgid " device only\n"
-msgstr ""
-
-#: gfs2/tune/super.c:195
-#, c-format
-msgid "Incorrect lock protocol specified\n"
-msgstr ""
-
-#: gfs2/tune/super.c:222
-#, c-format
-msgid "Lock table name too big\n"
-msgstr ""
-
-#: gfs2/fsck/eattr.c:42 gfs2/fsck/pass1b.c:304 gfs2/fsck/pass1.c:811
-#: gfs2/fsck/pass1c.c:196
+#: gfs2/fsck/eattr.c:42 gfs2/fsck/pass1b.c:305 gfs2/fsck/pass1.c:808
+#: gfs2/fsck/pass1c.c:197
 #, c-format
 msgid ""
 "  Pointers Required: %d\n"
@@ -787,7 +185,7 @@ msgstr ""
 msgid "jid=%u: journal not cleared.\n"
 msgstr ""
 
-#: gfs2/fsck/fs_recovery.c:582 gfs2/fsck/initialize.c:439
+#: gfs2/fsck/fs_recovery.c:582 gfs2/fsck/initialize.c:441
 msgid "Unable to read in jindex inode.\n"
 msgstr ""
 
@@ -821,389 +219,395 @@ msgstr ""
 
 #: gfs2/fsck/initialize.c:167
 #, c-format
-msgid "Can't seek to last block in file system: %<PRIu64> (0x%<PRIx64>)\n"
+msgid "Can't seek to last block in file system: %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:175
+#: gfs2/fsck/initialize.c:176
 #, c-format
 msgid ""
-"Can't read last block in file system (error %u), last_fs_block: %<PRIu64> (0x"
-"%<PRIx64>)\n"
+"Can't read last block in file system (error %u), last_fs_block: %llu (0x"
+"%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:235
+#: gfs2/fsck/initialize.c:237
 msgid "Okay to reclaim unlinked inodes? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:252
+#: gfs2/fsck/initialize.c:254
 #, c-format
 msgid ""
 "Error: resource group %lld (0x%llx): free space (%d) does not match bitmap "
 "(%d)\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:258
+#: gfs2/fsck/initialize.c:260
 #, c-format
 msgid "(%d blocks were reclaimed)\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:260
+#: gfs2/fsck/initialize.c:262
 msgid "Fix the rgrp free blocks count? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:264
+#: gfs2/fsck/initialize.c:266
 msgid "The rgrp was fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:266
+#: gfs2/fsck/initialize.c:268
 msgid "The rgrp was not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:291
+#: gfs2/fsck/initialize.c:293
 msgid "Checking the integrity of all resource groups.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:307
+#: gfs2/fsck/initialize.c:309
 #, c-format
 msgid "RGs: Consistent: %d   Inconsistent: %d   Fixed: %d   Total: %d\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:321
+#: gfs2/fsck/initialize.c:323
 msgid "The system master directory seems to be destroyed.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:322
+#: gfs2/fsck/initialize.c:324
 msgid "Okay to rebuild it? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:323
+#: gfs2/fsck/initialize.c:325
 msgid "System master not rebuilt; aborting.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:326
+#: gfs2/fsck/initialize.c:328
 msgid "Trying to rebuild the master directory.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:389
+#: gfs2/fsck/initialize.c:391
 msgid "Master directory rebuilt.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:412
+#: gfs2/fsck/initialize.c:414
 msgid "Initializing special inodes...\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:419
+#: gfs2/fsck/initialize.c:421
 msgid "The gfs2 system rindex inode is missing. Okay to rebuild it? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/initialize.c:432
+#: gfs2/fsck/initialize.c:434
 msgid "The gfs2 system jindex inode is missing. Okay to rebuild it? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/initialize.c:446
+#: gfs2/fsck/initialize.c:448
 msgid "Validating Resource Group index.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:448
+#: gfs2/fsck/initialize.c:450
 #, c-format
 msgid "Level %d RG check.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:451
+#: gfs2/fsck/initialize.c:453
 #, c-format
 msgid "(level %d passed)\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:455
+#: gfs2/fsck/initialize.c:457
 #, c-format
 msgid "(level %d failed)\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:458
+#: gfs2/fsck/initialize.c:460
 msgid "RG recovery impossible; I can't fix this file system.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:461
+#: gfs2/fsck/initialize.c:463
 #, c-format
 msgid "%u resource groups found.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:471
+#: gfs2/fsck/initialize.c:473
 msgid "The gfs2 system inum inode is missing. Okay to rebuild it? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/initialize.c:482
+#: gfs2/fsck/initialize.c:484
 msgid "The gfs2 system statfs inode is missing. Okay to rebuild it? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/initialize.c:486
+#: gfs2/fsck/initialize.c:488
 msgid "fsck.gfs2 cannot continue without a valid statfs file; aborting.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:500
+#: gfs2/fsck/initialize.c:502
 msgid "The gfs2 system quota inode is missing. Okay to rebuild it? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/initialize.c:507
+#: gfs2/fsck/initialize.c:509
 msgid ""
 "The gfs2 system per_node directory inode is missing. Okay to rebuild it? (y/"
 "n) "
 msgstr ""
 
-#: gfs2/fsck/initialize.c:517
+#: gfs2/fsck/initialize.c:519
 msgid "Unable to determine the boundaries of the file system.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:524
+#: gfs2/fsck/initialize.c:526
 msgid ""
-"This system doesn't have enough memory + swap space to fsck this file "
+"This system doesn't have enough memory and swap space to fsck this file "
 "system.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:525
+#: gfs2/fsck/initialize.c:527
 #, c-format
 msgid "Additional memory needed is approximately: %lluMB\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:527
+#: gfs2/fsck/initialize.c:529
 msgid ""
 "Please increase your swap space by that amount and run gfs2_fsck again.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:549
+#: gfs2/fsck/initialize.c:551
 msgid "Lock protocol determined to be: lock_nolock\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:550
+#: gfs2/fsck/initialize.c:552
 msgid "Stand-alone file system: No need for a lock table.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:555
+#: gfs2/fsck/initialize.c:557
 msgid "Lock protocol assumed to be: "
 msgstr ""
 
-#: gfs2/fsck/initialize.c:568
+#: gfs2/fsck/initialize.c:570
 msgid "Error: Unable to determine cluster name from /etc/cluster.conf\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:580
+#: gfs2/fsck/initialize.c:582
 #, c-format
 msgid "Lock table determined to be: %s\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:619
+#: gfs2/fsck/initialize.c:621
 #, c-format
 msgid "Found system master directory at: 0x%llx.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:628
+#: gfs2/fsck/initialize.c:630
 #, c-format
 msgid "Found system jindex file at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:640
+#: gfs2/fsck/initialize.c:642
 #, c-format
 msgid "Found system master directory at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:651
+#: gfs2/fsck/initialize.c:653
 #, c-format
 msgid "Found system per_node directory at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:658
+#: gfs2/fsck/initialize.c:660
 #, c-format
 msgid "From per_node's '..' I backtracked the master directory to: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:664
+#: gfs2/fsck/initialize.c:666
 #, c-format
 msgid "Unknown system directory at block 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:671
+#: gfs2/fsck/initialize.c:673
 #, c-format
 msgid "Found system inum file at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:677
+#: gfs2/fsck/initialize.c:679
 #, c-format
 msgid "Found system statfs file at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:683
+#: gfs2/fsck/initialize.c:685
 #, c-format
 msgid "Found system rindex file at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:691
+#: gfs2/fsck/initialize.c:693
 #, c-format
 msgid "Found system quota file at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:716
+#: gfs2/fsck/initialize.c:718
 #, c-format
 msgid "Found the root directory at: 0x%llx.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:721
+#: gfs2/fsck/initialize.c:723
 #, c-format
 msgid ""
 "The root dinode should be at block 0x%llx but it seems to be destroyed.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:724
+#: gfs2/fsck/initialize.c:726
 #, c-format
 msgid "Found a copy of the root directory in a journal at block: 0x%llx.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:727
+#: gfs2/fsck/initialize.c:729
 msgid "Do you want to replace the root dinode from the copy? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:729
+#: gfs2/fsck/initialize.c:731
 msgid "Damaged root dinode not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:736
+#: gfs2/fsck/initialize.c:738
 msgid "Root directory copied from the journal.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:744
+#: gfs2/fsck/initialize.c:746
 #, c-format
 msgid "fsck found the root inode at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:760
+#: gfs2/fsck/initialize.c:762
 #, c-format
 msgid "Found a possible root at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:814
+#: gfs2/fsck/initialize.c:816
 #, c-format
 msgid "boff:%d bsize2:%d rg:0x%llx, rb:0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:829
+#: gfs2/fsck/initialize.c:831
 #, c-format
 msgid "Block size determined to be: %d\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:859
+#: gfs2/fsck/initialize.c:861
 msgid "Found several gfs (version 1) dinodes; aborting.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:891
+#: gfs2/fsck/initialize.c:893
 msgid ""
 "Gathering information to repair the gfs2 superblock.  This may take some "
 "time.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:898
+#: gfs2/fsck/initialize.c:900
 msgid "Block size not apparent; checking elsewhere.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:911
+#: gfs2/fsck/initialize.c:913
 msgid ""
 "Unable to determine the block size; this does not look like a gfs2 file "
 "system.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:921
+#: gfs2/fsck/initialize.c:923
 msgid "Unable to locate the system master  directory.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:927
+#: gfs2/fsck/initialize.c:929
 msgid "Unable to locate the root directory.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:931
+#: gfs2/fsck/initialize.c:933
 msgid "Can't find any dinodes that might be the root; using master - 1.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:935
+#: gfs2/fsck/initialize.c:937
 #, c-format
 msgid "Found a root directory candidate at  0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:943
+#: gfs2/fsck/initialize.c:945
 msgid "The root dinode block is destroyed.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:944
+#: gfs2/fsck/initialize.c:946
 msgid ""
 "At this point I recommend reinitializing it.\n"
 "Hopefully everything will later be put into lost+found.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:948
+#: gfs2/fsck/initialize.c:950
 msgid "Okay to reinitialize the root dinode? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:950
+#: gfs2/fsck/initialize.c:952
 msgid "The root dinode was not reinitialized; aborting.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:962
+#: gfs2/fsck/initialize.c:964
 msgid "Okay to fix the GFS2 superblock? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:963
+#: gfs2/fsck/initialize.c:965
 #, c-format
 msgid "Master system directory found at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:969
+#: gfs2/fsck/initialize.c:971
 #, c-format
 msgid "Root directory found at: 0x%llx\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:978
+#: gfs2/fsck/initialize.c:980
 msgid ""
 "GFS2 superblock not fixed; fsck cannot proceed without a valid superblock.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1008
+#: gfs2/fsck/initialize.c:1000 gfs2/mkfs/main_grow.c:320
+msgid "Initializing lists...\n"
+msgstr ""
+
+#: gfs2/fsck/initialize.c:1010
 msgid "GFS superblock is larger than the blocksize!\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1009
-msgid "sizeof(struct gfs2_sb) > sdp->sd_sb.sb_bsize\n"
+#: gfs2/fsck/initialize.c:1016 gfs2/mkfs/main_grow.c:326
+#: gfs2/mkfs/main_jadd.c:519 gfs2/mkfs/main_mkfs.c:593
+#, c-format
+msgid "Bad constants (1)\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1054
+#: gfs2/fsck/initialize.c:1056
 #, c-format
 msgid "Unable to open device: %s\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1095
+#: gfs2/fsck/initialize.c:1097
 msgid "Unable to block other mounters\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1123
+#: gfs2/fsck/initialize.c:1125
 msgid ""
 "\n"
 "Journal recovery complete.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1135
+#: gfs2/fsck/initialize.c:1137
 #, c-format
 msgid "Device %s is busy.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1143
+#: gfs2/fsck/initialize.c:1145
 msgid "Unable to unblock other mounters - manual intervention required\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1144
+#: gfs2/fsck/initialize.c:1146
 msgid "Use 'gfs2_tool sb <device> proto' to fix\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1146
+#: gfs2/fsck/initialize.c:1148
 msgid "Syncing the device.\n"
 msgstr ""
 
-#: gfs2/fsck/initialize.c:1157
+#: gfs2/fsck/initialize.c:1159
 msgid "fsck.gfs2: Non-fatal error dropping caches.\n"
 msgstr ""
 
@@ -1215,36 +619,34 @@ msgstr ""
 msgid "Error while zeroing inode_info structure\n"
 msgstr ""
 
-#: gfs2/fsck/link.c:42
+#: gfs2/fsck/link.c:40
 #, c-format
 msgid ""
-"Directory %lld (0x%llx) incremented counted links to %u for %<PRIu64> (0x"
-"%<PRIx64>) via %s\n"
+"Directory %lld (0x%llx) incremented counted links to %u for %llu (0x%llx) "
+"via %s\n"
 msgstr ""
 
-#: gfs2/fsck/link.c:50
+#: gfs2/fsck/link.c:48
 #, c-format
 msgid ""
-"Ref: %lld (0x%llx) No match found when incrementing link for %<PRIu64> (0x"
-"%<PRIx64>)!\n"
+"Ref: %llu (0x%llx) No match found when incrementing link for %llu (0x%llx)!\n"
 msgstr ""
 
 #: gfs2/fsck/link.c:74
 #, c-format
-msgid ""
-"Directory %lld (0x%llx)'s link to  %<PRIu64> (0x%<PRIx64>) via %s is zero!\n"
+msgid "Directory %llu (0x%llx)'s link to  %llu (0x%llx) via %s is zero!\n"
 msgstr ""
 
-#: gfs2/fsck/link.c:82
+#: gfs2/fsck/link.c:83
 #, c-format
 msgid ""
-"Directory %lld (0x%llx) decremented counted links to %u for %<PRIu64> (0x"
-"%<PRIx64>) via %s\n"
+"Directory %llu (0x%llx) decremented counted links to %u for %llu (0x%llx) "
+"via %s\n"
 msgstr ""
 
-#: gfs2/fsck/link.c:90
+#: gfs2/fsck/link.c:91
 #, c-format
-msgid "No match found when decrementing link for %<PRIu64> (0x%<PRIx64>)!\n"
+msgid "No match found when decrementing link for %llu (0x%llx)!\n"
 msgstr ""
 
 #: gfs2/fsck/lost_n_found.c:39
@@ -1327,19 +729,30 @@ msgstr ""
 msgid "GFS2 fsck %s (built %s %s)\n"
 msgstr ""
 
-#: gfs2/fsck/main.c:118
+#: gfs2/fsck/main.c:102 gfs2/fsck/main.c:113 gfs2/mkfs/main_grow.c:96
+#: gfs2/mkfs/main_jadd.c:132 gfs2/mkfs/main_mkfs.c:155
+#, c-format
+msgid "Please use '-h' for usage.\n"
+msgstr ""
+
+#: gfs2/fsck/main.c:105 gfs2/mkfs/main_grow.c:99
+#, c-format
+msgid "Unknown option %c\n"
+msgstr ""
+
+#: gfs2/fsck/main.c:117
 #, c-format
 msgid "No device specified.  Use '-h' for usage.\n"
 msgstr ""
 
-#: gfs2/fsck/main.c:130
+#: gfs2/fsck/main.c:129
 #, c-format
 msgid "progress unknown.\n"
 msgstr ""
 
-#: gfs2/fsck/main.c:132
+#: gfs2/fsck/main.c:131
 #, c-format
-msgid "processing block %<PRIu64> out of %<PRIu64>\n"
+msgid "processing block %llu out of %llu\n"
 msgstr ""
 
 #: gfs2/fsck/main.c:136
@@ -1498,13 +911,13 @@ msgid "Writing changes to disk\n"
 msgstr ""
 
 #: gfs2/fsck/main.c:359
-msgid "gfs2_fsck complete    \n"
+msgid "gfs2_fsck complete\n"
 msgstr ""
 
 #: gfs2/fsck/metawalk.c:40
 #, c-format
 msgid ""
-"Block %lld (0x%llx) is not represented in thesystem bitmap; part of an rgrp "
+"Block %llu (0x%llx) is not represented in the system bitmap; part of an rgrp "
 "or superblock.\n"
 msgstr ""
 
@@ -1543,94 +956,94 @@ msgstr ""
 
 #: gfs2/fsck/metawalk.c:323
 #, c-format
-msgid "Checking leaf %<PRIu64> (0x%<PRIx64>)\n"
+msgid "Checking leaf %llu (0x%llu)\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:327
+#: gfs2/fsck/metawalk.c:328
 #, c-format
 msgid "Invalid directory type %d specified\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:345
+#: gfs2/fsck/metawalk.c:346
 #, c-format
 msgid ""
 "Directory block %llu (0x%llx), entry %d of directory %llu(0x%llx) is "
 "corrupt.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:353
+#: gfs2/fsck/metawalk.c:354
 msgid "Attempt to repair it? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:360
+#: gfs2/fsck/metawalk.c:361
 msgid ""
 "Unable to repair corrupt directory entry; the entry was removed instead.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:366
+#: gfs2/fsck/metawalk.c:367
 msgid "Corrupt directory entry repaired.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:371 gfs2/fsck/metawalk.c:394
+#: gfs2/fsck/metawalk.c:372 gfs2/fsck/metawalk.c:395
 #, c-format
 msgid "Corrupt directory entry ignored, stopped after checking %d entries.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:379
+#: gfs2/fsck/metawalk.c:380
 msgid "First dirent is a sentinel (place holder).\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:382
+#: gfs2/fsck/metawalk.c:383
 #, c-format
 msgid ""
 "Directory entry with inode number of zero in leaf %llu (0x%llx) of directory "
 "%llu (0x%llx)!\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:389
+#: gfs2/fsck/metawalk.c:390
 msgid "Attempt to remove it? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:391
+#: gfs2/fsck/metawalk.c:392
 msgid "The corrupt directory entry was removed.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:403
+#: gfs2/fsck/metawalk.c:404
 msgid "First dirent is a Sentinel (place holder).\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:423
+#: gfs2/fsck/metawalk.c:424
 #, c-format
 msgid "Last entry processed for %lld->%lld (0x%llx->0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:452
+#: gfs2/fsck/metawalk.c:453
 #, c-format
 msgid "Directory Inode %llu (0x%llx) points to leaf %llu (0x%llx) %s.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:460
+#: gfs2/fsck/metawalk.c:461
 msgid "Attempt to patch around it? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:465
+#: gfs2/fsck/metawalk.c:466
 #, c-format
 msgid "Directory Inode %llu (0x%llx) repaired.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:470
+#: gfs2/fsck/metawalk.c:471
 msgid "Bad leaf left in place.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:495
+#: gfs2/fsck/metawalk.c:496
 msgid "Error: Cannot allocate memory to fix the leaf pointers.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:503 gfs2/fsck/metawalk.c:517
+#: gfs2/fsck/metawalk.c:504 gfs2/fsck/metawalk.c:518
 msgid "Error: bad read while fixing leaf pointers.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:546
+#: gfs2/fsck/metawalk.c:547
 #, c-format
 msgid ""
 "Directory #%llu (0x%llx) has an invalid number of pointers to leaf #%llu (0x"
@@ -1638,19 +1051,19 @@ msgid ""
 "\tFound: %u, which is not a factor of 2.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:554 gfs2/fsck/metawalk.c:575
+#: gfs2/fsck/metawalk.c:555 gfs2/fsck/metawalk.c:576
 msgid "Attempt to fix it? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:555
+#: gfs2/fsck/metawalk.c:556
 msgid "Directory inode was not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:562
+#: gfs2/fsck/metawalk.c:563
 msgid "Directory inode was fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:567
+#: gfs2/fsck/metawalk.c:568
 #, c-format
 msgid ""
 "Directory #%llu (0x%llx) has an incorrect number of pointers to leaf #%llu "
@@ -1658,193 +1071,191 @@ msgid ""
 "\tFound: %u,  Expected: %u\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:576
+#: gfs2/fsck/metawalk.c:577
 msgid "Directory leaf was not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:581
+#: gfs2/fsck/metawalk.c:582
 #, c-format
 msgid "Leaf depth was %d, changed to %d\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:587
+#: gfs2/fsck/metawalk.c:588
 msgid "Directory leaf was fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:623
+#: gfs2/fsck/metawalk.c:624
 #, c-format
 msgid "Directory #%llu (0x%llx) has no valid leaf blocks\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:663
+#: gfs2/fsck/metawalk.c:664
 #, c-format
 msgid ""
 "Leaf block #%llu (0x%llx) is out of range for directory #%llu (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:673
+#: gfs2/fsck/metawalk.c:674
 msgid "that is out of range"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:684
+#: gfs2/fsck/metawalk.c:685
 msgid "that is not really a leaf"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:703
+#: gfs2/fsck/metawalk.c:704
 #, c-format
-msgid "incorrect lf_dirent_format at leaf #%<PRIu64>\n"
+msgid "incorrect lf_dirent_format at leaf #%llu\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:706
+#: gfs2/fsck/metawalk.c:707
 msgid "Fixing lf_dirent_format.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:711
+#: gfs2/fsck/metawalk.c:712
 #, c-format
 msgid "Inode %llu (0x%llx) points to bad leaf %llu (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:742
+#: gfs2/fsck/metawalk.c:743
 #, c-format
 msgid ""
 "Leaf %llu (0x%llx) entry count in directory %llu (0x%llx) doesn't match "
 "number of entries found - is %u, found %u\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:754
+#: gfs2/fsck/metawalk.c:755
 msgid "Update leaf entry count? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:757
+#: gfs2/fsck/metawalk.c:758
 msgid "Leaf entry count updated\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:759
+#: gfs2/fsck/metawalk.c:760
 msgid "Leaf entry count left in inconsistant state\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:768
+#: gfs2/fsck/metawalk.c:769
 #, c-format
 msgid "Leaf chain 0x%llx detected.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:824
+#: gfs2/fsck/metawalk.c:825
 msgid "Repair the bad Extended Attribute? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:836 gfs2/fsck/metawalk.c:1482 gfs2/fsck/pass1.c:882
-#: gfs2/fsck/pass1.c:964
+#: gfs2/fsck/metawalk.c:837 gfs2/fsck/metawalk.c:1487 gfs2/fsck/pass1.c:879
+#: gfs2/fsck/pass1.c:961
 msgid "extended attribute"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:838
+#: gfs2/fsck/metawalk.c:839
 msgid "The EA was fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:842
+#: gfs2/fsck/metawalk.c:843
 msgid "The bad EA was not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:878
+#: gfs2/fsck/metawalk.c:879
 #, c-format
-msgid "Checking EA leaf block #%<PRIu64> (0x%<PRIx64>).\n"
+msgid "Checking EA leaf block #%llu (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:936
+#: gfs2/fsck/metawalk.c:938
 #, c-format
 msgid ""
 "%s block %lld (0x%llx), part of inode %lld (0x%llx), was already free.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:946
+#: gfs2/fsck/metawalk.c:948
 #, c-format
 msgid "Removing duplicate reference %d to block %lld (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:978
+#: gfs2/fsck/metawalk.c:980
 #, c-format
-msgid "Checking EA indirect block #%<PRIu64> (0x%<PRIx64>).\n"
+msgid "Checking EA indirect block #%llu (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:999
+#: gfs2/fsck/metawalk.c:1002
 msgid "Fix the indirect block too? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1068
+#: gfs2/fsck/metawalk.c:1071
 #, c-format
 msgid "Extended attributes exist for inode #%llu (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1185
+#: gfs2/fsck/metawalk.c:1188
 #, c-format
-msgid "Skipping block %<PRIu64> (0x%<PRIx64>)\n"
+msgid "Skipping block %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1191
+#: gfs2/fsck/metawalk.c:1194
 #, c-format
 msgid "Skipping invalid block %lld (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1358
+#: gfs2/fsck/metawalk.c:1361
 #, c-format
 msgid ""
 "\rLarge file at %lld (0x%llx) - 100 percent "
 "complete.                                   \n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1433
+#: gfs2/fsck/metawalk.c:1436
 #, c-format
-msgid ""
-"Removing dentry %<PRIu64> (0x%<PRIx64>) from directory %<PRIu64> (0x"
-"%<PRIx64>)\n"
+msgid "Removing dentry %llu (0x%llx) from directory %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1436
+#: gfs2/fsck/metawalk.c:1441
 msgid "Parent directory out of range\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1444
+#: gfs2/fsck/metawalk.c:1449
 msgid "Parent block is not a directory...ignoring\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1457 gfs2/fsck/pass1.c:854 gfs2/fsck/pass1.c:936
+#: gfs2/fsck/metawalk.c:1462 gfs2/fsck/pass1.c:851 gfs2/fsck/pass1.c:933
 msgid "metadata"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1463 gfs2/fsck/pass1.c:860 gfs2/fsck/pass1.c:942
+#: gfs2/fsck/metawalk.c:1468 gfs2/fsck/pass1.c:857 gfs2/fsck/pass1.c:939
 msgid "leaf"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1468 gfs2/fsck/pass1.c:393 gfs2/fsck/pass1.c:427
-#: gfs2/fsck/pass1.c:866 gfs2/fsck/pass1.c:948
+#: gfs2/fsck/metawalk.c:1473 gfs2/fsck/pass1.c:393 gfs2/fsck/pass1.c:427
+#: gfs2/fsck/pass1.c:863 gfs2/fsck/pass1.c:945
 msgid "data"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1475 gfs2/fsck/pass1.c:874 gfs2/fsck/pass1.c:956
+#: gfs2/fsck/metawalk.c:1480 gfs2/fsck/pass1.c:871 gfs2/fsck/pass1.c:953
 msgid "indirect extended attribute"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1498
+#: gfs2/fsck/metawalk.c:1503
 #, c-format
 msgid ""
 "%s reference to new metadata block %lld (0x%llx) is now marked as indirect.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1517
+#: gfs2/fsck/metawalk.c:1522
 #, c-format
 msgid "%s reference to new data block %lld (0x%llx) is now marked as data.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1536
+#: gfs2/fsck/metawalk.c:1541
 msgid "newly allocated leaf"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1576
+#: gfs2/fsck/metawalk.c:1581
 #, c-format
 msgid "%s had blocks added; reprocessing its metadata tree at height=%d.\n"
 msgstr ""
 
-#: gfs2/fsck/metawalk.c:1580
+#: gfs2/fsck/metawalk.c:1585
 #, c-format
 msgid "Error %d reprocessing the %s metadata tree.\n"
 msgstr ""
@@ -1873,143 +1284,143 @@ msgstr ""
 
 #: gfs2/fsck/pass1b.c:236
 #, c-format
-msgid "Inode %s is in directory %<PRIu64> (0x%<PRIx64>)\n"
+msgid "Inode %s is in directory %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:335
+#: gfs2/fsck/pass1b.c:333
 #, c-format
 msgid "Block %lld (0x%llx) is not gfs2 metadata.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:382
+#: gfs2/fsck/pass1b.c:380
 msgid "Invalid "
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:383
+#: gfs2/fsck/pass1b.c:381
 #, c-format
 msgid ""
 "Inode %s (%lld/0x%llx) has %d reference(s) to block %llu (0x%llx) (%s)\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:416
+#: gfs2/fsck/pass1b.c:414
 #, c-format
 msgid "Okay to clear %s inode %lld (0x%llx)? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:417
+#: gfs2/fsck/pass1b.c:415
 msgid "invalidated"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:420
+#: gfs2/fsck/pass1b.c:418
 msgid "The bad inode was not cleared...\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:423
+#: gfs2/fsck/pass1b.c:421
 #, c-format
 msgid "Clearing inode %lld (0x%llx)....\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:436
+#: gfs2/fsck/pass1b.c:434
 msgid "bad"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:494
+#: gfs2/fsck/pass1b.c:492
 #, c-format
 msgid ""
 "Inode %s (%lld/0x%llx) has a reference to data block %llu (0x%llx), but the "
 "block is really metadata.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:501
+#: gfs2/fsck/pass1b.c:499
 msgid "Clear the inode? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:504
+#: gfs2/fsck/pass1b.c:502
 #, c-format
 msgid "Clearing inode %lld (0x%llx)...\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:514
+#: gfs2/fsck/pass1b.c:512
 msgid "inode with bad duplicate"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:518
+#: gfs2/fsck/pass1b.c:516
 msgid "The bad inode was not cleared."
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:524
+#: gfs2/fsck/pass1b.c:522
 #, c-format
 msgid "Block %llu (0x%llx) has only one remaining reference.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:531
+#: gfs2/fsck/pass1b.c:529
 #, c-format
 msgid ""
 "Block %llu (0x%llx) has %d inodes referencing it for a total of %d duplicate "
 "references\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:557
+#: gfs2/fsck/pass1b.c:555
 #, c-format
 msgid ""
 "Resetting the type based on the remaining reference in inode %lld (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:565
+#: gfs2/fsck/pass1b.c:563
 #, c-format
 msgid ""
 "The remaining reference inode %lld (0x%llx) is marked invalid: Marking the "
 "block as free.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:571 gfs2/fsck/pass1b.c:580
+#: gfs2/fsck/pass1b.c:569 gfs2/fsck/pass1b.c:578
 msgid "reference-repaired leaf"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:575
+#: gfs2/fsck/pass1b.c:573
 msgid "reference-repaired data"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:584
+#: gfs2/fsck/pass1b.c:582
 msgid "reference-repaired indirect"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:589
+#: gfs2/fsck/pass1b.c:587
 msgid "reference-repaired extended attribute"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:594
+#: gfs2/fsck/pass1b.c:592
 msgid "All duplicate references were resolved.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:610
+#: gfs2/fsck/pass1b.c:608
 msgid "Looking for duplicate blocks...\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:614
+#: gfs2/fsck/pass1b.c:612
 msgid "No duplicate blocks found\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:620
+#: gfs2/fsck/pass1b.c:618
 msgid "Scanning filesystem for inodes containing duplicate blocks...\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:621
+#: gfs2/fsck/pass1b.c:619
 #, c-format
-msgid "Filesystem has %<PRIu64> (0x%<PRIx64>) blocks total\n"
+msgid "Filesystem has %llu (0x%llx) blocks total\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:628
+#: gfs2/fsck/pass1b.c:627
 #, c-format
 msgid "Found all %d original references to duplicates.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:640
+#: gfs2/fsck/pass1b.c:639
 #, c-format
 msgid "Checking invalidated duplicate dinode %lld (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass1b.c:655
+#: gfs2/fsck/pass1b.c:654
 msgid "Handling duplicate blocks\n"
 msgstr ""
 
@@ -2174,223 +1585,222 @@ msgstr ""
 msgid "The bad Extended Attribute was not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:570
+#: gfs2/fsck/pass1.c:567
 msgid "Bad indirect Extended Attribute duplicate found"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:576
+#: gfs2/fsck/pass1.c:573
 msgid "Extended Attribute indirect block has incorrect type"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:581
+#: gfs2/fsck/pass1.c:578
 #, c-format
 msgid ""
 "Inode #%llu (0x%llx): Duplicate Extended Attribute indirect block found at #"
 "%llu (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:593
+#: gfs2/fsck/pass1.c:590
 msgid "indirect Extended Attribute"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:609
+#: gfs2/fsck/pass1.c:606
 #, c-format
 msgid "Marking inode #%llu (0x%llx) with extended attribute block\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:627
+#: gfs2/fsck/pass1.c:624
 #, c-format
 msgid ""
 "Inode %lld (0x%llx) has recoverable indirect Extended Attribute errors.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:631
+#: gfs2/fsck/pass1.c:628
 msgid "Okay to fix the block count for the inode? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass1.c:635
+#: gfs2/fsck/pass1.c:632
 msgid "Block count fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:638
+#: gfs2/fsck/pass1.c:635
 msgid "Block count not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:660
+#: gfs2/fsck/pass1.c:657
 msgid "Bad Extended Attribute duplicate found"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:663
+#: gfs2/fsck/pass1.c:660
 msgid "Extended Attribute leaf block has incorrect type"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:670
+#: gfs2/fsck/pass1.c:667
 #, c-format
 msgid "Duplicate block found at #%lld (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:683
+#: gfs2/fsck/pass1.c:680
 msgid "Extended Attribute block removed due to previous errors.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:691
+#: gfs2/fsck/pass1.c:688
 msgid "Extended Attribute"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:720
+#: gfs2/fsck/pass1.c:717
 #, c-format
 msgid ""
 "Inode #%llu (0x%llx): Extended Attribute block %llu (0x%llx) has an extended "
 "leaf block #%llu (0x%llx) that is out of range.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:730
+#: gfs2/fsck/pass1.c:727
 msgid "bad (out of range) Extended Attribute "
 msgstr ""
 
-#: gfs2/fsck/pass1.c:753
+#: gfs2/fsck/pass1.c:750
 #, c-format
 msgid "Setting inode %lld (0x%llx) as having eattr block(s) attached.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:764
+#: gfs2/fsck/pass1.c:761
 #, c-format
 msgid ""
 "Inode #%llu (0x%llx): Extended Attribute leaf block #%llu (0x%llx) is out of "
 "range.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:770
+#: gfs2/fsck/pass1.c:767
 msgid "bad (out of range) Extended Attribute leaf"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:837
+#: gfs2/fsck/pass1.c:834
 #, c-format
 msgid ""
 "%s block %lld (0x%llx), part of inode %lld (0x%llx), was free so the invalid "
 "reference is ignored.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:905
+#: gfs2/fsck/pass1.c:902
 #, c-format
 msgid ""
 "Bad %s block pointer (out of range #%ld) found in inode %lld (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:919
+#: gfs2/fsck/pass1.c:916
 #, c-format
 msgid ""
 "Duplicated %s block pointer (violation #%ld) found in inode %lld (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:996
+#: gfs2/fsck/pass1.c:993
 #, c-format
 msgid "Error: inode %llu (0x%llx) has more than %d bad pointers.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1002
+#: gfs2/fsck/pass1.c:999
 msgid "badly corrupt"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1009
+#: gfs2/fsck/pass1.c:1006
 msgid "directory"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1016
+#: gfs2/fsck/pass1.c:1013
 msgid "file"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1021
+#: gfs2/fsck/pass1.c:1018
 msgid "symlink"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1026
+#: gfs2/fsck/pass1.c:1023
 msgid "block device"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1031
+#: gfs2/fsck/pass1.c:1028
 msgid "character device"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1036
+#: gfs2/fsck/pass1.c:1033
 msgid "fifo"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1041
+#: gfs2/fsck/pass1.c:1038
 msgid "socket"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1058
+#: gfs2/fsck/pass1.c:1055
 msgid "invalid mode"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1069
+#: gfs2/fsck/pass1.c:1066
 #, c-format
 msgid ""
 "Directory dinode block #%llu (0x%llx) has bad depth.  Found %u, Expected %u\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1075
+#: gfs2/fsck/pass1.c:1072
 msgid "bad depth"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1087
+#: gfs2/fsck/pass1.c:1084
 #, c-format
 msgid "Error: inode %llu (0x%llx) has unrecoverable errors; invalidating.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1098
+#: gfs2/fsck/pass1.c:1095
 msgid "corrupt"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1110
+#: gfs2/fsck/pass1.c:1107
 #, c-format
 msgid ""
 "Inode #%llu (0x%llx): Ondisk block count (%llu) does not match what fsck "
 "found (%llu)\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1117
+#: gfs2/fsck/pass1.c:1114
 #, c-format
 msgid ""
 "inode has: %lld, but fsck counts: Dinode:1 + indir:%lld + data: %lld + ea: "
 "%lld\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1123
+#: gfs2/fsck/pass1.c:1120
 msgid "Fix ondisk block count? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1127
+#: gfs2/fsck/pass1.c:1124
 #, c-format
 msgid "Block count for #%llu (0x%llx) fixed\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1131
+#: gfs2/fsck/pass1.c:1128
 #, c-format
 msgid "Bad block count for #%llu (0x%llx) not fixed\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1157
+#: gfs2/fsck/pass1.c:1154
 #, c-format
 msgid ""
-"Found a duplicate inode block at #%<PRIu64> (0x%<PRIx64>) previously marked "
-"as a %s\n"
+"Found a duplicate inode block at #%llu (0x%llx) previously marked as a %s\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1166
+#: gfs2/fsck/pass1.c:1164
 #, c-format
 msgid "Inode #%llu (0x%llx): Bad inode address found: %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1171
+#: gfs2/fsck/pass1.c:1169
 #, c-format
-msgid "Fix address in inode at block #%<PRIu64> (0x%<PRIx64>)? (y/n) "
+msgid "Fix address in inode at block #%llu (0x%llx)? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1177
+#: gfs2/fsck/pass1.c:1175
 #, c-format
-msgid "Address in inode at block #%<PRIu64> (0x%<PRIx64>) not fixed\n"
+msgid "Address in inode at block #%llu (0x%llx) not fixed\n"
 msgstr ""
 
 #: gfs2/fsck/pass1.c:1199
@@ -2400,205 +1810,203 @@ msgstr ""
 
 #: gfs2/fsck/pass1.c:1204
 #, c-format
-msgid "System inode for '%s' is located at block %<PRIu64> (0x%<PRIx64>)\n"
+msgid "System inode for '%s' is located at block %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1208
+#: gfs2/fsck/pass1.c:1209
 #, c-format
 msgid "Found invalid system dinode at block #%llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1224
+#: gfs2/fsck/pass1.c:1225
 msgid "The inode exists but the block is not marked 'in use'; fixing it.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1234
+#: gfs2/fsck/pass1.c:1235
 #, c-format
 msgid "System inode for '%s' is corrupt or missing.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1241
+#: gfs2/fsck/pass1.c:1242
 #, c-format
 msgid "Invalid or missing %s system inode (should be %d, is %d).\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1243
+#: gfs2/fsck/pass1.c:1244
 #, c-format
 msgid "Create new %s system inode? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1244
+#: gfs2/fsck/pass1.c:1245
 #, c-format
 msgid "Rebuilding system file \"%s\"\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1248
+#: gfs2/fsck/pass1.c:1249
 #, c-format
 msgid "Error trying to rebuild system file %s: Cannot continue\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1260
+#: gfs2/fsck/pass1.c:1261
 #, c-format
 msgid "Cannot continue without valid %s inode\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1402
+#: gfs2/fsck/pass1.c:1403
 #, c-format
-msgid "Checking metadata in Resource Group #%<PRIu64>\n"
+msgid "Checking metadata in Resource Group #%llu\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1406
+#: gfs2/fsck/pass1.c:1407
 #, c-format
 msgid "rgrp block %lld (0x%llx) is now marked as 'rgrp data'\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1435
+#: gfs2/fsck/pass1.c:1436
 #, c-format
 msgid "Skipping pass 1 is not a good idea.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1440
+#: gfs2/fsck/pass1.c:1441
 #, c-format
 msgid "Already processed system inode %lld (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass1.c:1453
+#: gfs2/fsck/pass1.c:1451
 #, c-format
 msgid "Found invalid inode at block #%llu (0x%llx)\n"
 msgstr ""
 
 #: gfs2/fsck/pass1c.c:29
 #, c-format
-msgid "Bad Extended Attribute at block #%<PRIu64> (0x%<PRIx64>) removed.\n"
+msgid "Bad Extended Attribute at block #%llu (0x%llx) removed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:42
+#: gfs2/fsck/pass1c.c:43
 msgid "Remove the bad Extended Attribute entry? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:56 gfs2/fsck/pass1c.c:68
+#: gfs2/fsck/pass1c.c:57 gfs2/fsck/pass1c.c:69
 msgid "Bad Extended Attribute not removed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:63
+#: gfs2/fsck/pass1c.c:64
 msgid "Remove the bad Extended Attribute? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:66
+#: gfs2/fsck/pass1c.c:67
 msgid "Bad Extended Attribute removed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:81
+#: gfs2/fsck/pass1c.c:82
 #, c-format
 msgid ""
 "Extended attributes indirect block #%llu (0x%llx) for inode #%llu (0x%llx) "
 "out of range...removing\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:92
+#: gfs2/fsck/pass1c.c:93
 #, c-format
 msgid ""
 "Extended attributes indirect block #%llu (0x%llx) for inode #%llu (0x%llx) "
 "invalid.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:116
+#: gfs2/fsck/pass1c.c:117
 #, c-format
 msgid "Extended attributes block for inode #%llu (0x%llx) out of range.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:124
+#: gfs2/fsck/pass1c.c:125
 #, c-format
 msgid "Extended attributes block for inode #%llu (0x%llx) invalid.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:149 gfs2/fsck/pass1c.c:165
-msgid "EA has name length == 0\n"
+#: gfs2/fsck/pass1c.c:150 gfs2/fsck/pass1c.c:166
+msgid "EA has name length of zero\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:154
+#: gfs2/fsck/pass1c.c:155
 msgid "EA rec length too long\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:160
+#: gfs2/fsck/pass1c.c:161
 msgid "last EA has no last entry flag\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:176
+#: gfs2/fsck/pass1c.c:177
 #, c-format
 msgid "EA (%s) type is invalid (%d > %d).\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:190
+#: gfs2/fsck/pass1c.c:191
 #, c-format
 msgid "EA (%s) has incorrect number of pointers.\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:191
+#: gfs2/fsck/pass1c.c:192
 #, c-format
 msgid ""
 "  Required:  %d\n"
 "  Reported:  %d\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:240
+#: gfs2/fsck/pass1c.c:241
 msgid "Looking for inodes containing ea blocks...\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:250
+#: gfs2/fsck/pass1c.c:251
 #, c-format
-msgid "EA in inode %<PRIu64> (0x%<PRIx64>)\n"
+msgid "EA in inode %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass1c.c:256
+#: gfs2/fsck/pass1c.c:258
 #, c-format
 msgid "Found eattr at %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:30 gfs2/fsck/pass2.c:81
+#: gfs2/fsck/pass2.c:30 gfs2/fsck/pass2.c:88
 #, c-format
-msgid "Unable to find block %<PRIu64> (0x%<PRIx64>) in dir_info list\n"
+msgid "Unable to find block %llu (0x%llx) in dir_info list\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:37
+#: gfs2/fsck/pass2.c:39
 #, c-format
 msgid ""
-"Another directory at block %<PRIu64> (0x%<PRIx64>) already contains this "
-"child %lld (%llx) - checking parent %<PRIu64> (0x%<PRIx64>)\n"
+"Another directory at block %llu (0x%llx) already contains this child %llu "
+"(%llx) - checking parent %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:47
+#: gfs2/fsck/pass2.c:51
 #, c-format
 msgid "Child %lld (0x%llx) has parent %lld (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:72
+#: gfs2/fsck/pass2.c:76
 #, c-format
-msgid ""
-"Dotdot parent already set for block %<PRIu64> (0x%<PRIx64>) -> %<PRIu64> (0x"
-"%<PRIx64>)\n"
+msgid "Dotdot parent already set for block %llu (0x%llx) -> %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:148
+#: gfs2/fsck/pass2.c:157
 msgid "Invalid block type\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:201
+#: gfs2/fsck/pass2.c:210
 #, c-format
 msgid ""
 "Block # referenced by directory entry %s in inode %lld (0x%llx) is out of "
 "range\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:205
+#: gfs2/fsck/pass2.c:214
 msgid "Clear directory entry to out of range block? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:209
+#: gfs2/fsck/pass2.c:218
 msgid "Directory entry to out of range block remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:219
+#: gfs2/fsck/pass2.c:228
 #, c-format
 msgid ""
 "Dir entry with bad record or name length\n"
@@ -2606,23 +2014,23 @@ msgid ""
 "\tName length = %u\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:222
+#: gfs2/fsck/pass2.c:231
 msgid "Clear the directory entry? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:223
+#: gfs2/fsck/pass2.c:232
 msgid "Directory entry not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:227
+#: gfs2/fsck/pass2.c:236
 msgid "corrupt directory entry"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:229
+#: gfs2/fsck/pass2.c:238
 msgid "Bad directory entry deleted.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:235
+#: gfs2/fsck/pass2.c:244
 #, c-format
 msgid ""
 "Dir entry with bad hash or name length\n"
@@ -2630,308 +2038,304 @@ msgid ""
 "\tFilename           = %s\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:239
+#: gfs2/fsck/pass2.c:248
 #, c-format
 msgid ""
 "\tName length found  = %u\n"
 "\tHash expected      = %u (0x%x)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:242
+#: gfs2/fsck/pass2.c:251
 #, c-format
 msgid "Fix directory hash for %s? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:244
+#: gfs2/fsck/pass2.c:253
 #, c-format
 msgid "Directory entry hash for %s not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:251
+#: gfs2/fsck/pass2.c:260
 #, c-format
 msgid "Directory entry hash for %s fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:261
+#: gfs2/fsck/pass2.c:270
 #, c-format
 msgid "Found a bad directory entry: %s\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:263
+#: gfs2/fsck/pass2.c:272
 msgid "Delete inode containing bad blocks? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:264
+#: gfs2/fsck/pass2.c:273
 msgid "Entry to inode containing bad blocks remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:277
+#: gfs2/fsck/pass2.c:286
 msgid "bad directory entry"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:281
+#: gfs2/fsck/pass2.c:290
 #, c-format
 msgid ""
 "Directory entry '%s' referencing inode %llu (0x%llx) in dir inode %llu (0x"
 "%llx) block type %d: %s.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:289
+#: gfs2/fsck/pass2.c:298
 msgid "was previously marked invalid"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:290
+#: gfs2/fsck/pass2.c:299
 msgid "was deleted or is not an inode"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:292
+#: gfs2/fsck/pass2.c:301
 msgid "Clear directory entry to non-inode block? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:294
+#: gfs2/fsck/pass2.c:303
 msgid "Directory entry to non-inode block remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:319
+#: gfs2/fsck/pass2.c:328
 #, c-format
 msgid ""
 "Error: directory entry type is incompatible with block type at block %lld (0x"
 "%llx) in directory inode %llu (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:326
+#: gfs2/fsck/pass2.c:335
 #, c-format
 msgid "Directory entry type is %d, block type is %d.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:332
+#: gfs2/fsck/pass2.c:341
 #, c-format
 msgid ""
 "Type '%s' in dir entry (%s, %llu/0x%llx) conflicts with type '%s' in dinode. "
 "(Dir entry is stale.)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:338
+#: gfs2/fsck/pass2.c:347
 msgid "Clear stale directory entry? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:339
+#: gfs2/fsck/pass2.c:348
 msgid "Stale directory entry remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:353
+#: gfs2/fsck/pass2.c:362
 msgid "Found . dentry\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:356
+#: gfs2/fsck/pass2.c:365
 #, c-format
 msgid "Already found '.' entry in directory %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:360
+#: gfs2/fsck/pass2.c:369
 msgid "Clear duplicate '.' entry? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:361
+#: gfs2/fsck/pass2.c:370
 msgid "Duplicate '.' entry remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:381
+#: gfs2/fsck/pass2.c:390
 #, c-format
 msgid ""
 "'.' entry's value incorrect in directory %llu (0x%llx).  Points to %llu (0x"
 "%llx) when it should point to %llu (0x%llx).\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:391
+#: gfs2/fsck/pass2.c:400
 msgid "Remove '.' reference? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:392
+#: gfs2/fsck/pass2.c:401
 msgid "Invalid '.' reference remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:411
+#: gfs2/fsck/pass2.c:420
 msgid "Found .. dentry\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:413
+#: gfs2/fsck/pass2.c:422
 #, c-format
 msgid "Already found '..' entry in directory %llu(0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:417
+#: gfs2/fsck/pass2.c:426
 msgid "Clear duplicate '..' entry? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:418
+#: gfs2/fsck/pass2.c:427
 msgid "Duplicate '..' entry remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:437
+#: gfs2/fsck/pass2.c:446
 #, c-format
 msgid ""
 "Found '..' entry in directory %llu (0x%llx) pointing to something that's not "
 "a directory"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:441
+#: gfs2/fsck/pass2.c:450
 msgid "Clear bad '..' directory entry? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:442
+#: gfs2/fsck/pass2.c:451
 msgid "Bad '..' directory entry remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:471
+#: gfs2/fsck/pass2.c:480
 #, c-format
 msgid "Found non-dir inode dentry pointing to %lld (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:481
+#: gfs2/fsck/pass2.c:490
 #, c-format
-msgid "%s: Hard link to block %<PRIu64> (0x%<PRIx64>) detected.\n"
+msgid "%s: Hard link to block %llu (0x%llx) detected.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:484
+#: gfs2/fsck/pass2.c:495
 msgid "Clear hard link to directory? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:487
+#: gfs2/fsck/pass2.c:498
 msgid "Hard link to directory remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:497
+#: gfs2/fsck/pass2.c:508
 msgid "valid reference"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:505
+#: gfs2/fsck/pass2.c:516
 #, c-format
 msgid "Bad directory entry '%s' cleared.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:533
+#: gfs2/fsck/pass2.c:544
 #, c-format
 msgid "Checking system directory inode '%s'\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:562
+#: gfs2/fsck/pass2.c:573
 #, c-format
 msgid "No '.' entry found for %s directory.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:563 gfs2/fsck/pass2.c:753
+#: gfs2/fsck/pass2.c:574 gfs2/fsck/pass2.c:768
 msgid "Is it okay to add '.' entry? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:569
+#: gfs2/fsck/pass2.c:580
 msgid "Unable to allocate name string\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:575
+#: gfs2/fsck/pass2.c:586
 msgid "Unable to zero name string\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:580
+#: gfs2/fsck/pass2.c:591
 msgid "Adding '.' entry\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:592 gfs2/fsck/pass2.c:793
+#: gfs2/fsck/pass2.c:603 gfs2/fsck/pass2.c:808
 msgid "The directory was not fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:595
+#: gfs2/fsck/pass2.c:606
 #, c-format
 msgid "%s inode %llu (0x%llx): Entries is %d - should be %d\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:600
+#: gfs2/fsck/pass2.c:611
 #, c-format
 msgid "Fix entries for %s inode %llu (0x%llx)? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:606
+#: gfs2/fsck/pass2.c:617
 msgid "Entries updated\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:608
+#: gfs2/fsck/pass2.c:619
 #, c-format
 msgid "Entries for inode %llu (0x%llx) left out of sync\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:671
+#: gfs2/fsck/pass2.c:682
 msgid "Checking directory inodes.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:687
+#: gfs2/fsck/pass2.c:698
 #, c-format
-msgid "Checking directory inode at block %<PRIu64> (0x%<PRIx64>)\n"
+msgid "Checking directory inode at block %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:716 gfs2/fsck/pass3.c:121
+#: gfs2/fsck/pass2.c:727 gfs2/fsck/pass3.c:125
 #, c-format
 msgid ""
-"Remove directory entry for bad inode %<PRIu64> (0x%<PRIx64>) in %<PRIu64> (0x"
-"%<PRIx64>)? (y/n)"
+"Remove directory entry for bad inode %llu (0x%llx) in %llu (0x%llx)? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:728
+#: gfs2/fsck/pass2.c:741
 #, c-format
-msgid ""
-"Unable to find dentry for %<PRIu64> (0x%<PRIx64>) in %<PRIu64> (0x"
-"%<PRIx64>)\n"
+msgid "Unable to find dentry for %llu (0x%llx) in %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:735 gfs2/fsck/pass3.c:137
+#: gfs2/fsck/pass2.c:749 gfs2/fsck/pass3.c:146
 msgid "Directory entry removed\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:737
+#: gfs2/fsck/pass2.c:751
 msgid "Directory entry to invalid inode remains.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:738
+#: gfs2/fsck/pass2.c:752
 #, c-format
 msgid "Directory block %lld (0x%llx) is now marked as 'invalid'\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:749
+#: gfs2/fsck/pass2.c:763
 #, c-format
-msgid ""
-"No '.' entry found for directory inode at block %<PRIu64> (0x%<PRIx64>)\n"
+msgid "No '.' entry found for directory inode at block %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:761 gfs2/fsck/pass3.c:38
+#: gfs2/fsck/pass2.c:776 gfs2/fsck/pass3.c:38
 msgid "Unable to allocate name\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:767 gfs2/fsck/pass3.c:45
+#: gfs2/fsck/pass2.c:782 gfs2/fsck/pass3.c:45
 msgid "Unable to zero name\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:779 gfs2/fsck/pass3.c:61
+#: gfs2/fsck/pass2.c:794 gfs2/fsck/pass3.c:61
 #, c-format
 msgid "Directory at %lld (0x%llx)"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:788
+#: gfs2/fsck/pass2.c:803
 msgid "\". (itself)\""
 msgstr ""
 
-#: gfs2/fsck/pass2.c:791
+#: gfs2/fsck/pass2.c:806
 msgid "The directory was fixed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:798
+#: gfs2/fsck/pass2.c:813
 #, c-format
 msgid "Entries is %d - should be %d for inode block %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass2.c:803
+#: gfs2/fsck/pass2.c:818
 msgid "Fix the entry count? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass2.c:807
+#: gfs2/fsck/pass2.c:822
 msgid "The entry count was not fixed.\n"
 msgstr ""
 
@@ -2950,140 +2354,135 @@ msgstr ""
 #: gfs2/fsck/pass3.c:85
 #, c-format
 msgid ""
-"Directory '..' and treewalk connections disagree for inode %<PRIu64> (0x"
-"%<PRIx64>)\n"
+"Directory '..' and treewalk connections disagree for inode %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:87
+#: gfs2/fsck/pass3.c:88
 #, c-format
-msgid ""
-"'..' has %<PRIu64> (0x%<PRIx64>), treewalk has %<PRIu64> (0x%<PRIx64>)\n"
+msgid "'..' has %llu (0x%llx), treewalk has %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:102
+#: gfs2/fsck/pass3.c:105
 msgid "Orphaned directory, move to lost+found\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:106
+#: gfs2/fsck/pass3.c:109
 #, c-format
-msgid "Treewalk parent is correct, fixing dotdot -> %<PRIu64> (0x%<PRIx64>)\n"
+msgid "Treewalk parent is correct, fixing dotdot -> %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:116
+#: gfs2/fsck/pass3.c:120
 msgid ".. parent is valid, but treewalkis bad - reattaching to lost+found"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:132
+#: gfs2/fsck/pass3.c:139
 #, c-format
-msgid ""
-"Unable to find dentry for block %<PRIu64> (0x%<PRIx64>) in %<PRIu64> (0x"
-"%<PRIx64>)\n"
+msgid "Unable to find dentry for block %llu (0x%llx) in %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:139
+#: gfs2/fsck/pass3.c:148
 msgid "Directory entry to invalid inode remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:141
+#: gfs2/fsck/pass3.c:150
 msgid "Marking directory unlinked\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:146
+#: gfs2/fsck/pass3.c:155
 msgid ""
 "Both .. and treewalk parents are directories, going with treewalk for "
 "now...\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:159
+#: gfs2/fsck/pass3.c:168
 #, c-format
-msgid ""
-"Orphaned directory at block %<PRIu64> (0x%<PRIx64>) moved to lost+found\n"
+msgid "Orphaned directory at block %llu (0x%llx) moved to lost+found\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:184
+#: gfs2/fsck/pass3.c:194
 msgid "Marking root inode connected\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:189
+#: gfs2/fsck/pass3.c:199
 msgid "Marking master directory inode connected\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:197
+#: gfs2/fsck/pass3.c:207
 msgid "Checking directory linkage.\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:210
+#: gfs2/fsck/pass3.c:220
 #, c-format
-msgid "Directory at block %<PRIu64> (0x%<PRIx64>) connected\n"
+msgid "Directory at block %llu (0x%llx) connected\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:218
+#: gfs2/fsck/pass3.c:228
 msgid "Found unlinked directory containing bad block\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:220
+#: gfs2/fsck/pass3.c:230
 msgid "Clear unlinked directory with bad blocks? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass3.c:222 gfs2/fsck/pass3.c:250
+#: gfs2/fsck/pass3.c:232 gfs2/fsck/pass3.c:260
 #, c-format
 msgid "inode %lld (0x%llx) is now marked as free\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:236
+#: gfs2/fsck/pass3.c:246
 msgid "Unlinked directory with bad block remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:242
+#: gfs2/fsck/pass3.c:252
 msgid "Unlinked block marked as an inode is not an inode\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:244
+#: gfs2/fsck/pass3.c:254
 msgid "Clear the unlinked block? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass3.c:246
+#: gfs2/fsck/pass3.c:256
 msgid "The block was not cleared\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:260
+#: gfs2/fsck/pass3.c:270
 msgid "The block was cleared\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:264
+#: gfs2/fsck/pass3.c:274
 #, c-format
-msgid "Found unlinked directory at block %<PRIu64> (0x%<PRIx64>)\n"
+msgid "Found unlinked directory at block %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:270
+#: gfs2/fsck/pass3.c:280
 msgid "Unlinked directory has zero size.\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:272
+#: gfs2/fsck/pass3.c:282
 msgid "Remove zero-size unlinked directory? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass3.c:275
+#: gfs2/fsck/pass3.c:285
 msgid "zero-sized unlinked inode"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:280
+#: gfs2/fsck/pass3.c:290
 msgid "Zero-size unlinked directory remains\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:284
+#: gfs2/fsck/pass3.c:294
 msgid "Add unlinked directory to lost+found? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass3.c:291
+#: gfs2/fsck/pass3.c:301
 msgid "Directory relinked to lost+found\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:293
+#: gfs2/fsck/pass3.c:303
 msgid "Unlinked directory remains unlinked\n"
 msgstr ""
 
-#: gfs2/fsck/pass3.c:300
+#: gfs2/fsck/pass3.c:310
 #, c-format
 msgid "At end of pass3, lost+found entries is %u\n"
 msgstr ""
@@ -3104,108 +2503,107 @@ msgstr ""
 
 #: gfs2/fsck/pass4.c:62
 #, c-format
-msgid "Found unlinked inode at %<PRIu64> (0x%<PRIx64>)\n"
+msgid "Found unlinked inode at %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:66
+#: gfs2/fsck/pass4.c:67
 #, c-format
 msgid "Unlinked inode %llu (0x%llx) containsbad blocks\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:70
+#: gfs2/fsck/pass4.c:71
 msgid "Delete unlinked inode with bad blocks? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass4.c:77
+#: gfs2/fsck/pass4.c:78
 msgid "bad unlinked"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:82
+#: gfs2/fsck/pass4.c:83
 msgid "Unlinked inode with bad blocks not cleared\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:91
+#: gfs2/fsck/pass4.c:92
 #, c-format
 msgid "Unlinked block %lld (0x%llx) marked as inode is not an inode (%d)\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:97
+#: gfs2/fsck/pass4.c:98
 msgid "Delete unlinked inode? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass4.c:102
+#: gfs2/fsck/pass4.c:103
 msgid "invalid unlinked"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:105
+#: gfs2/fsck/pass4.c:106
 msgid "The inode was deleted\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:107
+#: gfs2/fsck/pass4.c:108
 msgid "The inode was not deleted\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:119
+#: gfs2/fsck/pass4.c:120
 msgid "Unlinked inode has zero size\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:120
+#: gfs2/fsck/pass4.c:121
 msgid "Clear zero-size unlinked inode? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass4.c:123
+#: gfs2/fsck/pass4.c:124
 msgid "unlinked zero-length"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:130
+#: gfs2/fsck/pass4.c:131
 msgid "Add unlinked inode to lost+found? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:141
+#: gfs2/fsck/pass4.c:142
 msgid "Unlinked inode left unlinked\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:145
+#: gfs2/fsck/pass4.c:146
 #, c-format
 msgid ""
-"Link count inconsistent for inode %<PRIu64> (0x%<PRIx64>) has %u but fsck "
-"found %u.\n"
+"Link count inconsistent for inode %llu (0x%llx) has %u but fsck found %u.\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:150
+#: gfs2/fsck/pass4.c:153
 #, c-format
-msgid "Update link count for inode %<PRIu64> (0x%<PRIx64>) ? (y/n) "
+msgid "Update link count for inode %llu (0x%llx) ? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass4.c:157
+#: gfs2/fsck/pass4.c:161
 #, c-format
-msgid "Link count updated to %d for inode %<PRIu64> (0x%<PRIx64>) \n"
+msgid "Link count updated to %d for inode %llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:162
+#: gfs2/fsck/pass4.c:167
 #, c-format
-msgid "Link count for inode %<PRIu64> (0x%<PRIx64>) still incorrect\n"
+msgid "Link count for inode %llu (0x%llx) still incorrect\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:166
+#: gfs2/fsck/pass4.c:172
 #, c-format
-msgid "block %<PRIu64> (0x%<PRIx64>) has link count %d\n"
+msgid "block %llu (0x%llx) has link count %d\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:172
+#: gfs2/fsck/pass4.c:179
 msgid "Unable to find lost+found inode in inode_hash!!\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:194
+#: gfs2/fsck/pass4.c:201
 #, c-format
 msgid "At beginning of pass4, lost+found entries is %u\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:196
+#: gfs2/fsck/pass4.c:203
 msgid "Checking inode reference counts.\n"
 msgstr ""
 
-#: gfs2/fsck/pass4.c:203
+#: gfs2/fsck/pass4.c:210
 #, c-format
 msgid "At end of pass4, lost+found entries is %u\n"
 msgstr ""
@@ -3236,72 +2634,71 @@ msgstr ""
 
 #: gfs2/fsck/pass5.c:101
 #, c-format
-msgid ""
-"Unlinked block found at block %<PRIu64> (0x%<PRIx64>), left unchanged.\n"
+msgid "Unlinked block found at block %llu (0x%llx), left unchanged.\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:109
+#: gfs2/fsck/pass5.c:110
 #, c-format
-msgid "Ondisk and fsck bitmaps differ at block %<PRIu64> (0x%<PRIx64>) \n"
+msgid "Ondisk and fsck bitmaps differ at block %llu (0x%llx) \n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:111
+#: gfs2/fsck/pass5.c:114
 #, c-format
 msgid "Ondisk status is %u (%s) but FSCK thinks it should be "
 msgstr ""
 
-#: gfs2/fsck/pass5.c:114
+#: gfs2/fsck/pass5.c:117
 #, c-format
 msgid "Metadata type is %u (%s)\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:117
+#: gfs2/fsck/pass5.c:120
 #, c-format
-msgid "Fix bitmap for block %<PRIu64> (0x%<PRIx64>) ? (y/n) "
+msgid "Fix bitmap for block %llu (0x%llx) ? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass5.c:121
+#: gfs2/fsck/pass5.c:124
 msgid "Failed.\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:123
+#: gfs2/fsck/pass5.c:126
 msgid "Succeeded.\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:125
+#: gfs2/fsck/pass5.c:128
 #, c-format
-msgid "Bitmap at block %<PRIu64> (0x%<PRIx64>) left inconsistent\n"
+msgid "Bitmap at block %llu (0x%llx) left inconsistent\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:159
+#: gfs2/fsck/pass5.c:163
 #, c-format
 msgid "RG #%llu (0x%llx) free count inconsistent: is %u should be %u\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:168
+#: gfs2/fsck/pass5.c:172
 #, c-format
 msgid "Inode count inconsistent: is %u should be %u\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:177
+#: gfs2/fsck/pass5.c:181
 msgid "Internal fsck error - AAHHH!\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:181
+#: gfs2/fsck/pass5.c:185
 msgid "Update resource group counts? (y/n) "
 msgstr ""
 
-#: gfs2/fsck/pass5.c:182
+#: gfs2/fsck/pass5.c:186
 msgid "Resource group counts updated\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:186
+#: gfs2/fsck/pass5.c:190
 msgid "Resource group counts left inconsistent\n"
 msgstr ""
 
-#: gfs2/fsck/pass5.c:207
+#: gfs2/fsck/pass5.c:211
 #, c-format
-msgid "Verifying Resource Group #%<PRIu64>\n"
+msgid "Verifying Resource Group #%llu\n"
 msgstr ""
 
 #: gfs2/fsck/rgrepair.c:24
@@ -3316,12 +2713,12 @@ msgstr ""
 
 #: gfs2/fsck/rgrepair.c:61
 #, c-format
-msgid "False RG found at block 0x%<PRIx64>\n"
+msgid "False RG found at block 0x%llx\n"
 msgstr ""
 
 #: gfs2/fsck/rgrepair.c:137
 #, c-format
-msgid "RG found at block 0x%<PRIx64>\n"
+msgid "RG found at block 0x%llx\n"
 msgstr ""
 
 #: gfs2/fsck/rgrepair.c:158
@@ -3330,12 +2727,12 @@ msgstr ""
 
 #: gfs2/fsck/rgrepair.c:177
 #, c-format
-msgid "First RG distance: 0x%<PRIx64>\n"
+msgid "First RG distance: 0x%llx\n"
 msgstr ""
 
 #: gfs2/fsck/rgrepair.c:178
 #, c-format
-msgid "Distance between RGs: 0x%<PRIx64>\n"
+msgid "Distance between RGs: 0x%llx\n"
 msgstr ""
 
 #: gfs2/fsck/rgrepair.c:188
@@ -3348,12 +2745,12 @@ msgstr ""
 
 #: gfs2/fsck/rgrepair.c:199
 #, c-format
-msgid "Adjusted first RG distance: 0x%<PRIx64>\n"
+msgid "Adjusted first RG distance: 0x%llx\n"
 msgstr ""
 
 #: gfs2/fsck/rgrepair.c:210
 #, c-format
-msgid "Block 0x%<PRIx64>\n"
+msgid "Block 0x%llx\n"
 msgstr ""
 
 #: gfs2/fsck/rgrepair.c:217
@@ -3362,99 +2759,111 @@ msgstr ""
 
 #: gfs2/fsck/rgrepair.c:230
 #, c-format
-msgid "Missing or damaged RG at block %<PRIu64> (0x%<PRIx64>)\n"
+msgid "Missing or damaged RG at block %llu (0x%llx)\n"
 msgstr ""
 
 #: gfs2/fsck/rgrepair.c:234
 msgid "Error: too many bad RGs.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:270 gfs2/fsck/rgrepair.c:301
+#: gfs2/fsck/rgrepair.c:270 gfs2/fsck/rgrepair.c:302
 #, c-format
-msgid "Prev ri_data set to: %<PRIx32>.\n"
+msgid "Prev ri_data set to: %lx.\n"
 msgstr ""
 
 #: gfs2/fsck/rgrepair.c:274
 #, c-format
-msgid "%c RG %d at block 0x%<PRIX64> %s"
+msgid "%c RG %d at block 0x%llX %s"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:285
+#: gfs2/fsck/rgrepair.c:286
 #, c-format
-msgid " [length 0x%<PRIx64>]\n"
+msgid " [length 0x%llx]\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:308
+#: gfs2/fsck/rgrepair.c:309
 msgid "RG index rebuilt as follows:\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:355
+#: gfs2/fsck/rgrepair.c:343 gfs2/mkfs/main_grow.c:317
+#: gfs2/mkfs/main_mkfs.c:601
+#, c-format
+msgid "Geometry error\n"
+msgstr ""
+
+#: gfs2/fsck/rgrepair.c:347 gfs2/mkfs/main_grow.c:333
+#: gfs2/mkfs/main_mkfs.c:618
 #, c-format
-msgid "fs_total_size = 0x%<PRIX64> blocks.\n"
+msgid "Device is too small (%llu bytes)\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:365
+#: gfs2/fsck/rgrepair.c:356
+#, c-format
+msgid "fs_total_size = 0x%llX blocks.\n"
+msgstr ""
+
+#: gfs2/fsck/rgrepair.c:366
 #, c-format
 msgid "L2: number of rgs in the index = %d.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:383
+#: gfs2/fsck/rgrepair.c:384
 #, c-format
 msgid ""
 "Block #%lld (0x%llx) (%d of %d) is neither GFS2_METATYPE_RB nor "
 "GFS2_METATYPE_RG.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:388
+#: gfs2/fsck/rgrepair.c:389
 msgid "Fix the Resource Group? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:389
+#: gfs2/fsck/rgrepair.c:390
 msgid "Attempting to repair the RG.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:466
+#: gfs2/fsck/rgrepair.c:467
 msgid "The rindex file does not meet our expectations.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:487
+#: gfs2/fsck/rgrepair.c:488
 msgid "Error rebuilding rg list.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:497
+#: gfs2/fsck/rgrepair.c:498
 msgid "WARNING: rindex file is corrupt.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:502
+#: gfs2/fsck/rgrepair.c:503
 #, c-format
 msgid "L%d: number of rgs expected     = %lld.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:505
+#: gfs2/fsck/rgrepair.c:506
 #, c-format
 msgid "L%d: They don't match; either (1) the fs was extended, (2) an odd\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:506
+#: gfs2/fsck/rgrepair.c:507
 #, c-format
 msgid "L%d: rg size was used, or (3) we have a corrupt rg index.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:535
+#: gfs2/fsck/rgrepair.c:536
 #, c-format
 msgid "Level %d didn't work.  Too many descepencies.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:537
+#: gfs2/fsck/rgrepair.c:538
 #, c-format
 msgid "%d out of %d RGs did not match what was expected.\n"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:562
+#: gfs2/fsck/rgrepair.c:563
 msgid "Fix the index? (y/n)"
 msgstr ""
 
-#: gfs2/fsck/rgrepair.c:581
+#: gfs2/fsck/rgrepair.c:582
 msgid "RG index not fixed.\n"
 msgstr ""
 
@@ -3467,36 +2876,594 @@ msgstr ""
 
 #: gfs2/fsck/util.c:78
 #, c-format
-msgid "\r%<PRIu64> percent complete.\r"
+msgid "\r%llu percent complete.\r"
 msgstr ""
 
-#: gfs2/fsck/util.c:259
+#: gfs2/fsck/util.c:260
 msgid "Unable to allocate inode_with_dups structure\n"
 msgstr ""
 
-#: gfs2/fsck/util.c:264
+#: gfs2/fsck/util.c:265
 msgid "Unable to zero inode_with_dups structure\n"
 msgstr ""
 
-#: gfs2/fsck/util.c:281
+#: gfs2/fsck/util.c:282
 #, c-format
 msgid ""
 "Found %d reference(s) to block %llu (0x%llx) as %s in inode #%llu (0x%llx)\n"
 msgstr ""
 
-#: gfs2/fsck/util.c:288
+#: gfs2/fsck/util.c:289
 msgid "This is the original reference.\n"
 msgstr ""
 
-#: gfs2/fsck/util.c:290
+#: gfs2/fsck/util.c:291
 #, c-format
 msgid "This brings the total to: %d\n"
 msgstr ""
 
-#: gfs2/fsck/util.c:314
+#: gfs2/fsck/util.c:315
 msgid "Unable to allocate dir_info structure\n"
 msgstr ""
 
-#: gfs2/fsck/util.c:318
+#: gfs2/fsck/util.c:319
 msgid "Error while zeroing dir_info structure\n"
 msgstr ""
+
+#: gfs2/mkfs/main.c:51
+msgid "Unknown mode\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:52
+#, c-format
+msgid ""
+"Usage:\n"
+"\n"
+"gfs2_grow [options] /path/to/filesystem\n"
+"\n"
+"Options:\n"
+"  -h               Usage information\n"
+"  -q               Quiet, reduce verbosity\n"
+"  -T               Test, do everything except update FS\n"
+"  -V               Version information\n"
+"  -v               Verbose, increase verbosity\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:86
+#, c-format
+msgid "(Test mode--File system will not be changed)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:195
+#, c-format
+msgid "%d new rindex entries.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:305 gfs2/mkfs/main_jadd.c:503
+#, c-format
+msgid "Not a valid GFS2 mount point: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:314 gfs2/mkfs/main_mkfs.c:562
+#, c-format
+msgid "can't open device %s: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:330
+msgid "gfs: Error reading superblock.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:339 gfs2/mkfs/main_jadd.c:513
+#, c-format
+msgid "Error mounting GFS2 metafs: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:348
+msgid "GFS2 rindex not found.  Please run gfs2_fsck.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:364
+msgid "Error: The device has grown by less than one Resource Group (RG).\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:366
+#, c-format
+msgid "The device grew by %lluMB. "
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:368
+#, c-format
+msgid "One RG is %uMB for this file system.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:388
+msgid "gfs2_grow complete.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:38
+#, c-format
+msgid "error doing get flags (%d): %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:45
+#, c-format
+msgid "error doing set flags (%d): %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:56
+msgid "rename2system (1)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:61
+msgid "rename2system (2)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:73
+#, c-format
+msgid ""
+"Usage:\n"
+"\n"
+"%s [options] /path/to/filesystem\n"
+"\n"
+"Options:\n"
+"\n"
+"  -c <MB>           Size of quota change file\n"
+"  -D                Enable debugging code\n"
+"  -h                Print this help, then exit\n"
+"  -J <MB>           Size of journals\n"
+"  -j <num>          Number of journals\n"
+"  -q                Don't print anything\n"
+"  -V                Print program version information, then exit\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:139 gfs2/mkfs/main_mkfs.c:176
+#, c-format
+msgid "Unknown option: %c\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:148
+msgid "no path specified (try -h for help)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:151
+#, c-format
+msgid "Unrecognized option: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:154 gfs2/mkfs/main_mkfs.c:194
+#, c-format
+msgid "Command Line Arguments:\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:167 gfs2/mkfs/main_mkfs.c:316
+msgid "no journals specified\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:169 gfs2/mkfs/main_mkfs.c:319
+msgid "bad journal size\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:171 gfs2/mkfs/main_mkfs.c:325
+msgid "bad quota change size\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:191
+#, c-format
+msgid "Filesystem:            %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:192
+#, c-format
+msgid "Old Journals           %u\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:193
+#, c-format
+msgid "New Journals           %u\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:215
+#, c-format
+msgid "can't unlink %s: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:218
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:239 gfs2/mkfs/main_jadd.c:271
+#, c-format
+msgid "write error: %s from %s:%d: offset 0\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:251 gfs2/mkfs/main_jadd.c:283
+#: gfs2/mkfs/main_jadd.c:351 gfs2/mkfs/main_jadd.c:472
+#, c-format
+msgid "can't rename2system %s (%d): %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:310 gfs2/mkfs/main_jadd.c:330
+#: gfs2/mkfs/main_jadd.c:418 gfs2/mkfs/main_jadd.c:448
+#, c-format
+msgid "write error: %s from %s:%d: block %lld (0x%llx)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:342 gfs2/mkfs/main_jadd.c:463
+#, c-format
+msgid "can't fsync: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:360
+#, c-format
+msgid "Could not statfs the filesystem %s: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:377
+#, c-format
+msgid "Could not find the jindex directory in gfs2meta mount! error: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:390
+msgid "There are no journals for this gfs2 fs! Did you mkfs.gfs2 correctly?\n"
+msgstr ""
+
+#: gfs2/mkfs/main_jadd.c:498
+#, c-format
+msgid "can't open root directory %s: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:49
+#, c-format
+msgid ""
+"Usage:\n"
+"\n"
+"%s [options] <device> [ block-count ]\n"
+"\n"
+"Options:\n"
+"\n"
+"  -b <bytes>       Filesystem block size\n"
+"  -c <MB>          Size of quota change file\n"
+"  -D               Enable debugging code\n"
+"  -h               Print this help, then exit\n"
+"  -J <MB>          Size of journals\n"
+"  -j <num>         Number of journals\n"
+"  -O               Don't ask for confirmation\n"
+"  -p <name>        Name of the locking protocol\n"
+"  -q               Don't print anything\n"
+"  -r <MB>          Resource Group Size\n"
+"  -t <name>        Name of the lock table\n"
+"  -u <MB>          Size of unlinked file\n"
+"  -V               Print program version information, then exit\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:119
+#, c-format
+msgid "lock protocol name %s is too long\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:134
+#, c-format
+msgid "lock table name %s is too long\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:172
+msgid "More than one device specified (try -h for help)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:185
+msgid "no device specified (try -h for help)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:191
+#, c-format
+msgid "Unrecognized argument: %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:204
+#, c-format
+msgid "  rgsize = optimize for best performance\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:233
+msgid "locktable error: contains space characters\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:235
+msgid "locktable error: contains unprintable characters\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:240
+msgid "locktable error: missing colon in the locktable\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:243
+msgid "locktable error: missing cluster name\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:245
+msgid "locktable error: cluster name too long\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:249 gfs2/mkfs/main_mkfs.c:255
+msgid "locktable error: missing filesystem name\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:252
+msgid "locktable error: more than one colon present\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:257
+msgid "locktable error: filesystem name too long\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:259
+#, c-format
+msgid "lockproto error: %s unknown\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:275
+#, c-format
+msgid "block size must be a power of two between 512 and %d\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:279
+#, c-format
+msgid "Error: Block size %d is less than minimum logical block size (%d).\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:285
+#, c-format
+msgid ""
+"WARNING: Block size %d is inefficient because it is less than the physical "
+"block size (%d).\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:291 gfs2/mkfs/main_mkfs.c:443
+#, c-format
+msgid ""
+"\n"
+"Are you sure you want to proceed? [y/n] "
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:293 gfs2/mkfs/main_mkfs.c:445
+msgid "unable to read from stdin\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:296 gfs2/mkfs/main_mkfs.c:448
+msgid "aborted\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:309 gfs2/mkfs/main_mkfs.c:312
+msgid "bad resource group size\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:322
+msgid "bad unlinked size\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:410
+#, c-format
+msgid ""
+"Content of file or device unknown (do you have GNU fileutils installed?)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:414
+#, c-format
+msgid "It appears to contain: %s"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:439
+#, c-format
+msgid "Error: device %s not found.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:440
+#, c-format
+msgid "This will destroy any data on %s.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:465
+#, c-format
+msgid "could not stat device %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:467
+#, c-format
+msgid "%s is not a block device\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:473
+#, c-format
+msgid "device %s is busy\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:499
+#, c-format
+msgid "Expert mode:               on\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:501
+#, c-format
+msgid "Device:                    %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:503
+#, c-format
+msgid "Blocksize:                 %u\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:504
+#, c-format
+msgid "Device Size                %.2f GB (%llu blocks)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:507
+#, c-format
+msgid "Filesystem Size:           %.2f GB (%llu blocks)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:510
+#, c-format
+msgid "Journals:                  %u\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:511
+#, c-format
+msgid "Resource Groups:           %llu\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:513
+#, c-format
+msgid "Locking Protocol:          \"%s\"\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:514
+#, c-format
+msgid "Lock Table:                \"%s\"\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:518
+#, c-format
+msgid "Writes:                    %u\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:521
+#, c-format
+msgid "UUID:                      %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:569
+#, c-format
+msgid "Device topology error\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:609
+#, c-format
+msgid "%s: Specified block count is bigger than the actual device.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:611
+#, c-format
+msgid "Device Size is %.2f GB (%llu blocks)\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:656
+#, c-format
+msgid "can't fsync device (%d): %s\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:660
+#, c-format
+msgid "error closing device (%d): %s\n"
+msgstr ""
+
+#: gfs2/tune/main.c:91
+#, c-format
+msgid "Invalid option.\n"
+msgstr ""
+
+#: gfs2/tune/main.c:102
+#, c-format
+msgid "Unable to open device %s\n"
+msgstr ""
+
+#: gfs2/tune/super.c:65
+#, c-format
+msgid "Invalid UUID specified.\n"
+msgstr ""
+
+#: gfs2/tune/super.c:75
+#, c-format
+msgid "uuid %s has an invalid format."
+msgstr ""
+
+#: gfs2/tune/super.c:80
+#, c-format
+msgid "uuid %s has an invalid hex digit '%c' at offset %d.\n"
+msgstr ""
+
+#: gfs2/tune/super.c:99
+#, c-format
+msgid "Error reading from device"
+msgstr ""
+
+#: gfs2/tune/super.c:104
+#, c-format
+msgid "Not a GFS/GFS2 device\n"
+msgstr ""
+
+#: gfs2/tune/super.c:127
+#, c-format
+msgid "Filesystem volume name: %.*s\n"
+msgstr ""
+
+#: gfs2/tune/super.c:129
+#, c-format
+msgid "Filesystem UUID: %s\n"
+msgstr ""
+
+#: gfs2/tune/super.c:130
+#, c-format
+msgid "Filesystem magic number: 0x%X\n"
+msgstr ""
+
+#: gfs2/tune/super.c:131
+#, c-format
+msgid "Block size: %d\n"
+msgstr ""
+
+#: gfs2/tune/super.c:132
+#, c-format
+msgid "Block shift: %d\n"
+msgstr ""
+
+#: gfs2/tune/super.c:133
+#, c-format
+msgid "Root inode: %llu\n"
+msgstr ""
+
+#: gfs2/tune/super.c:135
+#, c-format
+msgid "Master inode: %llu\n"
+msgstr ""
+
+#: gfs2/tune/super.c:136
+#, c-format
+msgid "Lock Protocol: %.*s\n"
+msgstr ""
+
+#: gfs2/tune/super.c:138
+#, c-format
+msgid "Lock table: %.*s\n"
+msgstr ""
+
+#: gfs2/tune/super.c:148
+#, c-format
+msgid "Unable to write super block\n"
+msgstr ""
+
+#: gfs2/tune/super.c:166
+#, c-format
+msgid "Label too long\n"
+msgstr ""
+
+#: gfs2/tune/super.c:179
+#, c-format
+msgid "UUID can be changed for a GFS2"
+msgstr ""
+
+#: gfs2/tune/super.c:180
+#, c-format
+msgid " device only\n"
+msgstr ""
+
+#: gfs2/tune/super.c:195
+#, c-format
+msgid "Incorrect lock protocol specified\n"
+msgstr ""
+
+#: gfs2/tune/super.c:222
+#, c-format
+msgid "Lock table name too big\n"
+msgstr ""


More information about the cluster-commits mailing list