gfs2-utils: master - fsck: Merge strings

cmaiolino cmaiolino at fedoraproject.org
Wed Dec 7 12:25:19 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=91f331d094994cd33abcdca84e7e2989f44170fe
Commit:        91f331d094994cd33abcdca84e7e2989f44170fe
Parent:        3a18369266fdaf9fa2e68824da77a2886c6a3b63
Author:        Carlos Maiolino <cmaiolino at redhat.com>
AuthorDate:    Wed Dec 7 09:08:03 2011 -0200
Committer:     Carlos Maiolino <cmaiolino at redhat.com>
CommitterDate: Wed Dec 7 09:08:03 2011 -0200

fsck: Merge strings

This patch just change some log_error calls in a way the strings can be merged
during the i18n translations, removing the amount of duplicated work to translators.
---
 gfs2/fsck/fs_recovery.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
index 8c3062b..1d9f632 100644
--- a/gfs2/fsck/fs_recovery.c
+++ b/gfs2/fsck/fs_recovery.c
@@ -456,9 +456,8 @@ static int gfs2_recover_journal(struct gfs2_inode *ip, int j, int preen,
 	error = gfs2_find_jhead(ip, &head);
 	if (error) {
 		if (opts.no) {
-			log_err( _("Journal #%d (\"journal%d\") is corrupt.\n"
-				   "Not fixing it due to the -n option.\n"),
-				j+1, j);
+			log_err( _("Journal #%d (\"journal%d\") is corrupt\n"),j+1, j);
+			log_err( _("Not fixing it due to the -n option.\n"));
 			goto out;
 		}
 		if (!preen_is_safe(sdp, preen, force_check)) {
@@ -501,13 +500,12 @@ static int gfs2_recover_journal(struct gfs2_inode *ip, int j, int preen,
 		return 0;
 	}
 	if (opts.no) {
-		log_err(_("Journal #%d (\"journal%d\") is dirty; not replaying"
-			  " due to the -n option.\n"),
-			j+1, j);
+		log_err(_("Journal #%d (\"journal%d\") is dirty\n"),j+1, j);
+		log_err(_("not replaying due to the -n option.\n"));
 		goto out;
 	}
 	if (!preen_is_safe(sdp, preen, force_check)) {
-		log_err( _("Journal #%d (\"journal%d\") is dirty.\n"), j+1, j);
+		log_err( _("Journal #%d (\"journal%d\") is dirty\n"), j+1, j);
 		log_err( _("I'm not replaying it because it may be unsafe:\n"
 			   "Locking protocol is not lock_nolock and "
 			   "the -a or -p option was specified.\n"));


More information about the cluster-commits mailing list