[PATCH] fdisk: Message tweak.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 fdisk/fdisk.c       |    2 +-
 login-utils/chfn.c  |    2 +-
 login-utils/chsh.c  |    2 +-
 login-utils/login.c |    2 +-
 mount/lomount.c     |    8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index ede41b3..5838b22 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -1520,7 +1520,7 @@ change_sysid(void) {
 				        "to %x (%s)\n"), i + 1, sys, temp);
 			else
 				printf (_("System type of partition %d is unchanged "
-				        "to %x (%s)\n"), i + 1, sys, temp);
+				        "at %x (%s)\n"), i + 1, sys, temp);
 			if (is_dos_partition(origsys) ||
 			    is_dos_partition(sys))
 				dos_changed = 1;
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index a08713b..ee6e353 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -186,7 +186,7 @@ int main (int argc, char **argv) {
 
 	retcode = pam_start("chfn", oldf.username, &conv, &pamh);
 	if(retcode != PAM_SUCCESS) {
-	    fprintf(stderr, _("chfn: PAM Failure, aborting: %s\n"),
+	    fprintf(stderr, _("chfn: PAM failure, aborting: %s\n"),
 			pam_strerror(pamh, retcode));
 	    exit(1);
 	}
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 58cbbb0..da8371d 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -185,7 +185,7 @@ main (int argc, char *argv[]) {
 
 	retcode = pam_start("chsh", pw->pw_name, &conv, &pamh);
 	if(retcode != PAM_SUCCESS) {
-	    fprintf(stderr, _("chsh: PAM Failure, aborting: %s\n"),
+	    fprintf(stderr, _("chsh: PAM failure, aborting: %s\n"),
 			pam_strerror(pamh, retcode));
 	    exit(1);
 	}
diff --git a/login-utils/login.c b/login-utils/login.c
index 0e6db2b..46269f7 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -548,7 +548,7 @@ main(int argc, char **argv)
 
     retcode = pam_start("login",username, &conv, &pamh);
     if(retcode != PAM_SUCCESS) {
-	fprintf(stderr, _("login: PAM Failure, aborting: %s\n"),
+	fprintf(stderr, _("login: PAM failure, aborting: %s\n"),
 		pam_strerror(pamh, retcode));
 	syslog(LOG_ERR, _("Couldn't initialize PAM: %s"),
 	       pam_strerror(pamh, retcode));
diff --git a/mount/lomount.c b/mount/lomount.c
index ac379c0..58eb5b4 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -830,16 +830,16 @@ usage(void) {
   " %1$s -d | --detach <loopdev>                 delete\n"
   " %1$s -f | --find                             find unused\n"
   " %1$s -j | --associated <file> [-o <num>]     list all associated with <file>\n"
-  " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
-  "\nOptions:\n"
+  " %1$s [ options ] {-f|--find|loopdev} <file>  set up\n"),
+		progname);
+	fprintf(stderr, _("\nOptions:\n"
   " -e | --encryption <type> enable data encryption with specified <name/num>\n"
   " -h | --help              this help\n"
   " -o | --offset <num>      start at offset <num> into file\n"
   " -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
   " -r | --read-only         setup read-only loop device\n"
   " -s | --show              print device name (with -f <file>)\n"
-  " -v | --verbose           verbose mode\n\n"),
-		progname);
+  " -v | --verbose           verbose mode\n\n"));
 	exit(1);
  }
 
-- 
1.5.3.8

--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux