Gitweb:
http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: f3a03a185ad197cb7ce488d15241174c215efcb8
Parent: 4adcdab609503628601f0c420327bc909a779a85
Author: Carlos Maiolino <cmaiolino(a)redhat.com>
AuthorDate: Tue Jul 26 10:32:49 2011 -0300
Committer: Carlos Maiolino <cmaiolino(a)redhat.com>
CommitterDate: Tue Jul 26 11:10:51 2011 -0300
i18n: strings review
This patch is the first review of the gfs2-utils
strings that will be translated. The changes in
this patch were based according with the current
strings added to the .pot file
---
gfs2/convert/gfs2_convert.c | 4 ++--
gfs2/fsck/fs_recovery.c | 4 ++--
gfs2/fsck/initialize.c | 10 +++++-----
gfs2/fsck/main.c | 8 ++++----
gfs2/fsck/pass1c.c | 2 +-
gfs2/fsck/pass4.c | 2 +-
gfs2/mkfs/main_grow.c | 4 ++--
gfs2/mkfs/main_jadd.c | 6 +++---
gfs2/mkfs/main_mkfs.c | 6 +++---
gfs2/tune/main.c | 2 +-
10 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index 7f6135f..c255874 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -1690,11 +1690,11 @@ static void process_parameters(int argc, char **argv, struct
gfs2_options *opts)
strcpy(device, argv[optind]);
opts->device = device;
if(!opts->device) {
- fprintf(stderr, _("Please use '-h' for usage.\n"));
+ fprintf(stderr, _("No device specified. Please use '-h' for
help\n"));
exit(1);
}
} else {
- fprintf(stderr, _("No device specified. Use '-h' for usage.\n"));
+ fprintf(stderr, _("No device specified. Please use '-h' for
help\n"));
exit(1);
}
} /* process_parameters */
diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
index da06598..198111b 100644
--- a/gfs2/fsck/fs_recovery.c
+++ b/gfs2/fsck/fs_recovery.c
@@ -473,8 +473,8 @@ static int gfs2_recover_journal(struct gfs2_inode *ip, int j, int
preen,
log_info( _("jid=%u: Repairing journal...\n"), j);
error = fix_journal_seq_no(ip);
if (error) {
- log_err( _("jid=%u: Unable to repair the bad "
- "journal.\n"), j);
+ log_err( _("jid=%u: Unable to fix the bad journal.\n"),
+ j);
goto out;
}
error = gfs2_find_jhead(ip, &head);
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index 697671c..0930ba6 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -762,7 +762,7 @@ static void peruse_system_dinode(struct gfs2_sbd *sdp, struct
gfs2_dinode *di,
if (di->di_num.no_formal_ino == 2) {
if (sdp->sd_sb.sb_master_dir.no_addr)
return;
- log_warn(_("Found system master directory at: 0x%llx.\n"),
+ log_warn(_("Found system master directory at: 0x%llx\n"),
di->di_num.no_addr);
sdp->sd_sb.sb_master_dir.no_addr = di->di_num.no_addr;
return;
@@ -887,7 +887,7 @@ static void peruse_user_dinode(struct gfs2_sbd *sdp, struct
gfs2_dinode *di,
gfs2_lookupi(ip, "..", 2, &parent_ip);
if (parent_ip && parent_ip->i_di.di_num.no_addr ==
ip->i_di.di_num.no_addr) {
- log_warn(_("fsck found the root inode at: 0x%llx\n"),
+ log_warn(_("Found the root directory at: 0x%llx\n"),
ip->i_di.di_num.no_addr);
sdp->sd_sb.sb_root_dir.no_addr =
ip->i_di.di_num.no_addr;
@@ -1078,7 +1078,7 @@ static int sb_repair(struct gfs2_sbd *sdp)
"be the root; using master - 1.\n"));
possible_root = sdp->sd_sb.sb_master_dir.no_addr - 1;
}
- log_err(_("Found a root directory candidate at 0x%llx\n"),
+ log_err(_("Found a possible root at: 0x%llx\n"),
(unsigned long long)possible_root);
sdp->sd_sb.sb_root_dir.no_addr = possible_root;
sdp->md.rooti = inode_read(sdp, possible_root);
@@ -1106,13 +1106,13 @@ static int sb_repair(struct gfs2_sbd *sdp)
/* Step 3 - Rebuild the lock protocol and file system table name */
get_lockproto_table(sdp);
if (query(_("Okay to fix the GFS2 superblock? (y/n)"))) {
- log_info(_("Master system directory found at: 0x%llx\n"),
+ log_info(_("Found system master directory at: 0x%llx\n"),
sdp->sd_sb.sb_master_dir.no_addr);
sdp->master_dir = inode_read(sdp,
sdp->sd_sb.sb_master_dir.no_addr);
sdp->master_dir->i_di.di_num.no_addr =
sdp->sd_sb.sb_master_dir.no_addr;
- log_info(_("Root directory found at: 0x%llx\n"),
+ log_info(_("Found the root directory at: 0x%llx\n"),
sdp->sd_sb.sb_root_dir.no_addr);
sdp->md.rooti = inode_read(sdp,
sdp->sd_sb.sb_root_dir.no_addr);
diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c
index bb540e7..d0aceb1 100644
--- a/gfs2/fsck/main.c
+++ b/gfs2/fsck/main.c
@@ -99,10 +99,10 @@ static int read_cmdline(int argc, char **argv, struct gfs2_options
*gopts)
break;
case ':':
case '?':
- fprintf(stderr, _("Please use '-h' for usage.\n"));
+ fprintf(stderr, _("Please use '-h' for help.\n"));
return FSCK_USAGE;
default:
- fprintf(stderr, _("Unknown option %c\n"), c);
+ fprintf(stderr, _("Invalid option %c\n"), c);
return FSCK_USAGE;
}
@@ -110,11 +110,11 @@ static int read_cmdline(int argc, char **argv, struct gfs2_options
*gopts)
if(argc > optind) {
gopts->device = (argv[optind]);
if(!gopts->device) {
- fprintf(stderr, _("Please use '-h' for usage.\n"));
+ fprintf(stderr, _("Please use '-h' for help.\n"));
return FSCK_USAGE;
}
} else {
- fprintf(stderr, _("No device specified. Use '-h' for usage.\n"));
+ fprintf(stderr, _("No device specified (Please use '-h' for
help)\n"));
return FSCK_USAGE;
}
return 0;
diff --git a/gfs2/fsck/pass1c.c b/gfs2/fsck/pass1c.c
index 0782459..781e8d5 100644
--- a/gfs2/fsck/pass1c.c
+++ b/gfs2/fsck/pass1c.c
@@ -194,7 +194,7 @@ static int check_eattr_entry(struct gfs2_inode *ip,
return ask_remove_eattr_entry(sdp, leaf_bh, ea_hdr,
ea_hdr_prev, 0, 0);
} else {
- log_debug( _(" Pointers Required: %d\n Pointers Reported: %d\n"),
+ log_debug( _(" Pointers Required: %d\n Pointers Reported: %d\n"),
max_ptrs, ea_hdr->ea_num_ptrs);
}
}
diff --git a/gfs2/fsck/pass4.c b/gfs2/fsck/pass4.c
index 9233ea7..3305fb3 100644
--- a/gfs2/fsck/pass4.c
+++ b/gfs2/fsck/pass4.c
@@ -64,7 +64,7 @@ static int scan_inode_list(struct gfs2_sbd *sbp) {
(unsigned long long)ii->inode);
q = block_type(ii->inode);
if(q == gfs2_bad_block) {
- log_err( _("Unlinked inode %llu (0x%llx) contains"
+ log_err( _("Unlinked inode %llu (0x%llx) contains "
"bad blocks\n"),
(unsigned long long)ii->inode,
(unsigned long long)ii->inode);
diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c
index 81f492b..0eca396 100644
--- a/gfs2/mkfs/main_grow.c
+++ b/gfs2/mkfs/main_grow.c
@@ -106,10 +106,10 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd
*sdp)
case ':':
case '?':
/* Unknown flag */
- fprintf(stderr, _("Please use '-h' for usage.\n"));
+ fprintf(stderr, _("Please use '-h' for help.\n"));
exit(EXIT_FAILURE);
default:
- fprintf(stderr, _("Unknown option %c\n"), opt);
+ fprintf(stderr, _("Invalid option %c\n"), opt);
exit(EXIT_FAILURE);
break;
}
diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c
index 5f65cce..d722d52 100644
--- a/gfs2/mkfs/main_jadd.c
+++ b/gfs2/mkfs/main_jadd.c
@@ -129,14 +129,14 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd
*sdp)
break;
case ':':
case '?':
- fprintf(stderr, _("Please use '-h' for usage.\n"));
+ fprintf(stderr, _("Please use '-h' for help.\n"));
exit(EXIT_FAILURE);
break;
case EOF:
cont = FALSE;
break;
default:
- die( _("Unknown option: %c\n"), optchar);
+ die( _("Invalid option: %c\n"), optchar);
break;
};
}
@@ -148,7 +148,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd
*sdp)
die( _("no path specified (try -h for help)\n"));
if (optind < argc)
- die( _("Unrecognized option: %s\n"), argv[optind]);
+ die( _("Unrecognized argument: %s\n"), argv[optind]);
if (sdp->debug) {
printf( _("Command Line Arguments:\n"));
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index eaf2aa2..0da3bc5 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -182,7 +182,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd
*sdp)
case ':':
case '?':
- fprintf(stderr, _("Please use '-h' for usage.\n"));
+ fprintf(stderr, _("Please use '-h' for help.\n"));
exit(EXIT_FAILURE);
break;
@@ -203,7 +203,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd
*sdp)
break;
default:
- die( _("Unknown option: %c\n"), optchar);
+ die( _("Invalid option: %c\n"), optchar);
break;
};
}
@@ -212,7 +212,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd
*sdp)
strcpy(sdp->device_name, argv[optind++]);
if (sdp->device_name[0] == '\0')
- die( _("no device specified (try -h for help)\n"));
+ die( _("No device specified. Please use '-h' for help\n"));
if (optind < argc)
sdp->orig_fssize = atol(argv[optind++]);
diff --git a/gfs2/tune/main.c b/gfs2/tune/main.c
index dc9d6a5..553f6f2 100644
--- a/gfs2/tune/main.c
+++ b/gfs2/tune/main.c
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
version();
return 0;
default:
- fprintf(stderr, _("Invalid option.\n"));
+ fprintf(stderr, _("Invalid option: %c\n"), c);
usage(argv[0]);
return EX_USAGE;
}