cluster: STABLE3 - fsck.gfs2: Add gettext support

[Steven Whitehouse <swhiteho@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=797bcb77cbed90852be871012075fd18ea0ba6c3
Commit:        797bcb77cbed90852be871012075fd18ea0ba6c3
Parent:        873360edd9ae4417fa11379928ecf0f54216cb42
Author:        Steven Whitehouse <steve@dolmen.chygwyn.com>
AuthorDate:    Tue Mar 24 20:50:24 2009 +0000
Committer:     Steven Whitehouse <swhiteho@redhat.com>
CommitterDate: Wed May 27 10:06:20 2009 +0100

fsck.gfs2: Add gettext support

The messages need to be cleaned up a bit, but this is the guts of it
anyway.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
 gfs2/fsck/main.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c
index 0bd67cc..b0f7856 100644
--- a/gfs2/fsck/main.c
+++ b/gfs2/fsck/main.c
@@ -90,15 +90,9 @@ static int read_cmdline(int argc, char **argv, struct gfs2_options *gopts)
 		}
 	}
 	if(argc > optind) {
-<<<<<<< HEAD:gfs2/fsck/main.c
 		gopts->device = (argv[optind]);
-		if(!gopts->device) {
-			fprintf(stderr, "Please use '-h' for usage.\n");
-=======
-		opts->device = (argv[optind]);
 		if(!opts->device) {
 			fprintf(stderr, _("Please use '-h' for usage.\n"));
->>>>>>> abf33c3... fsck.gfs2: Add gettext support:gfs2/fsck/main.c
 			return FSCK_USAGE;
 		}
 	} else {