public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE3 - gfs2: resync internationalization support from master
@ 2009-06-23 5:41 Fabio M. Di Nitto
0 siblings, 0 replies; only message in thread
From: Fabio M. Di Nitto @ 2009-06-23 5:41 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=186a6f28cac85cc96cf9d318ed2ea86b68a3f72c
Commit: 186a6f28cac85cc96cf9d318ed2ea86b68a3f72c
Parent: b7a6dd49c9cfb386e54b470aabe589d3ab09e47d
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Tue Jun 23 07:40:09 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue Jun 23 07:40:09 2009 +0200
gfs2: resync internationalization support from master
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
gfs2/fsck/fs_recovery.c | 34 +++++++++++++++++++---------------
gfs2/fsck/initialize.c | 2 +-
gfs2/fsck/main.c | 2 +-
gfs2/fsck/rgrepair.c | 2 +-
gfs2/mkfs/main.c | 2 +-
gfs2/mkfs/main_grow.c | 4 ++--
gfs2/mkfs/main_jadd.c | 2 +-
gfs2/mkfs/main_mkfs.c | 4 ++--
gfs2/tool/main.c | 2 +-
9 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
index 8ebbd13..cbae916 100644
--- a/gfs2/fsck/fs_recovery.c
+++ b/gfs2/fsck/fs_recovery.c
@@ -353,16 +353,16 @@ static int fix_journal_seq_no(struct gfs2_inode *ip)
prev_seq = lh.lh_sequence;
continue;
}
- log_err("Journal block %u (0x%x): sequence no. 0x%llx out of "
- "order.\n", blk, blk, lh.lh_sequence);
- log_info("Low: 0x%llx, High: 0x%llx, Prev: 0x%llx\n",
- (unsigned long long)lowest_seq,
- (unsigned long long)highest_seq,
- (unsigned long long)prev_seq);
+ log_err( _("Journal block %u (0x%x): sequence no. 0x%llx "
+ "out of order.\n"), blk, blk, lh.lh_sequence);
+ log_info( _("Low: 0x%llx, High: 0x%llx, Prev: 0x%llx\n"),
+ (unsigned long long)lowest_seq,
+ (unsigned long long)highest_seq,
+ (unsigned long long)prev_seq);
highest_seq++;
lh.lh_sequence = highest_seq;
prev_seq = lh.lh_sequence;
- log_warn("Renumbering it as 0x%llx\n", lh.lh_sequence);
+ log_warn( _("Renumbering it as 0x%llx\n"), lh.lh_sequence);
block_map(ip, blk, &new, &dblock, &extlen, FALSE, not_updated);
bh = bread(&ip->i_sbd->buf_list, dblock);
gfs2_log_header_out(&lh, bh->b_data);
@@ -393,24 +393,28 @@ static int gfs2_recover_journal(struct gfs2_inode *ip, int j)
osi_list_init(&sd_revoke_list);
error = gfs2_find_jhead(ip, &head);
if (error) {
- if (!query(&opts, "\nJournal #%d (\"journal%d\") is corrupt. "
- "Okay to repair it? (y/n)", j+1, j)) {
- log_err("jid=%u: The journal was not repaired.\n", j);
+ if (!query(&opts, _("\nJournal #%d (\"journal%d\") is "
+ "corrupt. Okay to repair it? (y/n)"),
+ j+1, j)) {
+ log_err( _("jid=%u: The journal was not repaired.\n"),
+ j);
goto out;
}
- log_info("jid=%u: Repairing journal...\n", j);
+ 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 repair the bad "
+ "journal.\n"), j);
goto out;
}
error = gfs2_find_jhead(ip, &head);
if (error) {
- log_err("jid=%u: Unable to fix the bad journal.\n", j);
+ log_err( _("jid=%u: Unable to fix the bad journal.\n"),
+ j);
goto out;
}
- log_err("jid=%u: The journal was successfully fixed.\n", j);
+ log_err( _("jid=%u: The journal was successfully fixed.\n"),
+ j);
}
if (head.lh_flags & GFS2_LOG_HEAD_UNMOUNT) {
log_info( _("jid=%u: Journal is clean.\n"), j);
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index 88ad1c9..8d1e776 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -318,7 +318,7 @@ static int fill_super_block(struct gfs2_sbd *sdp)
}
if (compute_constants(sdp)) {
- log_crit("Bad constants (1)\n");
+ log_crit(_("Bad constants (1)\n"));
exit(-1);
}
if(read_sb(sdp) < 0){
diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c
index ec750c2..ad71ba5 100644
--- a/gfs2/fsck/main.c
+++ b/gfs2/fsck/main.c
@@ -256,7 +256,7 @@ int main(int argc, char **argv)
int error = 0;
setlocale(LC_ALL, "");
- textdomain("fsck.gfs2");
+ textdomain("gfs2-utils");
memset(sbp, 0, sizeof(*sbp));
diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index 3e70bf9..ca16ba5 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -349,7 +349,7 @@ 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",
+ fprintf(stderr, _("Device is too small (%"PRIu64" bytes)\n"),
sdp->device.length << GFS2_BASIC_BLOCK_SHIFT);
exit(-1);
}
diff --git a/gfs2/mkfs/main.c b/gfs2/mkfs/main.c
index f7de8b2..58b933c 100644
--- a/gfs2/mkfs/main.c
+++ b/gfs2/mkfs/main.c
@@ -32,7 +32,7 @@ main(int argc, char *argv[])
char *p, *whoami;
setlocale(LC_ALL, "");
- textdomain("mkfs.gfs2");
+ textdomain("gfs2-utils");
srandom(time(NULL) ^ getpid());
diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c
index 0d3b398..a3f6e47 100644
--- a/gfs2/mkfs/main_grow.c
+++ b/gfs2/mkfs/main_grow.c
@@ -293,14 +293,14 @@ main_grow(int argc, char *argv[])
sdp->sd_sb.sb_bsize = GFS2_DEFAULT_BSIZE;
sdp->bsize = sdp->sd_sb.sb_bsize;
if (compute_constants(sdp)) {
- log_crit("Bad constants (1)\n");
+ log_crit(_("Bad constants (1)\n"));
exit(-1);
}
if(read_sb(sdp) < 0)
die( _("gfs: Error reading superblock.\n"));
if (fix_device_geometry(sdp)) {
- fprintf(stderr, "Device is too small (%"PRIu64" bytes)\n",
+ fprintf(stderr, _("Device is too small (%"PRIu64" bytes)\n"),
sdp->device.length << GFS2_BASIC_BLOCK_SHIFT);
exit(-1);
}
diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c
index ef71aa7..ff2ba28 100644
--- a/gfs2/mkfs/main_jadd.c
+++ b/gfs2/mkfs/main_jadd.c
@@ -510,7 +510,7 @@ void main_jadd(int argc, char *argv[])
}
if (compute_constants(sdp)) {
- fprintf(stderr, "Bad constants (1)\n");
+ fprintf(stderr, _("Bad constants (1)\n"));
exit(-1);
}
find_current_journals(sdp);
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index eaf1fff..ee43bbd 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -583,7 +583,7 @@ void main_mkfs(int argc, char *argv[])
are_you_sure(sdp);
if (compute_constants(sdp)) {
- fprintf(stderr, "Bad constants (1)\n");
+ fprintf(stderr, _("Bad constants (1)\n"));
exit(-1);
}
@@ -608,7 +608,7 @@ void main_mkfs(int argc, char *argv[])
sdp->device.length = sdp->orig_fssize;
}
if (fix_device_geometry(sdp)) {
- fprintf(stderr, "Device is too small (%"PRIu64" bytes)\n",
+ fprintf(stderr, _("Device is too small (%"PRIu64" bytes)\n"),
sdp->device.length << GFS2_BASIC_BLOCK_SHIFT);
exit(-1);
}
diff --git a/gfs2/tool/main.c b/gfs2/tool/main.c
index 1d01727..5cad9da 100644
--- a/gfs2/tool/main.c
+++ b/gfs2/tool/main.c
@@ -158,7 +158,7 @@ static void decode_arguments(int argc, char *argv[])
int main(int argc, char *argv[])
{
setlocale(LC_ALL, "");
- textdomain("gfs2_tool");
+ textdomain("gfs2-utils");
if (argc < 2) {
print_usage();
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-06-23 5:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-23 5:41 cluster: STABLE3 - gfs2: resync internationalization support from master Fabio M. Di Nitto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).