change i18n stuff around; don't call gettext explicitly, just do echo $"some string"

1 files changed, 15 insertions, 15 deletions

diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 3d18afd6..8b51408c 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -35,10 +35,10 @@ case "$1" in
         [ -n "$NFSFSTAB" ] && 
 	  {
 	    [ ! -f /var/lock/subsys/portmap ] && service portmap start
-	    action "Mounting %s filesystems: " NFS mount -a -t nfs
+	    action "Mounting NFS filesystems: " mount -a -t nfs
 	  }
-        [ -n "$SMBFSTAB" ] && action "Mounting %s filesystems: " SMB mount -a -t smbfs
-        [ -n "$NCPFSTAB" ] && action "Mounting %s filesystems: " NCP mount -a -t ncpfs
+        [ -n "$SMBFSTAB" ] && action "Mounting SMB filesystems: " mount -a -t smbfs
+        [ -n "$NCPFSTAB" ] && action "Mounting NCP filesystems: " mount -a -t ncpfs
 	touch /var/lock/subsys/netfs
 	action "Mounting other filesystems: " mount -a -t nonfs,smbfs,ncpfs
 	;;
@@ -50,9 +50,9 @@ case "$1" in
 		while [ -n "$remaining" -a "$retry" -gt 0 ]
 		do
 			if [ "$retry" -lt 3 ]; then
-				action "Unmounting %s filesystems (retry): " NFS umount -f -a -t nfs
+				action "Unmounting NFS filesystems (retry): " umount -f -a -t nfs
 			else
-				action "Unmounting %s filesystems: " NFS umount -f -a -t nfs
+				action "Unmounting NFS filesystems: " umount -f -a -t nfs
 			fi
 			sleep 2
 			remaining=`awk '!/^#/ && $3 ~ /^nfs/ && $2 != "/" {print $2}' /proc/mounts`
@@ -63,38 +63,38 @@ case "$1" in
 			sig=-9
 		done
 	}
-	[ -n "$SMBMTAB" ] && action "Unmounting %s filesystems: " SMB umount -a -t smbfs
-	[ -n "$NCPMTAB" ] && action "Unmounting %s filesystems: " NCP umount -a -t ncpfs
+	[ -n "$SMBMTAB" ] && action "Unmounting SMB filesystems: " umount -a -t smbfs
+	[ -n "$NCPMTAB" ] && action "Unmounting NCP filesystems: " umount -a -t ncpfs
 	rm -f /var/lock/subsys/netfs
 	;;
   status)
 	if [ -f /proc/mounts ] ; then
 	        [ -n "$NFSFSTAB" ] && {
-		     gprintf "Configured %s mountpoints:\n" NFS
+		     echo $"Configured NFS mountpoints: "
 		     for fs in $NFSFSTAB; do echo $fs ; done
 		}
 	        [ -n "$SMBFSTAB" ] && {
-		     gprintf "Configured %s mountpoints:\n" SMB
+		     echo $"Configured SMB mountpoints: "
 		     for fs in $SMBFSTAB; do echo $fs ; done
 		}
 	        [ -n "$NCPFSTAB" ] && {
-		     gprintf "Configured %s mountpoints:\n" NCP
+		     echo $"Configured NCP mountpoints: "
 		     for fs in $NCPFSTAB; do echo $fs ; done
 		}
 		[ -n "$NFSMTAB" ] && {
-                      gprintf "Active %s mountpoints:\n" NFS
+                      echo $"Active NFS mountpoints: "
 		      for fs in $NFSMTAB; do echo $fs ; done
 		}
 		[ -n "$SMBMTAB" ] && {
-                      gprintf "Active %s mountpoints:\n" SMB
+                      echo $"Active SMB mountpoints: "
 		      for fs in $SMBMTAB; do echo $fs ; done
 		}
 		[ -n "$NCPMTAB" ] && {
-                      gprintf "Active %s mountpoints:\n" NCP
+                      echo $"Active NCP mountpoints: "
 		      for fs in $NCPMTAB; do echo $fs ; done
 		}
 	else
-		gprintf "/proc filesystem unavailable\n"
+		echo $"/proc filesystem unavailable"
 	fi
 	;;
   restart)
@@ -105,7 +105,7 @@ case "$1" in
         $0 start
 	;;
   *)
-	gprintf "Usage: %s {start|stop|restart|reload|status}\n" netfs
+	echo $"Usage: netfs {start|stop|restart|reload|status}"
 	exit 1
 esac