From 4d0e48f2d236d9bb37555a9e6ab00a4f19cbd198 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 17 Aug 2009 15:35:13 +0200 Subject: mount: add info about ext{3,4} barriers to mount.8 Signed-off-by: Karel Zak --- mount/mount.8 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mount/mount.8 b/mount/mount.8 index 3d451000..f4ef7e86 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -1246,6 +1246,10 @@ internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery. .RE .TP +.BR barrier=0 " / " barrier=1 " +This enables/disables barriers. barrier=0 disables it, barrier=1 enables it. +The ext3 does not enable write barriers by default. +.TP .BI commit= nrsec Sync all data and metadata every .I nrsec @@ -1296,6 +1300,8 @@ penalty. If your disks are battery-backed in one way or another, disabling barriers may safely improve performance. The mount options "barrier" and "nobarrier" can also be used to enable or disable barriers, for consistency with other ext4 mount options. + +The ext4 enables write barriers by default. .TP .BI inode_readahead= n This tuning parameter controls the maximum number of inode table blocks that -- cgit v1.2.3 From 8aac147cc230a1f01714d13b9b3f2d2c6021de8f Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 17 Aug 2009 17:40:04 +0200 Subject: mount: clean up mount.8 * use "filesystem" everywhere (currently, the mount.8 man page is inconsistent and uses "file system" and "filesystem") * fix "The extN" to "The extN filesystem" (reported by Theodore Tso) Signed-off-by: Karel Zak --- configure.ac | 3 + mount/mount.8 | 201 +++++++++++++++++++++++++------------------------- sys-utils/Makefile.am | 7 ++ 3 files changed, 111 insertions(+), 100 deletions(-) diff --git a/configure.ac b/configure.ac index 8999826a..aa4fc20d 100644 --- a/configure.ac +++ b/configure.ac @@ -554,6 +554,9 @@ UTIL_CHECK_SYSCALL([ioprio_get], [sh*], [289], [x86_64*], [252]) +dnl Old versions of glib don't provide fallocate(2) +UTIL_CHECK_SYSCALL([fallocate]) +AC_CHECK_FUNC([fallocate]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include diff --git a/mount/mount.8 b/mount/mount.8 index f4ef7e86..a8f64c7b 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -41,7 +41,7 @@ .\" .TH MOUNT 8 "2004-12-16" "Linux 2.6" "Linux Programmer's Manual" .SH NAME -mount \- mount a file system +mount \- mount a filesystem .SH SYNOPSIS .B mount .RB [ \-lhV ] @@ -72,7 +72,7 @@ tree, the file hierarchy, rooted at .BR / . These files can be spread out over several devices. The .B mount -command serves to attach the file system found on some device +command serves to attach the filesystem found on some device to the big file tree. Conversely, the .BR umount (8) command will detach it again. @@ -87,7 +87,7 @@ command, is .br .RE -This tells the kernel to attach the file system found on +This tells the kernel to attach the filesystem found on .I device (which is of type .IR type ) @@ -95,10 +95,10 @@ at the directory .IR dir . The previous contents (if any) and owner and mode of .I dir -become invisible, and as long as this file system remains mounted, +become invisible, and as long as this filesystem remains mounted, the pathname .I dir -refers to the root of the file system on +refers to the root of the filesystem on .IR device . .B The listing and help. @@ -112,7 +112,7 @@ prints a help message prints a version string .TP .BR "mount " [ -l "] [" "-t \fItype\fP" ] -lists all mounted file systems (of type +lists all mounted filesystems (of type .IR type ). The option \-l adds the labels in this listing. See below. @@ -233,7 +233,7 @@ or The .I proc -file system is not associated with a special device, and when +filesystem is not associated with a special device, and when mounting it, an arbitrary keyword, such as .I proc can be used instead of a device specification. @@ -263,7 +263,7 @@ The command .IR optlist ] .sp .RE -(usually given in a bootscript) causes all file systems mentioned in +(usually given in a bootscript) causes all filesystems mentioned in .I fstab (of the proper type and/or having or not having the proper options) to be mounted as indicated, except for those whose line contains the @@ -273,7 +273,7 @@ keyword. Adding the option will make mount fork, so that the filesystems are mounted simultaneously. .LP -When mounting a file system mentioned in +When mounting a filesystem mentioned in .IR fstab , it suffices to give only the device, or only the mount point. @@ -282,7 +282,7 @@ The programs .B mount and .B umount -maintain a list of currently mounted file systems in the file +maintain a list of currently mounted filesystems in the file .IR /etc/mtab . If no arguments are given to .BR mount , @@ -313,7 +313,7 @@ and using the "user" option will fail. .B The non-superuser mounts. .RS -Normally, only the superuser can mount file systems. +Normally, only the superuser can mount filesystems. However, when .I fstab contains the @@ -326,7 +326,7 @@ Thus, given a line .B "/dev/cdrom /cd iso9660 ro,user,noauto,unhide" .sp .RE -any user can mount the iso9660 file system found on his CDROM +any user can mount the iso9660 filesystem found on his CDROM using the command .RS .sp @@ -367,7 +367,7 @@ member of the group of the special file. The full set of mount options used by an invocation of .B mount is determined by first extracting the -mount options for the file system from the +mount options for the filesystem from the .I fstab table, then applying any options specified by the .B \-o @@ -407,7 +407,7 @@ and .TP .B \-f Causes everything to be done except for the actual system call; if it's not -obvious, this ``fakes'' mounting the file system. This option is useful in +obvious, this ``fakes'' mounting the filesystem. This option is useful in conjunction with the .B \-v flag to determine what the @@ -435,7 +435,7 @@ Mount without writing in .IR /etc/mtab . This is necessary for example when .I /etc -is on a read-only file system. +is on a read-only filesystem. .TP .BI \-p " num" In case of a loop mount with encryption, read the passphrase from @@ -450,7 +450,7 @@ support this option. This option exists for support of the Linux autofs\-based automounter. .TP .B \-r -Mount the file system read-only. A synonym is +Mount the filesystem read-only. A synonym is .BR "\-o ro" . Note that, depending on the filesystem type, state and kernel behavior, the @@ -461,7 +461,7 @@ set the block device to read-only mode, see command .BR blockdev (8). .TP .B \-w -Mount the file system read/write. This is the default. A synonym is +Mount the filesystem read/write. This is the default. A synonym is .BR "\-o rw" . .TP .BI \-L " label" @@ -478,7 +478,7 @@ These two options require the file .BI \-t " vfstype" The argument following the .B \-t -is used to indicate the file system type. The file system types which are +is used to indicate the filesystem type. The filesystem types which are currently supported include: .IR adfs , .IR affs , @@ -544,7 +544,7 @@ program has to do is issue a simple .IR mount (2) system call, and no detailed knowledge of the filesystem type is required. For a few types however (like nfs, nfs4, cifs, smbfs, ncpfs) ad hoc code is -necessary. The nfs, nfs4, cifs, smbfs, and ncpfs +necessary. The nfs, nfs4, cifs, smbfs, and ncpfs filesystems have a separate mount program. In order to make it possible to treat all types in a uniform way, mount will execute the program .BI /sbin/mount. TYPE @@ -593,9 +593,9 @@ consequences. If your data is valuable, don't ask to guess. More than one type may be specified in a comma separated -list. The list of file system types can be prefixed with +list. The list of filesystem types can be prefixed with .B no -to specify the file system types on which no action should be taken. +to specify the filesystem types on which no action should be taken. (This can be meaningful with the .B \-a option.) @@ -605,7 +605,7 @@ For example, the command: .RS .B "mount \-a \-t nomsdos,ext" .RE -mounts all file systems except those of type +mounts all filesystems except those of type .I msdos and .IR ext . @@ -627,7 +627,7 @@ For example, the command: .B "mount \-a \-O no_netdev" .sp .RE -mounts all file systems except those which have the option +mounts all filesystems except those which have the option .I _netdev specified in the options field in the .I /etc/fstab @@ -690,14 +690,14 @@ Some of these options could be enabled or disabled by default in the system kernel. To check the current setting see the options in /proc/mounts. -The following options apply to any file system that is being -mounted (but not every file system actually honors them - e.g., the +The following options apply to any filesystem that is being +mounted (but not every filesystem actually honors them - e.g., the .B sync option today has effect only for ext2, ext3, fat, vfat and ufs): .TP .B async -All I/O to the file system should be done asynchronously. (See also the +All I/O to the filesystem should be done asynchronously. (See also the .B sync option.) .TP @@ -705,7 +705,7 @@ option.) Update inode access time for each access. This is the default. .TP .B noatime -Do not update inode access times on this file system (e.g, for faster +Do not update inode access times on this filesystem (e.g, for faster access on the news spool to speed up news servers). .TP .B auto @@ -716,7 +716,7 @@ option. .B noauto Can only be mounted explicitly (i.e., the .B \-a -option will not cause the file system to be mounted). +option will not cause the filesystem to be mounted). .TP \fBcontext=\fP\fIcontext\fP, \fBfscontext=\fP\fIcontext\fP, \fBdefcontext=\fP\fIcontext\fP and \fBrootcontext=\fP\fIcontext\fP The @@ -757,7 +757,7 @@ files. You can set the default security context for unlabeled files using .BR defcontext= option. This overrides the value set for unlabeled files in the policy and requires a -file system that supports xattr labeling. +filesystem that supports xattr labeling. The .BR rootcontext= @@ -774,7 +774,7 @@ Use default options: .BR rw ", " suid ", " dev ", " exec ", " auto ", " nouser ", and " async. .TP .B dev -Interpret character or block special devices on the file system. +Interpret character or block special devices on the filesystem. .TP .B nodev Do not interpret character or block special devices on the file @@ -787,7 +787,7 @@ Update directory inode access times on this filesystem. This is the default. Do not update directory inode access times on this filesystem. .TP .B dirsync -All directory updates within the file system should be done synchronously. +All directory updates within the filesystem should be done synchronously. This affects the following system calls: creat, link, unlink, symlink, mkdir, rmdir, mknod and rename. .TP @@ -795,12 +795,12 @@ mkdir, rmdir, mknod and rename. Permit execution of binaries. .TP .B noexec -Do not allow direct execution of any binaries on the mounted file system. +Do not allow direct execution of any binaries on the mounted filesystem. (Until recently it was possible to run binaries anyway using a command like /lib/ld*.so /mnt/binary. This trick fails since Linux 2.4.25 / 2.6.0.) .TP .B group -Allow an ordinary (i.e., non-root) user to mount the file system if one +Allow an ordinary (i.e., non-root) user to mount the filesystem if one of his groups matches the group of the device. This option implies the options .BR nosuid " and " nodev @@ -858,7 +858,7 @@ effect. (This seems safe, but is in fact rather unsafe if you have suidperl(1) installed.) .TP .B owner -Allow an ordinary (i.e., non-root) user to mount the file system if he +Allow an ordinary (i.e., non-root) user to mount the filesystem if he is the owner of the device. This option implies the options .BR nosuid " and " nodev @@ -866,9 +866,9 @@ This option implies the options .BR owner,dev,suid ). .TP .B remount -Attempt to remount an already-mounted file system. This is commonly -used to change the mount flags for a file system, especially to make a -readonly file system writeable. It does not change device or mount point. +Attempt to remount an already-mounted filesystem. This is commonly +used to change the mount flags for a filesystem, especially to make a +readonly filesystem writeable. It does not change device or mount point. The remount functionality follows the standard way how the mount command works with options from fstab. It means the mount command doesn't read fstab (or @@ -892,38 +892,38 @@ options from command line ( ). .TP .B ro -Mount the file system read-only. +Mount the filesystem read-only. .TP .B rw -Mount the file system read-write. +Mount the filesystem read-write. .TP .B sync -All I/O to the file system should be done synchronously. In case of media with limited number of write cycles +All I/O to the filesystem should be done synchronously. In case of media with limited number of write cycles (e.g. some flash drives) "sync" may cause life-cycle shortening. .TP .B user -Allow an ordinary user to mount the file system. +Allow an ordinary user to mount the filesystem. The name of the mounting user is written to mtab so that he can unmount -the file system again. +the filesystem again. This option implies the options .BR noexec ", " nosuid ", and " nodev (unless overridden by subsequent options, as in the option line .BR user,exec,dev,suid ). .TP .B nouser -Forbid an ordinary (i.e., non-root) user to mount the file system. +Forbid an ordinary (i.e., non-root) user to mount the filesystem. This is the default. .TP .B users -Allow every user to mount and unmount the file system. +Allow every user to mount and unmount the filesystem. This option implies the options .BR noexec ", " nosuid ", and " nodev (unless overridden by subsequent options, as in the option line .BR users,exec,dev,suid ). .SH "FILESYSTEM SPECIFIC MOUNT OPTIONS" -The following options apply only to certain file systems. -We sort them by file system. They all follow the +The following options apply only to certain filesystems. +We sort them by filesystem. They all follow the .B \-o flag. @@ -934,7 +934,7 @@ More info may be found in the kernel source subdirectory .SH "Mount options for adfs" .TP \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP -Set the owner and group of the files in the file system (default: uid=gid=0). +Set the owner and group of the files in the filesystem (default: uid=gid=0). .TP \fBownmask=\fP\fIvalue\fP and \fBothmask=\fP\fIvalue\fP Set the permission mask for ADFS 'owner' permissions and 'other' permissions, @@ -944,7 +944,7 @@ See also .SH "Mount options for affs" .TP \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP -Set the owner and group of the root of the file system (default: uid=gid=0, +Set the owner and group of the root of the filesystem (default: uid=gid=0, but with option .B uid or @@ -962,10 +962,10 @@ Add search permission to directories that have read permission. The value is given in octal. .TP .B protect -Do not allow any changes to the protection bits on the file system. +Do not allow any changes to the protection bits on the filesystem. .TP .B usemp -Set uid and gid of the root of the file system to the uid and gid +Set uid and gid of the root of the filesystem to the uid and gid of the mount point upon the first sync or umount, and then clear this option. Strange... .TP @@ -1001,14 +1001,14 @@ man page (cifs-mount package must be installed). None. .SH "Mount options for debugfs" -The debugfs file system is a pseudo file system, traditionally mounted on +The debugfs filesystem is a pseudo filesystem, traditionally mounted on .IR /sys/kernel/debug . .\" or just /debug .\" present since 2.6.11 There are no mount options. .SH "Mount options for devpts" -The devpts file system is a pseudo file system, traditionally mounted on +The devpts filesystem is a pseudo filesystem, traditionally mounted on .IR /dev/pts . In order to acquire a pseudo terminal, a process opens .IR /dev/ptmx ; @@ -1090,11 +1090,11 @@ configuration. .SH "Mount options for ext" None. -Note that the `ext' file system is obsolete. Don't use it. +Note that the `ext' filesystem is obsolete. Don't use it. Since Linux version 2.1.21 extfs is no longer part of the kernel source. .SH "Mount options for ext2" -The `ext2' file system is the standard Linux file system. +The `ext2' filesystem is the standard Linux filesystem. .\" Due to a kernel bug, it may be mounted with random mount options .\" (fixed in Linux 2.0.4). Since Linux 2.5.46, for most mount options the default @@ -1112,10 +1112,10 @@ system call. The .B minixdf behaviour is to return in the .I f_blocks -field the total number of blocks of the file system, while the +field the total number of blocks of the filesystem, while the .B bsddf behaviour (which is the default) is to subtract the overhead blocks -used by the ext2 file system and not available for file storage. Thus +used by the ext2 filesystem and not available for file storage. Thus .nf % mount /k -o minixdf; df /k; umount /k @@ -1142,8 +1142,8 @@ Print debugging info upon each (re)mount. .TP .BR errors= { continue | remount-ro | panic } Define the behaviour when an error is encountered. -(Either ignore errors and just mark the file system erroneous and continue, -or remount the file system read-only, or panic and halt the system.) +(Either ignore errors and just mark the filesystem erroneous and continue, +or remount the filesystem read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using .BR tune2fs (8). @@ -1172,7 +1172,7 @@ kernels which only store and expect 16-bit values. Use old allocator or Orlov allocator for new inodes. Orlov is default. .TP \fBresgid=\fP\fIn\fP and \fBresuid=\fP\fIn\fP -The ext2 file system reserves a certain percentage of the available +The ext2 filesystem reserves a certain percentage of the available space (by default 5%, see .BR mke2fs (8) and @@ -1202,37 +1202,37 @@ Support "user." extended attributes (or not). .SH "Mount options for ext3" -The `ext3' file system is a version of the ext2 file system which has been +The ext3 filesystem is a version of the ext2 filesystem which has been enhanced with journalling. It supports the same options as ext2 as well as the following additions: .\" .TP .\" .BR abort -.\" Mount the file system in abort mode, as if a fatal error has occurred. +.\" Mount the filesystem in abort mode, as if a fatal error has occurred. .TP .BR journal=update -Update the ext3 file system's journal to the current format. +Update the ext3 filesystem's journal to the current format. .TP .BR journal=inum When a journal already exists, this option is ignored. Otherwise, it -specifies the number of the inode which will represent the ext3 file system's +specifies the number of the inode which will represent the ext3 filesystem's journal file; ext3 will create a new journal, overwriting the old contents of the file whose inode number is .IR inum . .TP .BR noload -Do not load the ext3 file system's journal on mounting. +Do not load the ext3 filesystem's journal on mounting. .TP .BR data= { journal | ordered | writeback } Specifies the journalling mode for file data. Metadata is always journaled. To use modes other than .B ordered -on the root file system, pass the mode to the kernel as boot parameter, e.g. +on the root filesystem, pass the mode to the kernel as boot parameter, e.g. .IR rootflags=data=journal . .RS .TP .B journal All data is committed into the journal prior to being written into the -main file system. +main filesystem. .TP .B ordered This is the default mode. All data is forced directly out to the main file @@ -1240,15 +1240,15 @@ system prior to its metadata being committed to the journal. .TP .B writeback Data ordering is not preserved - data may be written into the main -file system after its metadata has been committed to the journal. +filesystem after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees -internal file system integrity, however it can allow old data to appear +internal filesystem integrity, however it can allow old data to appear in files after a crash and journal recovery. .RE .TP .BR barrier=0 " / " barrier=1 " This enables/disables barriers. barrier=0 disables it, barrier=1 enables it. -The ext3 does not enable write barriers by default. +The ext3 filesystem does not enable write barriers by default. .TP .BI commit= nrsec Sync all data and metadata every @@ -1266,8 +1266,9 @@ Enable POSIX Access Control Lists. See the manual page. .SH "Mount options for ext4" -The `ext4' is an an advanced level of the ext3 filesystem which incorporates -scalability and reliability enhancements for supporting large filesystem. +The ext4 filesystem is an an advanced level of the ext3 filesystem which +incorporates scalability and reliability enhancements for supporting large +filesystem. The options .B journal_dev, noload, data, commit, orlov, oldalloc, [no]user_xattr @@ -1288,7 +1289,7 @@ enabled older kernels cannot mount the device. This will enable 'journal_checksum' internally. .TP .BR journal=update -Update the ext4 file system's journal to the current format. +Update the ext4 filesystem's journal to the current format. .TP .BR barrier=0 " / " barrier=1 " / " barrier " / " nobarrier This enables/disables the use of write barriers in the jbd code. barrier=0 @@ -1301,7 +1302,7 @@ barriers may safely improve performance. The mount options "barrier" and "nobarrier" can also be used to enable or disable barriers, for consistency with other ext4 mount options. -The ext4 enables write barriers by default. +The ext4 filesystem enables write barriers by default. .TP .BI inode_readahead= n This tuning parameter controls the maximum number of inode table blocks that @@ -1311,7 +1312,7 @@ The default value is 32 blocks. .BI stripe= n Number of filesystem blocks that mballoc will try to use for allocation size and alignment. For RAID5/6 systems this should be the number of data disks * -RAID chunk size in file system blocks. +RAID chunk size in filesystem blocks. .TP .BR delalloc Deferring block allocation until write-out time. @@ -1450,7 +1451,7 @@ and VFAT filesystems. By default, codepage 437 is used. .BR conv= {b [ inary ]| t [ ext ]| a [ uto ]} The .I fat -file system can perform CRLF<-->NL (MS-DOS text format to UNIX text +filesystem can perform CRLF<-->NL (MS-DOS text format to UNIX text format) conversion in the kernel. The following conversion modes are available: .RS @@ -1473,7 +1474,7 @@ gz, tgz, deb, gif, bmp, tif, gl, jpg, pcx, tfm, vf, gf, pk, pxl, dvi). Programs that do computed lseeks won't like in-kernel text conversion. Several people have had their data ruined by this translation. Beware! -For file systems mounted in binary mode, a conversion tool +For filesystems mounted in binary mode, a conversion tool (fromdos/todos) is available. This option is obsolete. .RE .TP @@ -1490,7 +1491,7 @@ Option passed to the CVF module. This option is obsolete. .B debug Turn on the .I debug -flag. A version string and a list of file system parameters will be +flag. A version string and a list of filesystem parameters will be printed (these data are also printed if the parameters appear to be inconsistent). .TP @@ -1539,7 +1540,7 @@ correct, by this option you can avoid scanning disk. .TP .BR dots ", " nodots ", " dotsOK= [ yes | no ] Various misguided attempts to force Unix or DOS conventions -onto a FAT file system. +onto a FAT filesystem. .SH "Mount options for hfs" .TP @@ -1617,7 +1618,7 @@ block/character devices, etc. Rock Ridge is an extension to iso9660 that provides all of these unix like features. Basically there are extensions to each directory record that supply all of the additional information, and when Rock Ridge is in use, -the filesystem is indistinguishable from a normal UNIX file system (except +the filesystem is indistinguishable from a normal UNIX filesystem (except that it is read-only, of course). .TP .B norock @@ -1640,7 +1641,7 @@ and .BR check=strict .) .TP \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP -Give all files in the file system the indicated user or group id, +Give all files in the filesystem the indicated user or group id, possibly overriding the information found in the Rock Ridge extensions. (Default: .BR uid=0,gid=0 .) @@ -1735,8 +1736,8 @@ option was previously specified in order to restore normal behavior. .TP .BR errors= { continue | remount-ro | panic } Define the behaviour when an error is encountered. -(Either ignore errors and just mark the file system erroneous and continue, -or remount the file system read-only, or panic and halt the system.) +(Either ignore errors and just mark the filesystem erroneous and continue, +or remount the filesystem read-only, or panic and halt the system.) .TP .BR noquota | quota | usrquota | grpquota These options are accepted but ignored. @@ -1748,8 +1749,8 @@ None. See mount options for fat. If the .I msdos -file system detects an inconsistency, it reports an error and sets the file -system read-only. The file system can be made writeable again by remounting +filesystem detects an inconsistency, it reports an error and sets the file +system read-only. The filesystem can be made writeable again by remounting it. .SH "Mount options for ncpfs" @@ -1802,7 +1803,7 @@ starting with ":". Here 2 give a little-endian encoding and 1 a byteswapped bigendian encoding. .TP .B posix=[0|1] -If enabled (posix=1), the file system distinguishes between +If enabled (posix=1), the filesystem distinguishes between upper and lower case. The 8.3 alias names are presented as hard links instead of being suppressed. This option is obsolete. .TP @@ -1825,8 +1826,8 @@ There are no mount options. Reiserfs is a journaling filesystem. .TP .BR conv -Instructs version 3.6 reiserfs software to mount a version 3.5 file system, -using the 3.6 format for newly created objects. This file system will no +Instructs version 3.6 reiserfs software to mount a version 3.5 filesystem, +using the 3.6 format for newly created objects. This filesystem will no longer be compatible with reiserfs 3.5 tools. .TP .BR hash= { rupasov | tea | r5 | detect } @@ -1847,16 +1848,16 @@ This may be used if EHASHCOLLISION errors are experienced with the r5 hash. .TP .B r5 A modified version of the rupasov hash. It is used by default and is -the best choice unless the file system has huge directories and +the best choice unless the filesystem has huge directories and unusual file-name patterns. .TP .B detect Instructs .IR mount to detect which hash function is in use by examining -the file system being mounted, and to write this information into +the filesystem being mounted, and to write this information into the reiserfs superblock. This is only useful on the first mount of -an old format file system. +an old format filesystem. .RE .TP .BR hashed_relocation @@ -1888,7 +1889,7 @@ This option is used to disable packing of files into the tree. .TP .BR replayonly Replay the transactions which are in the journal, but do not actually -mount the file system. Mainly used by +mount the filesystem. Mainly used by .IR reiserfsck . .TP .BI resize= number @@ -2066,7 +2067,7 @@ Override the root directory location. (unused) .SH "Mount options for ufs" .TP .BI ufstype= value -UFS is a file system widely used in different operating systems. +UFS is a filesystem widely used in different operating systems. The problem are differences among implementations. Features of some implementations are undocumented, so its hard to recognize the type of ufs automatically. @@ -2183,12 +2184,12 @@ all upper case. .SH "Mount options for usbfs" .TP \fBdevuid=\fP\fIuid\fP and \fBdevgid=\fP\fIgid\fP and \fBdevmode=\fP\fImode\fP -Set the owner and group and mode of the device files in the usbfs file system +Set the owner and group and mode of the device files in the usbfs filesystem (default: uid=gid=0, mode=0644). The mode is given in octal. .TP \fBbusuid=\fP\fIuid\fP and \fBbusgid=\fP\fIgid\fP and \fBbusmode=\fP\fImode\fP Set the owner and group and mode of the bus directories in the usbfs -file system (default: uid=gid=0, mode=0555). The mode is given in octal. +filesystem (default: uid=gid=0, mode=0555). The mode is given in octal. .TP \fBlistuid=\fP\fIuid\fP and \fBlistgid=\fP\fIgid\fP and \fBlistmode=\fP\fImode\fP Set the owner and group and mode of the file @@ -2338,7 +2339,7 @@ Filesystems mounted must be mounted read-only or the mount will fail. .TP .B nouuid -Don't check for double mounted file systems using the file system uuid. +Don't check for double mounted filesystems using the filesystem uuid. This is useful to mount LVM snapshot volumes. .TP .B osyncisosync @@ -2489,10 +2490,10 @@ standard mount options. .SH FILES .TP 18n .I /etc/fstab -file system table +filesystem table .TP .I /etc/mtab -table of mounted file systems +table of mounted filesystems .TP .I /etc/mtab~ lock file @@ -2519,11 +2520,11 @@ a list of filesystem types to try .BR tune2fs (8), .BR losetup (8) .SH BUGS -It is possible for a corrupted file system to cause a crash. +It is possible for a corrupted filesystem to cause a crash. .PP -Some Linux file systems don't support +Some Linux filesystems don't support .B "\-o sync and \-o dirsync" -(the ext2, ext3, fat and vfat file systems +(the ext2, ext3, fat and vfat filesystems .I do support synchronous updates (a la BSD) when mounted with the .B sync diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index 19ecccca..5931ddff 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -23,6 +23,13 @@ tunelp_SOURCES = tunelp.c lp.h info_TEXINFOS = ipc.texi +if LINUX +if HAVE_FALLOCATE +usrbin_PROGRAMS += fallocate +dist_man_MANS += fallocate.1 +endif +endif + if HAVE_PIVOT_ROOT sbin_PROGRAMS += pivot_root dist_man_MANS += pivot_root.8 -- cgit v1.2.3 From 5340a20b664d2d7bdc27e5a0876be65a660a6604 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 18 Aug 2009 10:53:15 +0200 Subject: Revert "mount: clean up mount.8" This reverts commit 98c7944b52c54c86fb5b9d73fbead9442bfa0e30. Unfortunately, the patch has been committed by "git commit -a" and includes unwanted changes in configure.ac and sys-utils/Makefile.am... Sorry. --- configure.ac | 3 - mount/mount.8 | 201 +++++++++++++++++++++++++------------------------- sys-utils/Makefile.am | 7 -- 3 files changed, 100 insertions(+), 111 deletions(-) diff --git a/configure.ac b/configure.ac index aa4fc20d..8999826a 100644 --- a/configure.ac +++ b/configure.ac @@ -554,9 +554,6 @@ UTIL_CHECK_SYSCALL([ioprio_get], [sh*], [289], [x86_64*], [252]) -dnl Old versions of glib don't provide fallocate(2) -UTIL_CHECK_SYSCALL([fallocate]) -AC_CHECK_FUNC([fallocate]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include diff --git a/mount/mount.8 b/mount/mount.8 index a8f64c7b..f4ef7e86 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -41,7 +41,7 @@ .\" .TH MOUNT 8 "2004-12-16" "Linux 2.6" "Linux Programmer's Manual" .SH NAME -mount \- mount a filesystem +mount \- mount a file system .SH SYNOPSIS .B mount .RB [ \-lhV ] @@ -72,7 +72,7 @@ tree, the file hierarchy, rooted at .BR / . These files can be spread out over several devices. The .B mount -command serves to attach the filesystem found on some device +command serves to attach the file system found on some device to the big file tree. Conversely, the .BR umount (8) command will detach it again. @@ -87,7 +87,7 @@ command, is .br .RE -This tells the kernel to attach the filesystem found on +This tells the kernel to attach the file system found on .I device (which is of type .IR type ) @@ -95,10 +95,10 @@ at the directory .IR dir . The previous contents (if any) and owner and mode of .I dir -become invisible, and as long as this filesystem remains mounted, +become invisible, and as long as this file system remains mounted, the pathname .I dir -refers to the root of the filesystem on +refers to the root of the file system on .IR device . .B The listing and help. @@ -112,7 +112,7 @@ prints a help message prints a version string .TP .BR "mount " [ -l "] [" "-t \fItype\fP" ] -lists all mounted filesystems (of type +lists all mounted file systems (of type .IR type ). The option \-l adds the labels in this listing. See below. @@ -233,7 +233,7 @@ or The .I proc -filesystem is not associated with a special device, and when +file system is not associated with a special device, and when mounting it, an arbitrary keyword, such as .I proc can be used instead of a device specification. @@ -263,7 +263,7 @@ The command .IR optlist ] .sp .RE -(usually given in a bootscript) causes all filesystems mentioned in +(usually given in a bootscript) causes all file systems mentioned in .I fstab (of the proper type and/or having or not having the proper options) to be mounted as indicated, except for those whose line contains the @@ -273,7 +273,7 @@ keyword. Adding the option will make mount fork, so that the filesystems are mounted simultaneously. .LP -When mounting a filesystem mentioned in +When mounting a file system mentioned in .IR fstab , it suffices to give only the device, or only the mount point. @@ -282,7 +282,7 @@ The programs .B mount and .B umount -maintain a list of currently mounted filesystems in the file +maintain a list of currently mounted file systems in the file .IR /etc/mtab . If no arguments are given to .BR mount , @@ -313,7 +313,7 @@ and using the "user" option will fail. .B The non-superuser mounts. .RS -Normally, only the superuser can mount filesystems. +Normally, only the superuser can mount file systems. However, when .I fstab contains the @@ -326,7 +326,7 @@ Thus, given a line .B "/dev/cdrom /cd iso9660 ro,user,noauto,unhide" .sp .RE -any user can mount the iso9660 filesystem found on his CDROM +any user can mount the iso9660 file system found on his CDROM using the command .RS .sp @@ -367,7 +367,7 @@ member of the group of the special file. The full set of mount options used by an invocation of .B mount is determined by first extracting the -mount options for the filesystem from the +mount options for the file system from the .I fstab table, then applying any options specified by the .B \-o @@ -407,7 +407,7 @@ and .TP .B \-f Causes everything to be done except for the actual system call; if it's not -obvious, this ``fakes'' mounting the filesystem. This option is useful in +obvious, this ``fakes'' mounting the file system. This option is useful in conjunction with the .B \-v flag to determine what the @@ -435,7 +435,7 @@ Mount without writing in .IR /etc/mtab . This is necessary for example when .I /etc -is on a read-only filesystem. +is on a read-only file system. .TP .BI \-p " num" In case of a loop mount with encryption, read the passphrase from @@ -450,7 +450,7 @@ support this option. This option exists for support of the Linux autofs\-based automounter. .TP .B \-r -Mount the filesystem read-only. A synonym is +Mount the file system read-only. A synonym is .BR "\-o ro" . Note that, depending on the filesystem type, state and kernel behavior, the @@ -461,7 +461,7 @@ set the block device to read-only mode, see command .BR blockdev (8). .TP .B \-w -Mount the filesystem read/write. This is the default. A synonym is +Mount the file system read/write. This is the default. A synonym is .BR "\-o rw" . .TP .BI \-L " label" @@ -478,7 +478,7 @@ These two options require the file .BI \-t " vfstype" The argument following the .B \-t -is used to indicate the filesystem type. The filesystem types which are +is used to indicate the file system type. The file system types which are currently supported include: .IR adfs , .IR affs , @@ -544,7 +544,7 @@ program has to do is issue a simple .IR mount (2) system call, and no detailed knowledge of the filesystem type is required. For a few types however (like nfs, nfs4, cifs, smbfs, ncpfs) ad hoc code is -necessary. The nfs, nfs4, cifs, smbfs, and ncpfs filesystems +necessary. The nfs, nfs4, cifs, smbfs, and ncpfs have a separate mount program. In order to make it possible to treat all types in a uniform way, mount will execute the program .BI /sbin/mount. TYPE @@ -593,9 +593,9 @@ consequences. If your data is valuable, don't ask to guess. More than one type may be specified in a comma separated -list. The list of filesystem types can be prefixed with +list. The list of file system types can be prefixed with .B no -to specify the filesystem types on which no action should be taken. +to specify the file system types on which no action should be taken. (This can be meaningful with the .B \-a option.) @@ -605,7 +605,7 @@ For example, the command: .RS .B "mount \-a \-t nomsdos,ext" .RE -mounts all filesystems except those of type +mounts all file systems except those of type .I msdos and .IR ext . @@ -627,7 +627,7 @@ For example, the command: .B "mount \-a \-O no_netdev" .sp .RE -mounts all filesystems except those which have the option +mounts all file systems except those which have the option .I _netdev specified in the options field in the .I /etc/fstab @@ -690,14 +690,14 @@ Some of these options could be enabled or disabled by default in the system kernel. To check the current setting see the options in /proc/mounts. -The following options apply to any filesystem that is being -mounted (but not every filesystem actually honors them - e.g., the +The following options apply to any file system that is being +mounted (but not every file system actually honors them - e.g., the .B sync option today has effect only for ext2, ext3, fat, vfat and ufs): .TP .B async -All I/O to the filesystem should be done asynchronously. (See also the +All I/O to the file system should be done asynchronously. (See also the .B sync option.) .TP @@ -705,7 +705,7 @@ option.) Update inode access time for each access. This is the default. .TP .B noatime -Do not update inode access times on this filesystem (e.g, for faster +Do not update inode access times on this file system (e.g, for faster access on the news spool to speed up news servers). .TP .B auto @@ -716,7 +716,7 @@ option. .B noauto Can only be mounted explicitly (i.e., the .B \-a -option will not cause the filesystem to be mounted). +option will not cause the file system to be mounted). .TP \fBcontext=\fP\fIcontext\fP, \fBfscontext=\fP\fIcontext\fP, \fBdefcontext=\fP\fIcontext\fP and \fBrootcontext=\fP\fIcontext\fP The @@ -757,7 +757,7 @@ files. You can set the default security context for unlabeled files using .BR defcontext= option. This overrides the value set for unlabeled files in the policy and requires a -filesystem that supports xattr labeling. +file system that supports xattr labeling. The .BR rootcontext= @@ -774,7 +774,7 @@ Use default options: .BR rw ", " suid ", " dev ", " exec ", " auto ", " nouser ", and " async. .TP .B dev -Interpret character or block special devices on the filesystem. +Interpret character or block special devices on the file system. .TP .B nodev Do not interpret character or block special devices on the file @@ -787,7 +787,7 @@ Update directory inode access times on this filesystem. This is the default. Do not update directory inode access times on this filesystem. .TP .B dirsync -All directory updates within the filesystem should be done synchronously. +All directory updates within the file system should be done synchronously. This affects the following system calls: creat, link, unlink, symlink, mkdir, rmdir, mknod and rename. .TP @@ -795,12 +795,12 @@ mkdir, rmdir, mknod and rename. Permit execution of binaries. .TP .B noexec -Do not allow direct execution of any binaries on the mounted filesystem. +Do not allow direct execution of any binaries on the mounted file system. (Until recently it was possible to run binaries anyway using a command like /lib/ld*.so /mnt/binary. This trick fails since Linux 2.4.25 / 2.6.0.) .TP .B group -Allow an ordinary (i.e., non-root) user to mount the filesystem if one +Allow an ordinary (i.e., non-root) user to mount the file system if one of his groups matches the group of the device. This option implies the options .BR nosuid " and " nodev @@ -858,7 +858,7 @@ effect. (This seems safe, but is in fact rather unsafe if you have suidperl(1) installed.) .TP .B owner -Allow an ordinary (i.e., non-root) user to mount the filesystem if he +Allow an ordinary (i.e., non-root) user to mount the file system if he is the owner of the device. This option implies the options .BR nosuid " and " nodev @@ -866,9 +866,9 @@ This option implies the options .BR owner,dev,suid ). .TP .B remount -Attempt to remount an already-mounted filesystem. This is commonly -used to change the mount flags for a filesystem, especially to make a -readonly filesystem writeable. It does not change device or mount point. +Attempt to remount an already-mounted file system. This is commonly +used to change the mount flags for a file system, especially to make a +readonly file system writeable. It does not change device or mount point. The remount functionality follows the standard way how the mount command works with options from fstab. It means the mount command doesn't read fstab (or @@ -892,38 +892,38 @@ options from command line ( ). .TP .B ro -Mount the filesystem read-only. +Mount the file system read-only. .TP .B rw -Mount the filesystem read-write. +Mount the file system read-write. .TP .B sync -All I/O to the filesystem should be done synchronously. In case of media with limited number of write cycles +All I/O to the file system should be done synchronously. In case of media with limited number of write cycles (e.g. some flash drives) "sync" may cause life-cycle shortening. .TP .B user -Allow an ordinary user to mount the filesystem. +Allow an ordinary user to mount the file system. The name of the mounting user is written to mtab so that he can unmount -the filesystem again. +the file system again. This option implies the options .BR noexec ", " nosuid ", and " nodev (unless overridden by subsequent options, as in the option line .BR user,exec,dev,suid ). .TP .B nouser -Forbid an ordinary (i.e., non-root) user to mount the filesystem. +Forbid an ordinary (i.e., non-root) user to mount the file system. This is the default. .TP .B users -Allow every user to mount and unmount the filesystem. +Allow every user to mount and unmount the file system. This option implies the options .BR noexec ", " nosuid ", and " nodev (unless overridden by subsequent options, as in the option line .BR users,exec,dev,suid ). .SH "FILESYSTEM SPECIFIC MOUNT OPTIONS" -The following options apply only to certain filesystems. -We sort them by filesystem. They all follow the +The following options apply only to certain file systems. +We sort them by file system. They all follow the .B \-o flag. @@ -934,7 +934,7 @@ More info may be found in the kernel source subdirectory .SH "Mount options for adfs" .TP \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP -Set the owner and group of the files in the filesystem (default: uid=gid=0). +Set the owner and group of the files in the file system (default: uid=gid=0). .TP \fBownmask=\fP\fIvalue\fP and \fBothmask=\fP\fIvalue\fP Set the permission mask for ADFS 'owner' permissions and 'other' permissions, @@ -944,7 +944,7 @@ See also .SH "Mount options for affs" .TP \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP -Set the owner and group of the root of the filesystem (default: uid=gid=0, +Set the owner and group of the root of the file system (default: uid=gid=0, but with option .B uid or @@ -962,10 +962,10 @@ Add search permission to directories that have read permission. The value is given in octal. .TP .B protect -Do not allow any changes to the protection bits on the filesystem. +Do not allow any changes to the protection bits on the file system. .TP .B usemp -Set uid and gid of the root of the filesystem to the uid and gid +Set uid and gid of the root of the file system to the uid and gid of the mount point upon the first sync or umount, and then clear this option. Strange... .TP @@ -1001,14 +1001,14 @@ man page (cifs-mount package must be installed). None. .SH "Mount options for debugfs" -The debugfs filesystem is a pseudo filesystem, traditionally mounted on +The debugfs file system is a pseudo file system, traditionally mounted on .IR /sys/kernel/debug . .\" or just /debug .\" present since 2.6.11 There are no mount options. .SH "Mount options for devpts" -The devpts filesystem is a pseudo filesystem, traditionally mounted on +The devpts file system is a pseudo file system, traditionally mounted on .IR /dev/pts . In order to acquire a pseudo terminal, a process opens .IR /dev/ptmx ; @@ -1090,11 +1090,11 @@ configuration. .SH "Mount options for ext" None. -Note that the `ext' filesystem is obsolete. Don't use it. +Note that the `ext' file system is obsolete. Don't use it. Since Linux version 2.1.21 extfs is no longer part of the kernel source. .SH "Mount options for ext2" -The `ext2' filesystem is the standard Linux filesystem. +The `ext2' file system is the standard Linux file system. .\" Due to a kernel bug, it may be mounted with random mount options .\" (fixed in Linux 2.0.4). Since Linux 2.5.46, for most mount options the default @@ -1112,10 +1112,10 @@ system call. The .B minixdf behaviour is to return in the .I f_blocks -field the total number of blocks of the filesystem, while the +field the total number of blocks of the file system, while the .B bsddf behaviour (which is the default) is to subtract the overhead blocks -used by the ext2 filesystem and not available for file storage. Thus +used by the ext2 file system and not available for file storage. Thus .nf % mount /k -o minixdf; df /k; umount /k @@ -1142,8 +1142,8 @@ Print debugging info upon each (re)mount. .TP .BR errors= { continue | remount-ro | panic } Define the behaviour when an error is encountered. -(Either ignore errors and just mark the filesystem erroneous and continue, -or remount the filesystem read-only, or panic and halt the system.) +(Either ignore errors and just mark the file system erroneous and continue, +or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using .BR tune2fs (8). @@ -1172,7 +1172,7 @@ kernels which only store and expect 16-bit values. Use old allocator or Orlov allocator for new inodes. Orlov is default. .TP \fBresgid=\fP\fIn\fP and \fBresuid=\fP\fIn\fP -The ext2 filesystem reserves a certain percentage of the available +The ext2 file system reserves a certain percentage of the available space (by default 5%, see .BR mke2fs (8) and @@ -1202,37 +1202,37 @@ Support "user." extended attributes (or not). .SH "Mount options for ext3" -The ext3 filesystem is a version of the ext2 filesystem which has been +The `ext3' file system is a version of the ext2 file system which has been enhanced with journalling. It supports the same options as ext2 as well as the following additions: .\" .TP .\" .BR abort -.\" Mount the filesystem in abort mode, as if a fatal error has occurred. +.\" Mount the file system in abort mode, as if a fatal error has occurred. .TP .BR journal=update -Update the ext3 filesystem's journal to the current format. +Update the ext3 file system's journal to the current format. .TP .BR journal=inum When a journal already exists, this option is ignored. Otherwise, it -specifies the number of the inode which will represent the ext3 filesystem's +specifies the number of the inode which will represent the ext3 file system's journal file; ext3 will create a new journal, overwriting the old contents of the file whose inode number is .IR inum . .TP .BR noload -Do not load the ext3 filesystem's journal on mounting. +Do not load the ext3 file system's journal on mounting. .TP .BR data= { journal | ordered | writeback } Specifies the journalling mode for file data. Metadata is always journaled. To use modes other than .B ordered -on the root filesystem, pass the mode to the kernel as boot parameter, e.g. +on the root file system, pass the mode to the kernel as boot parameter, e.g. .IR rootflags=data=journal . .RS .TP .B journal All data is committed into the journal prior to being written into the -main filesystem. +main file system. .TP .B ordered This is the default mode. All data is forced directly out to the main file @@ -1240,15 +1240,15 @@ system prior to its metadata being committed to the journal. .TP .B writeback Data ordering is not preserved - data may be written into the main -filesystem after its metadata has been committed to the journal. +file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees -internal filesystem integrity, however it can allow old data to appear +internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery. .RE .TP .BR barrier=0 " / " barrier=1 " This enables/disables barriers. barrier=0 disables it, barrier=1 enables it. -The ext3 filesystem does not enable write barriers by default. +The ext3 does not enable write barriers by default. .TP .BI commit= nrsec Sync all data and metadata every @@ -1266,9 +1266,8 @@ Enable POSIX Access Control Lists. See the manual page. .SH "Mount options for ext4" -The ext4 filesystem is an an advanced level of the ext3 filesystem which -incorporates scalability and reliability enhancements for supporting large -filesystem. +The `ext4' is an an advanced level of the ext3 filesystem which incorporates +scalability and reliability enhancements for supporting large filesystem. The options .B journal_dev, noload, data, commit, orlov, oldalloc, [no]user_xattr @@ -1289,7 +1288,7 @@ enabled older kernels cannot mount the device. This will enable 'journal_checksum' internally. .TP .BR journal=update -Update the ext4 filesystem's journal to the current format. +Update the ext4 file system's journal to the current format. .TP .BR barrier=0 " / " barrier=1 " / " barrier " / " nobarrier This enables/disables the use of write barriers in the jbd code. barrier=0 @@ -1302,7 +1301,7 @@ barriers may safely improve performance. The mount options "barrier" and "nobarrier" can also be used to enable or disable barriers, for consistency with other ext4 mount options. -The ext4 filesystem enables write barriers by default. +The ext4 enables write barriers by default. .TP .BI inode_readahead= n This tuning parameter controls the maximum number of inode table blocks that @@ -1312,7 +1311,7 @@ The default value is 32 blocks. .BI stripe= n Number of filesystem blocks that mballoc will try to use for allocation size and alignment. For RAID5/6 systems this should be the number of data disks * -RAID chunk size in filesystem blocks. +RAID chunk size in file system blocks. .TP .BR delalloc Deferring block allocation until write-out time. @@ -1451,7 +1450,7 @@ and VFAT filesystems. By default, codepage 437 is used. .BR conv= {b [ inary ]| t [ ext ]| a [ uto ]} The .I fat -filesystem can perform CRLF<-->NL (MS-DOS text format to UNIX text +file system can perform CRLF<-->NL (MS-DOS text format to UNIX text format) conversion in the kernel. The following conversion modes are available: .RS @@ -1474,7 +1473,7 @@ gz, tgz, deb, gif, bmp, tif, gl, jpg, pcx, tfm, vf, gf, pk, pxl, dvi). Programs that do computed lseeks won't like in-kernel text conversion. Several people have had their data ruined by this translation. Beware! -For filesystems mounted in binary mode, a conversion tool +For file systems mounted in binary mode, a conversion tool (fromdos/todos) is available. This option is obsolete. .RE .TP @@ -1491,7 +1490,7 @@ Option passed to the CVF module. This option is obsolete. .B debug Turn on the .I debug -flag. A version string and a list of filesystem parameters will be +flag. A version string and a list of file system parameters will be printed (these data are also printed if the parameters appear to be inconsistent). .TP @@ -1540,7 +1539,7 @@ correct, by this option you can avoid scanning disk. .TP .BR dots ", " nodots ", " dotsOK= [ yes | no ] Various misguided attempts to force Unix or DOS conventions -onto a FAT filesystem. +onto a FAT file system. .SH "Mount options for hfs" .TP @@ -1618,7 +1617,7 @@ block/character devices, etc. Rock Ridge is an extension to iso9660 that provides all of these unix like features. Basically there are extensions to each directory record that supply all of the additional information, and when Rock Ridge is in use, -the filesystem is indistinguishable from a normal UNIX filesystem (except +the filesystem is indistinguishable from a normal UNIX file system (except that it is read-only, of course). .TP .B norock @@ -1641,7 +1640,7 @@ and .BR check=strict .) .TP \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP -Give all files in the filesystem the indicated user or group id, +Give all files in the file system the indicated user or group id, possibly overriding the information found in the Rock Ridge extensions. (Default: .BR uid=0,gid=0 .) @@ -1736,8 +1735,8 @@ option was previously specified in order to restore normal behavior. .TP .BR errors= { continue | remount-ro | panic } Define the behaviour when an error is encountered. -(Either ignore errors and just mark the filesystem erroneous and continue, -or remount the filesystem read-only, or panic and halt the system.) +(Either ignore errors and just mark the file system erroneous and continue, +or remount the file system read-only, or panic and halt the system.) .TP .BR noquota | quota | usrquota | grpquota These options are accepted but ignored. @@ -1749,8 +1748,8 @@ None. See mount options for fat. If the .I msdos -filesystem detects an inconsistency, it reports an error and sets the file -system read-only. The filesystem can be made writeable again by remounting +file system detects an inconsistency, it reports an error and sets the file +system read-only. The file system can be made writeable again by remounting it. .SH "Mount options for ncpfs" @@ -1803,7 +1802,7 @@ starting with ":". Here 2 give a little-endian encoding and 1 a byteswapped bigendian encoding. .TP .B posix=[0|1] -If enabled (posix=1), the filesystem distinguishes between +If enabled (posix=1), the file system distinguishes between upper and lower case. The 8.3 alias names are presented as hard links instead of being suppressed. This option is obsolete. .TP @@ -1826,8 +1825,8 @@ There are no mount options. Reiserfs is a journaling filesystem. .TP .BR conv -Instructs version 3.6 reiserfs software to mount a version 3.5 filesystem, -using the 3.6 format for newly created objects. This filesystem will no +Instructs version 3.6 reiserfs software to mount a version 3.5 file system, +using the 3.6 format for newly created objects. This file system will no longer be compatible with reiserfs 3.5 tools. .TP .BR hash= { rupasov | tea | r5 | detect } @@ -1848,16 +1847,16 @@ This may be used if EHASHCOLLISION errors are experienced with the r5 hash. .TP .B r5 A modified version of the rupasov hash. It is used by default and is -the best choice unless the filesystem has huge directories and +the best choice unless the file system has huge directories and unusual file-name patterns. .TP .B detect Instructs .IR mount to detect which hash function is in use by examining -the filesystem being mounted, and to write this information into +the file system being mounted, and to write this information into the reiserfs superblock. This is only useful on the first mount of -an old format filesystem. +an old format file system. .RE .TP .BR hashed_relocation @@ -1889,7 +1888,7 @@ This option is used to disable packing of files into the tree. .TP .BR replayonly Replay the transactions which are in the journal, but do not actually -mount the filesystem. Mainly used by +mount the file system. Mainly used by .IR reiserfsck . .TP .BI resize= number @@ -2067,7 +2066,7 @@ Override the root directory location. (unused) .SH "Mount options for ufs" .TP .BI ufstype= value -UFS is a filesystem widely used in different operating systems. +UFS is a file system widely used in different operating systems. The problem are differences among implementations. Features of some implementations are undocumented, so its hard to recognize the type of ufs automatically. @@ -2184,12 +2183,12 @@ all upper case. .SH "Mount options for usbfs" .TP \fBdevuid=\fP\fIuid\fP and \fBdevgid=\fP\fIgid\fP and \fBdevmode=\fP\fImode\fP -Set the owner and group and mode of the device files in the usbfs filesystem +Set the owner and group and mode of the device files in the usbfs file system (default: uid=gid=0, mode=0644). The mode is given in octal. .TP \fBbusuid=\fP\fIuid\fP and \fBbusgid=\fP\fIgid\fP and \fBbusmode=\fP\fImode\fP Set the owner and group and mode of the bus directories in the usbfs -filesystem (default: uid=gid=0, mode=0555). The mode is given in octal. +file system (default: uid=gid=0, mode=0555). The mode is given in octal. .TP \fBlistuid=\fP\fIuid\fP and \fBlistgid=\fP\fIgid\fP and \fBlistmode=\fP\fImode\fP Set the owner and group and mode of the file @@ -2339,7 +2338,7 @@ Filesystems mounted must be mounted read-only or the mount will fail. .TP .B nouuid -Don't check for double mounted filesystems using the filesystem uuid. +Don't check for double mounted file systems using the file system uuid. This is useful to mount LVM snapshot volumes. .TP .B osyncisosync @@ -2490,10 +2489,10 @@ standard mount options. .SH FILES .TP 18n .I /etc/fstab -filesystem table +file system table .TP .I /etc/mtab -table of mounted filesystems +table of mounted file systems .TP .I /etc/mtab~ lock file @@ -2520,11 +2519,11 @@ a list of filesystem types to try .BR tune2fs (8), .BR losetup (8) .SH BUGS -It is possible for a corrupted filesystem to cause a crash. +It is possible for a corrupted file system to cause a crash. .PP -Some Linux filesystems don't support +Some Linux file systems don't support .B "\-o sync and \-o dirsync" -(the ext2, ext3, fat and vfat filesystems +(the ext2, ext3, fat and vfat file systems .I do support synchronous updates (a la BSD) when mounted with the .B sync diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index 5931ddff..19ecccca 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -23,13 +23,6 @@ tunelp_SOURCES = tunelp.c lp.h info_TEXINFOS = ipc.texi -if LINUX -if HAVE_FALLOCATE -usrbin_PROGRAMS += fallocate -dist_man_MANS += fallocate.1 -endif -endif - if HAVE_PIVOT_ROOT sbin_PROGRAMS += pivot_root dist_man_MANS += pivot_root.8 -- cgit v1.2.3 From 20a147ef0ea56b6d9bce0a1b83f5c57e7bbefd76 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 18 Aug 2009 10:56:56 +0200 Subject: mount: clean up mount.8 Signed-off-by: Karel Zak --- mount/mount.8 | 201 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 101 insertions(+), 100 deletions(-) diff --git a/mount/mount.8 b/mount/mount.8 index f4ef7e86..a8f64c7b 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -41,7 +41,7 @@ .\" .TH MOUNT 8 "2004-12-16" "Linux 2.6" "Linux Programmer's Manual" .SH NAME -mount \- mount a file system +mount \- mount a filesystem .SH SYNOPSIS .B mount .RB [ \-lhV ] @@ -72,7 +72,7 @@ tree, the file hierarchy, rooted at .BR / . These files can be spread out over several devices. The .B mount -command serves to attach the file system found on some device +command serves to attach the filesystem found on some device to the big file tree. Conversely, the .BR umount (8) command will detach it again. @@ -87,7 +87,7 @@ command, is .br .RE -This tells the kernel to attach the file system found on +This tells the kernel to attach the filesystem found on .I device (which is of type .IR type ) @@ -95,10 +95,10 @@ at the directory .IR dir . The previous contents (if any) and owner and mode of .I dir -become invisible, and as long as this file system remains mounted, +become invisible, and as long as this filesystem remains mounted, the pathname .I dir -refers to the root of the file system on +refers to the root of the filesystem on .IR device . .B The listing and help. @@ -112,7 +112,7 @@ prints a help message prints a version string .TP .BR "mount " [ -l "] [" "-t \fItype\fP" ] -lists all mounted file systems (of type +lists all mounted filesystems (of type .IR type ). The option \-l adds the labels in this listing. See below. @@ -233,7 +233,7 @@ or The .I proc -file system is not associated with a special device, and when +filesystem is not associated with a special device, and when mounting it, an arbitrary keyword, such as .I proc can be used instead of a device specification. @@ -263,7 +263,7 @@ The command .IR optlist ] .sp .RE -(usually given in a bootscript) causes all file systems mentioned in +(usually given in a bootscript) causes all filesystems mentioned in .I fstab (of the proper type and/or having or not having the proper options) to be mounted as indicated, except for those whose line contains the @@ -273,7 +273,7 @@ keyword. Adding the option will make mount fork, so that the filesystems are mounted simultaneously. .LP -When mounting a file system mentioned in +When mounting a filesystem mentioned in .IR fstab , it suffices to give only the device, or only the mount point. @@ -282,7 +282,7 @@ The programs .B mount and .B umount -maintain a list of currently mounted file systems in the file +maintain a list of currently mounted filesystems in the file .IR /etc/mtab . If no arguments are given to .BR mount , @@ -313,7 +313,7 @@ and using the "user" option will fail. .B The non-superuser mounts. .RS -Normally, only the superuser can mount file systems. +Normally, only the superuser can mount filesystems. However, when .I fstab contains the @@ -326,7 +326,7 @@ Thus, given a line .B "/dev/cdrom /cd iso9660 ro,user,noauto,unhide" .sp .RE -any user can mount the iso9660 file system found on his CDROM +any user can mount the iso9660 filesystem found on his CDROM using the command .RS .sp @@ -367,7 +367,7 @@ member of the group of the special file. The full set of mount options used by an invocation of .B mount is determined by first extracting the -mount options for the file system from the +mount options for the filesystem from the .I fstab table, then applying any options specified by the .B \-o @@ -407,7 +407,7 @@ and .TP .B \-f Causes everything to be done except for the actual system call; if it's not -obvious, this ``fakes'' mounting the file system. This option is useful in +obvious, this ``fakes'' mounting the filesystem. This option is useful in conjunction with the .B \-v flag to determine what the @@ -435,7 +435,7 @@ Mount without writing in .IR /etc/mtab . This is necessary for example when .I /etc -is on a read-only file system. +is on a read-only filesystem. .TP .BI \-p " num" In case of a loop mount with encryption, read the passphrase from @@ -450,7 +450,7 @@ support this option. This option exists for support of the Linux autofs\-based automounter. .TP .B \-r -Mount the file system read-only. A synonym is +Mount the filesystem read-only. A synonym is .BR "\-o ro" . Note that, depending on the filesystem type, state and kernel behavior, the @@ -461,7 +461,7 @@ set the block device to read-only mode, see command .BR blockdev (8). .TP .B \-w -Mount the file system read/write. This is the default. A synonym is +Mount the filesystem read/write. This is the default. A synonym is .BR "\-o rw" . .TP .BI \-L " label" @@ -478,7 +478,7 @@ These two options require the file .BI \-t " vfstype" The argument following the .B \-t -is used to indicate the file system type. The file system types which are +is used to indicate the filesystem type. The filesystem types which are currently supported include: .IR adfs , .IR affs , @@ -544,7 +544,7 @@ program has to do is issue a simple .IR mount (2) system call, and no detailed knowledge of the filesystem type is required. For a few types however (like nfs, nfs4, cifs, smbfs, ncpfs) ad hoc code is -necessary. The nfs, nfs4, cifs, smbfs, and ncpfs +necessary. The nfs, nfs4, cifs, smbfs, and ncpfs filesystems have a separate mount program. In order to make it possible to treat all types in a uniform way, mount will execute the program .BI /sbin/mount. TYPE @@ -593,9 +593,9 @@ consequences. If your data is valuable, don't ask to guess. More than one type may be specified in a comma separated -list. The list of file system types can be prefixed with +list. The list of filesystem types can be prefixed with .B no -to specify the file system types on which no action should be taken. +to specify the filesystem types on which no action should be taken. (This can be meaningful with the .B \-a option.) @@ -605,7 +605,7 @@ For example, the command: .RS .B "mount \-a \-t nomsdos,ext" .RE -mounts all file systems except those of type +mounts all filesystems except those of type .I msdos and .IR ext . @@ -627,7 +627,7 @@ For example, the command: .B "mount \-a \-O no_netdev" .sp .RE -mounts all file systems except those which have the option +mounts all filesystems except those which have the option .I _netdev specified in the options field in the .I /etc/fstab @@ -690,14 +690,14 @@ Some of these options could be enabled or disabled by default in the system kernel. To check the current setting see the options in /proc/mounts. -The following options apply to any file system that is being -mounted (but not every file system actually honors them - e.g., the +The following options apply to any filesystem that is being +mounted (but not every filesystem actually honors them - e.g., the .B sync option today has effect only for ext2, ext3, fat, vfat and ufs): .TP .B async -All I/O to the file system should be done asynchronously. (See also the +All I/O to the filesystem should be done asynchronously. (See also the .B sync option.) .TP @@ -705,7 +705,7 @@ option.) Update inode access time for each access. This is the default. .TP .B noatime -Do not update inode access times on this file system (e.g, for faster +Do not update inode access times on this filesystem (e.g, for faster access on the news spool to speed up news servers). .TP .B auto @@ -716,7 +716,7 @@ option. .B noauto Can only be mounted explicitly (i.e., the .B \-a -option will not cause the file system to be mounted). +option will not cause the filesystem to be mounted). .TP \fBcontext=\fP\fIcontext\fP, \fBfscontext=\fP\fIcontext\fP, \fBdefcontext=\fP\fIcontext\fP and \fBrootcontext=\fP\fIcontext\fP The @@ -757,7 +757,7 @@ files. You can set the default security context for unlabeled files using .BR defcontext= option. This overrides the value set for unlabeled files in the policy and requires a -file system that supports xattr labeling. +filesystem that supports xattr labeling. The .BR rootcontext= @@ -774,7 +774,7 @@ Use default options: .BR rw ", " suid ", " dev ", " exec ", " auto ", " nouser ", and " async. .TP .B dev -Interpret character or block special devices on the file system. +Interpret character or block special devices on the filesystem. .TP .B nodev Do not interpret character or block special devices on the file @@ -787,7 +787,7 @@ Update directory inode access times on this filesystem. This is the default. Do not update directory inode access times on this filesystem. .TP .B dirsync -All directory updates within the file system should be done synchronously. +All directory updates within the filesystem should be done synchronously. This affects the following system calls: creat, link, unlink, symlink, mkdir, rmdir, mknod and rename. .TP @@ -795,12 +795,12 @@ mkdir, rmdir, mknod and rename. Permit execution of binaries. .TP .B noexec -Do not allow direct execution of any binaries on the mounted file system. +Do not allow direct execution of any binaries on the mounted filesystem. (Until recently it was possible to run binaries anyway using a command like /lib/ld*.so /mnt/binary. This trick fails since Linux 2.4.25 / 2.6.0.) .TP .B group -Allow an ordinary (i.e., non-root) user to mount the file system if one +Allow an ordinary (i.e., non-root) user to mount the filesystem if one of his groups matches the group of the device. This option implies the options .BR nosuid " and " nodev @@ -858,7 +858,7 @@ effect. (This seems safe, but is in fact rather unsafe if you have suidperl(1) installed.) .TP .B owner -Allow an ordinary (i.e., non-root) user to mount the file system if he +Allow an ordinary (i.e., non-root) user to mount the filesystem if he is the owner of the device. This option implies the options .BR nosuid " and " nodev @@ -866,9 +866,9 @@ This option implies the options .BR owner,dev,suid ). .TP .B remount -Attempt to remount an already-mounted file system. This is commonly -used to change the mount flags for a file system, especially to make a -readonly file system writeable. It does not change device or mount point. +Attempt to remount an already-mounted filesystem. This is commonly +used to change the mount flags for a filesystem, especially to make a +readonly filesystem writeable. It does not change device or mount point. The remount functionality follows the standard way how the mount command works with options from fstab. It means the mount command doesn't read fstab (or @@ -892,38 +892,38 @@ options from command line ( ). .TP .B ro -Mount the file system read-only. +Mount the filesystem read-only. .TP .B rw -Mount the file system read-write. +Mount the filesystem read-write. .TP .B sync -All I/O to the file system should be done synchronously. In case of media with limited number of write cycles +All I/O to the filesystem should be done synchronously. In case of media with limited number of write cycles (e.g. some flash drives) "sync" may cause life-cycle shortening. .TP .B user -Allow an ordinary user to mount the file system. +Allow an ordinary user to mount the filesystem. The name of the mounting user is written to mtab so that he can unmount -the file system again. +the filesystem again. This option implies the options .BR noexec ", " nosuid ", and " nodev (unless overridden by subsequent options, as in the option line .BR user,exec,dev,suid ). .TP .B nouser -Forbid an ordinary (i.e., non-root) user to mount the file system. +Forbid an ordinary (i.e., non-root) user to mount the filesystem. This is the default. .TP .B users -Allow every user to mount and unmount the file system. +Allow every user to mount and unmount the filesystem. This option implies the options .BR noexec ", " nosuid ", and " nodev (unless overridden by subsequent options, as in the option line .BR users,exec,dev,suid ). .SH "FILESYSTEM SPECIFIC MOUNT OPTIONS" -The following options apply only to certain file systems. -We sort them by file system. They all follow the +The following options apply only to certain filesystems. +We sort them by filesystem. They all follow the .B \-o flag. @@ -934,7 +934,7 @@ More info may be found in the kernel source subdirectory .SH "Mount options for adfs" .TP \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP -Set the owner and group of the files in the file system (default: uid=gid=0). +Set the owner and group of the files in the filesystem (default: uid=gid=0). .TP \fBownmask=\fP\fIvalue\fP and \fBothmask=\fP\fIvalue\fP Set the permission mask for ADFS 'owner' permissions and 'other' permissions, @@ -944,7 +944,7 @@ See also .SH "Mount options for affs" .TP \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP -Set the owner and group of the root of the file system (default: uid=gid=0, +Set the owner and group of the root of the filesystem (default: uid=gid=0, but with option .B uid or @@ -962,10 +962,10 @@ Add search permission to directories that have read permission. The value is given in octal. .TP .B protect -Do not allow any changes to the protection bits on the file system. +Do not allow any changes to the protection bits on the filesystem. .TP .B usemp -Set uid and gid of the root of the file system to the uid and gid +Set uid and gid of the root of the filesystem to the uid and gid of the mount point upon the first sync or umount, and then clear this option. Strange... .TP @@ -1001,14 +1001,14 @@ man page (cifs-mount package must be installed). None. .SH "Mount options for debugfs" -The debugfs file system is a pseudo file system, traditionally mounted on +The debugfs filesystem is a pseudo filesystem, traditionally mounted on .IR /sys/kernel/debug . .\" or just /debug .\" present since 2.6.11 There are no mount options. .SH "Mount options for devpts" -The devpts file system is a pseudo file system, traditionally mounted on +The devpts filesystem is a pseudo filesystem, traditionally mounted on .IR /dev/pts . In order to acquire a pseudo terminal, a process opens .IR /dev/ptmx ; @@ -1090,11 +1090,11 @@ configuration. .SH "Mount options for ext" None. -Note that the `ext' file system is obsolete. Don't use it. +Note that the `ext' filesystem is obsolete. Don't use it. Since Linux version 2.1.21 extfs is no longer part of the kernel source. .SH "Mount options for ext2" -The `ext2' file system is the standard Linux file system. +The `ext2' filesystem is the standard Linux filesystem. .\" Due to a kernel bug, it may be mounted with random mount options .\" (fixed in Linux 2.0.4). Since Linux 2.5.46, for most mount options the default @@ -1112,10 +1112,10 @@ system call. The .B minixdf behaviour is to return in the .I f_blocks -field the total number of blocks of the file system, while the +field the total number of blocks of the filesystem, while the .B bsddf behaviour (which is the default) is to subtract the overhead blocks -used by the ext2 file system and not available for file storage. Thus +used by the ext2 filesystem and not available for file storage. Thus .nf % mount /k -o minixdf; df /k; umount /k @@ -1142,8 +1142,8 @@ Print debugging info upon each (re)mount. .TP .BR errors= { continue | remount-ro | panic } Define the behaviour when an error is encountered. -(Either ignore errors and just mark the file system erroneous and continue, -or remount the file system read-only, or panic and halt the system.) +(Either ignore errors and just mark the filesystem erroneous and continue, +or remount the filesystem read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using .BR tune2fs (8). @@ -1172,7 +1172,7 @@ kernels which only store and expect 16-bit values. Use old allocator or Orlov allocator for new inodes. Orlov is default. .TP \fBresgid=\fP\fIn\fP and \fBresuid=\fP\fIn\fP -The ext2 file system reserves a certain percentage of the available +The ext2 filesystem reserves a certain percentage of the available space (by default 5%, see .BR mke2fs (8) and @@ -1202,37 +1202,37 @@ Support "user." extended attributes (or not). .SH "Mount options for ext3" -The `ext3' file system is a version of the ext2 file system which has been +The ext3 filesystem is a version of the ext2 filesystem which has been enhanced with journalling. It supports the same options as ext2 as well as the following additions: .\" .TP .\" .BR abort -.\" Mount the file system in abort mode, as if a fatal error has occurred. +.\" Mount the filesystem in abort mode, as if a fatal error has occurred. .TP .BR journal=update -Update the ext3 file system's journal to the current format. +Update the ext3 filesystem's journal to the current format. .TP .BR journal=inum When a journal already exists, this option is ignored. Otherwise, it -specifies the number of the inode which will represent the ext3 file system's +specifies the number of the inode which will represent the ext3 filesystem's journal file; ext3 will create a new journal, overwriting the old contents of the file whose inode number is .IR inum . .TP .BR noload -Do not load the ext3 file system's journal on mounting. +Do not load the ext3 filesystem's journal on mounting. .TP .BR data= { journal | ordered | writeback } Specifies the journalling mode for file data. Metadata is always journaled. To use modes other than .B ordered -on the root file system, pass the mode to the kernel as boot parameter, e.g. +on the root filesystem, pass the mode to the kernel as boot parameter, e.g. .IR rootflags=data=journal . .RS .TP .B journal All data is committed into the journal prior to being written into the -main file system. +main filesystem. .TP .B ordered This is the default mode. All data is forced directly out to the main file @@ -1240,15 +1240,15 @@ system prior to its metadata being committed to the journal. .TP .B writeback Data ordering is not preserved - data may be written into the main -file system after its metadata has been committed to the journal. +filesystem after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees -internal file system integrity, however it can allow old data to appear +internal filesystem integrity, however it can allow old data to appear in files after a crash and journal recovery. .RE .TP .BR barrier=0 " / " barrier=1 " This enables/disables barriers. barrier=0 disables it, barrier=1 enables it. -The ext3 does not enable write barriers by default. +The ext3 filesystem does not enable write barriers by default. .TP .BI commit= nrsec Sync all data and metadata every @@ -1266,8 +1266,9 @@ Enable POSIX Access Control Lists. See the manual page. .SH "Mount options for ext4" -The `ext4' is an an advanced level of the ext3 filesystem which incorporates -scalability and reliability enhancements for supporting large filesystem. +The ext4 filesystem is an an advanced level of the ext3 filesystem which +incorporates scalability and reliability enhancements for supporting large +filesystem. The options .B journal_dev, noload, data, commit, orlov, oldalloc, [no]user_xattr @@ -1288,7 +1289,7 @@ enabled older kernels cannot mount the device. This will enable 'journal_checksum' internally. .TP .BR journal=update -Update the ext4 file system's journal to the current format. +Update the ext4 filesystem's journal to the current format. .TP .BR barrier=0 " / " barrier=1 " / " barrier " / " nobarrier This enables/disables the use of write barriers in the jbd code. barrier=0 @@ -1301,7 +1302,7 @@ barriers may safely improve performance. The mount options "barrier" and "nobarrier" can also be used to enable or disable barriers, for consistency with other ext4 mount options. -The ext4 enables write barriers by default. +The ext4 filesystem enables write barriers by default. .TP .BI inode_readahead= n This tuning parameter controls the maximum number of inode table blocks that @@ -1311,7 +1312,7 @@ The default value is 32 blocks. .BI stripe= n Number of filesystem blocks that mballoc will try to use for allocation size and alignment. For RAID5/6 systems this should be the number of data disks * -RAID chunk size in file system blocks. +RAID chunk size in filesystem blocks. .TP .BR delalloc Deferring block allocation until write-out time. @@ -1450,7 +1451,7 @@ and VFAT filesystems. By default, codepage 437 is used. .BR conv= {b [ inary ]| t [ ext ]| a [ uto ]} The .I fat -file system can perform CRLF<-->NL (MS-DOS text format to UNIX text +filesystem can perform CRLF<-->NL (MS-DOS text format to UNIX text format) conversion in the kernel. The following conversion modes are available: .RS @@ -1473,7 +1474,7 @@ gz, tgz, deb, gif, bmp, tif, gl, jpg, pcx, tfm, vf, gf, pk, pxl, dvi). Programs that do computed lseeks won't like in-kernel text conversion. Several people have had their data ruined by this translation. Beware! -For file systems mounted in binary mode, a conversion tool +For filesystems mounted in binary mode, a conversion tool (fromdos/todos) is available. This option is obsolete. .RE .TP @@ -1490,7 +1491,7 @@ Option passed to the CVF module. This option is obsolete. .B debug Turn on the .I debug -flag. A version string and a list of file system parameters will be +flag. A version string and a list of filesystem parameters will be printed (these data are also printed if the parameters appear to be inconsistent). .TP @@ -1539,7 +1540,7 @@ correct, by this option you can avoid scanning disk. .TP .BR dots ", " nodots ", " dotsOK= [ yes | no ] Various misguided attempts to force Unix or DOS conventions -onto a FAT file system. +onto a FAT filesystem. .SH "Mount options for hfs" .TP @@ -1617,7 +1618,7 @@ block/character devices, etc. Rock Ridge is an extension to iso9660 that provides all of these unix like features. Basically there are extensions to each directory record that supply all of the additional information, and when Rock Ridge is in use, -the filesystem is indistinguishable from a normal UNIX file system (except +the filesystem is indistinguishable from a normal UNIX filesystem (except that it is read-only, of course). .TP .B norock @@ -1640,7 +1641,7 @@ and .BR check=strict .) .TP \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP -Give all files in the file system the indicated user or group id, +Give all files in the filesystem the indicated user or group id, possibly overriding the information found in the Rock Ridge extensions. (Default: .BR uid=0,gid=0 .) @@ -1735,8 +1736,8 @@ option was previously specified in order to restore normal behavior. .TP .BR errors= { continue | remount-ro | panic } Define the behaviour when an error is encountered. -(Either ignore errors and just mark the file system erroneous and continue, -or remount the file system read-only, or panic and halt the system.) +(Either ignore errors and just mark the filesystem erroneous and continue, +or remount the filesystem read-only, or panic and halt the system.) .TP .BR noquota | quota | usrquota | grpquota These options are accepted but ignored. @@ -1748,8 +1749,8 @@ None. See mount options for fat. If the .I msdos -file system detects an inconsistency, it reports an error and sets the file -system read-only. The file system can be made writeable again by remounting +filesystem detects an inconsistency, it reports an error and sets the file +system read-only. The filesystem can be made writeable again by remounting it. .SH "Mount options for ncpfs" @@ -1802,7 +1803,7 @@ starting with ":". Here 2 give a little-endian encoding and 1 a byteswapped bigendian encoding. .TP .B posix=[0|1] -If enabled (posix=1), the file system distinguishes between +If enabled (posix=1), the filesystem distinguishes between upper and lower case. The 8.3 alias names are presented as hard links instead of being suppressed. This option is obsolete. .TP @@ -1825,8 +1826,8 @@ There are no mount options. Reiserfs is a journaling filesystem. .TP .BR conv -Instructs version 3.6 reiserfs software to mount a version 3.5 file system, -using the 3.6 format for newly created objects. This file system will no +Instructs version 3.6 reiserfs software to mount a version 3.5 filesystem, +using the 3.6 format for newly created objects. This filesystem will no longer be compatible with reiserfs 3.5 tools. .TP .BR hash= { rupasov | tea | r5 | detect } @@ -1847,16 +1848,16 @@ This may be used if EHASHCOLLISION errors are experienced with the r5 hash. .TP .B r5 A modified version of the rupasov hash. It is used by default and is -the best choice unless the file system has huge directories and +the best choice unless the filesystem has huge directories and unusual file-name patterns. .TP .B detect Instructs .IR mount to detect which hash function is in use by examining -the file system being mounted, and to write this information into +the filesystem being mounted, and to write this information into the reiserfs superblock. This is only useful on the first mount of -an old format file system. +an old format filesystem. .RE .TP .BR hashed_relocation @@ -1888,7 +1889,7 @@ This option is used to disable packing of files into the tree. .TP .BR replayonly Replay the transactions which are in the journal, but do not actually -mount the file system. Mainly used by +mount the filesystem. Mainly used by .IR reiserfsck . .TP .BI resize= number @@ -2066,7 +2067,7 @@ Override the root directory location. (unused) .SH "Mount options for ufs" .TP .BI ufstype= value -UFS is a file system widely used in different operating systems. +UFS is a filesystem widely used in different operating systems. The problem are differences among implementations. Features of some implementations are undocumented, so its hard to recognize the type of ufs automatically. @@ -2183,12 +2184,12 @@ all upper case. .SH "Mount options for usbfs" .TP \fBdevuid=\fP\fIuid\fP and \fBdevgid=\fP\fIgid\fP and \fBdevmode=\fP\fImode\fP -Set the owner and group and mode of the device files in the usbfs file system +Set the owner and group and mode of the device files in the usbfs filesystem (default: uid=gid=0, mode=0644). The mode is given in octal. .TP \fBbusuid=\fP\fIuid\fP and \fBbusgid=\fP\fIgid\fP and \fBbusmode=\fP\fImode\fP Set the owner and group and mode of the bus directories in the usbfs -file system (default: uid=gid=0, mode=0555). The mode is given in octal. +filesystem (default: uid=gid=0, mode=0555). The mode is given in octal. .TP \fBlistuid=\fP\fIuid\fP and \fBlistgid=\fP\fIgid\fP and \fBlistmode=\fP\fImode\fP Set the owner and group and mode of the file @@ -2338,7 +2339,7 @@ Filesystems mounted must be mounted read-only or the mount will fail. .TP .B nouuid -Don't check for double mounted file systems using the file system uuid. +Don't check for double mounted filesystems using the filesystem uuid. This is useful to mount LVM snapshot volumes. .TP .B osyncisosync @@ -2489,10 +2490,10 @@ standard mount options. .SH FILES .TP 18n .I /etc/fstab -file system table +filesystem table .TP .I /etc/mtab -table of mounted file systems +table of mounted filesystems .TP .I /etc/mtab~ lock file @@ -2519,11 +2520,11 @@ a list of filesystem types to try .BR tune2fs (8), .BR losetup (8) .SH BUGS -It is possible for a corrupted file system to cause a crash. +It is possible for a corrupted filesystem to cause a crash. .PP -Some Linux file systems don't support +Some Linux filesystems don't support .B "\-o sync and \-o dirsync" -(the ext2, ext3, fat and vfat file systems +(the ext2, ext3, fat and vfat filesystems .I do support synchronous updates (a la BSD) when mounted with the .B sync -- cgit v1.2.3 From 57272092d31f7bbd244137afc441d8de0d9ea47a Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Tue, 18 Aug 2009 14:21:33 +0200 Subject: mount: mention mtab for single mount point mount in mount.8 Karel Zak wrote: "This is very old (10+years) feature. The mount(8) is trying to found mountpoint/device in fstab and then in mtab. I guess the original purpose for this feature is user-friendly 'mount /node -o remount'. Unfortunately, the code does not check for MS_REMOUNT flag and consults mtab in all cases. (The code is consulting fstab/mtab before mount options parsing.)" This commit documents this feature. Signed-off-by: Karel Zak --- mount/mount.8 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mount/mount.8 b/mount/mount.8 index a8f64c7b..4e1b572d 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -274,7 +274,9 @@ option will make mount fork, so that the filesystems are mounted simultaneously. .LP When mounting a filesystem mentioned in -.IR fstab , +.IR fstab +or +.IR mtab , it suffices to give only the device, or only the mount point. -- cgit v1.2.3 From 80a1e41be192c55467e7e794a25d5fcc0d270326 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Sun, 23 Aug 2009 20:33:10 +0200 Subject: libblkid: add *.ko.gz support to modules.dep parser Address-Red-Hat-Bug: #518572 Signed-off-by: Karel Zak --- shlibs/blkid/src/probers/ext.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/shlibs/blkid/src/probers/ext.c b/shlibs/blkid/src/probers/ext.c index a4d35d12..c27411d2 100644 --- a/shlibs/blkid/src/probers/ext.c +++ b/shlibs/blkid/src/probers/ext.c @@ -224,8 +224,8 @@ static int check_for_modules(const char *fs_name) #ifdef __linux__ struct utsname uts; FILE *f; - char buf[1024], *cp, *t; - int i; + char buf[1024], *cp; + int namesz; if (uname(&uts)) return 0; @@ -234,6 +234,9 @@ static int check_for_modules(const char *fs_name) f = fopen(buf, "r"); if (!f) return 0; + + namesz = strlen(fs_name); + while (!feof(f)) { if (!fgets(buf, sizeof(buf), f)) break; @@ -244,13 +247,10 @@ static int check_for_modules(const char *fs_name) if ((cp = strrchr(buf, '/')) == NULL) continue; cp++; - i = strlen(cp); - if (i > 3) { - t = cp + i - 3; - if (!strcmp(t, ".ko")) - *t = 0; - } - if (!strcmp(cp, fs_name)) { + + if (!strncmp(cp, fs_name, namesz) && + (!strcmp(cp + namesz, ".ko") || + !strcmp(cp + namesz, ".ko.gz"))) { fclose(f); return 1; } -- cgit v1.2.3 From 6995be9f5a861f5027fe742c9d530eefdd4b0661 Mon Sep 17 00:00:00 2001 From: Florian Zumbiehl Date: Wed, 2 Sep 2009 22:52:55 +0200 Subject: libblkid: fix buffer overflow in blkid_encode_string() [kzak@redhat.com: - this is patch is originally from udev repository commit 8cfcf9980a3a7037a12a3052c38e4981cb0f0190] Signed-off-by: Karel Zak --- shlibs/blkid/src/encode.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/shlibs/blkid/src/encode.c b/shlibs/blkid/src/encode.c index d45a292e..0317be1f 100644 --- a/shlibs/blkid/src/encode.c +++ b/shlibs/blkid/src/encode.c @@ -243,28 +243,35 @@ int blkid_encode_string(const char *str, char *str_enc, size_t len) { size_t i, j; - if (str == NULL || str_enc == NULL || len == 0) + if (str == NULL || str_enc == NULL) return -1; - str_enc[0] = '\0'; for (i = 0, j = 0; str[i] != '\0'; i++) { int seqlen; seqlen = utf8_encoded_valid_unichar(&str[i]); if (seqlen > 1) { + if (len-j < (size_t)seqlen) + goto err; memcpy(&str_enc[j], &str[i], seqlen); j += seqlen; i += (seqlen-1); } else if (str[i] == '\\' || !is_whitelisted(str[i], NULL)) { + if (len-j < 4) + goto err; sprintf(&str_enc[j], "\\x%02x", (unsigned char) str[i]); j += 4; } else { + if (len-j < 1) + goto err; str_enc[j] = str[i]; j++; } if (j+3 >= len) goto err; } + if (len-j < 1) + goto err; str_enc[j] = '\0'; return 0; err: -- cgit v1.2.3 From f800bcf4954bd4eed9e70246e40b7b55c868ffe5 Mon Sep 17 00:00:00 2001 From: Peter De Wachter Date: Sat, 5 Sep 2009 21:19:56 +0200 Subject: mkswap: unbreak -c ("check") option. In the check_blocks() loop, current_page is not incremented. Because of this bug, the loop does not end when the end of the device is reached. Instead it tries to continue reading, which of course fails, and eventually mkswap aborts ("too many bad pages"). Note that this can only be tested with swap partitions, mkswap ignores the -c option for swap files. Signed-off-by: Peter De Wachter --- disk-utils/mkswap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index bb97210e..bdfa8f7a 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -309,9 +309,9 @@ check_blocks(void) { current_page*pagesize) die(_("seek failed in check_blocks")); if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) { - page_bad(current_page++); - continue; + page_bad(current_page); } + current_page++; } if (badpages == 1) printf(_("one bad page\n")); -- cgit v1.2.3 From e4a2b5977a1f8ab4ad9a8f31d81d24d1a6e90c8b Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 7 Sep 2009 08:59:27 +0200 Subject: mkswap: fix memory leaks, cleanup check_blocks() Signed-off-by: Karel Zak --- disk-utils/mkswap.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index bdfa8f7a..9feb2111 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -141,7 +141,7 @@ is_sparc64(void) { */ static int user_pagesize; static int pagesize; -static unsigned long *signature_page; +static unsigned long *signature_page = NULL; struct swap_header_v1 *p; static void @@ -169,6 +169,11 @@ init_signature_page(void) { p = (struct swap_header_v1 *) signature_page; } +static void +deinit_signature_page(void) { + free(signature_page); +} + static void write_signature(char *sig) { char *sp = (char *) signature_page; @@ -303,20 +308,18 @@ check_blocks(void) { die(_("Out of memory")); current_page = 0; while (current_page < PAGES) { - if (!check) - continue; if (do_seek && lseek(DEV,current_page*pagesize,SEEK_SET) != current_page*pagesize) die(_("seek failed in check_blocks")); - if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) { + if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) page_bad(current_page); - } current_page++; } if (badpages == 1) printf(_("one bad page\n")); else if (badpages > 1) printf(_("%lu bad pages\n"), badpages); + free(buffer); } /* return size in pages */ @@ -523,6 +526,7 @@ main(int argc, char ** argv) { #endif init_signature_page(); /* get pagesize */ + atexit(deinit_signature_page); if (!device_name) { fprintf(stderr, -- cgit v1.2.3 From fd0a3ca18bc0ce5dce16a33390126d3a9add06cc Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Mon, 7 Sep 2009 09:36:32 +0200 Subject: po: update ja.po (from translationproject.org) --- po/ja.po | 1436 +++++++++++++++++++++++++++----------------------------------- 1 file changed, 619 insertions(+), 817 deletions(-) diff --git a/po/ja.po b/po/ja.po index 331bf169..c865a478 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,16 +1,16 @@ # Japanese messages for util-linux-ng # Copyright (C) 2001 Free Software Foundation, Inc. # This file is distributed under the same license as the util-linux-ng package. -# Daisuke Yamashita , 1999-2001 # includes cfdisk original translation by # Hidenobu NABETANI -# Makoto Kato , 2009 +# Daisuke Yamashita , 1999-2001. +# Makoto Kato , 2009. msgid "" msgstr "" -"Project-Id-Version: util-linux-ng 2.14.2-rc2\n" +"Project-Id-Version: util-linux-ng 2.16-rc2\n" "Report-Msgid-Bugs-To: Karel Zak \n" -"POT-Creation-Date: 2009-07-15 23:23+0200\n" -"PO-Revision-Date: 2009-01-28 16:54+0900\n" +"POT-Creation-Date: 2009-07-02 14:56+0200\n" +"PO-Revision-Date: 2009-07-20 14:08+0900\n" "Last-Translator: Makoto Kato \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -45,7 +45,7 @@ msgstr "ブロックサイズを設定" #: disk-utils/blockdev.c:43 msgid "get 32-bit sector count" -msgstr "" +msgstr "32-bitセクタカウントを取得する" #: disk-utils/blockdev.c:44 msgid "get size in bytes" @@ -60,14 +60,12 @@ msgid "get readahead" msgstr "readahead 値を取得" #: disk-utils/blockdev.c:47 -#, fuzzy msgid "set filesystem readahead" -msgstr "readahead 値を設定" +msgstr "ファイルシステム readahead 値を設定" #: disk-utils/blockdev.c:48 -#, fuzzy msgid "get filesystem readahead" -msgstr "readahead 値を取得" +msgstr "ファイルシステム readahead 値を取得" #: disk-utils/blockdev.c:49 msgid "flush buffers" @@ -144,17 +142,17 @@ msgstr "使い方:\n" #: disk-utils/elvtune.c:53 #, c-format msgid "\tNOTE: elvtune only works with 2.4 kernels\n" -msgstr "" +msgstr "\tNOTE: elvtuneは2.4カーネルでのみ動作します\n" #: disk-utils/elvtune.c:104 -#, fuzzy, c-format +#, c-format msgid "parse error\n" -msgstr "seek エラーが発生しました" +msgstr "解析エラー\n" #: disk-utils/elvtune.c:110 #, c-format msgid "missing blockdevice, use -h for help\n" -msgstr "" +msgstr "ブロックデバイスが見つかりません。ヘルプを表示するためには、-hを使用してください\n" #: disk-utils/elvtune.c:131 #, c-format @@ -163,6 +161,9 @@ msgid "" "elvtune is only useful on older kernels;\n" "for 2.6 use IO scheduler sysfs tunables instead..\n" msgstr "" +"\n" +"elvtuneは古いカーネル上でのみ有益なものです;\n" +"2.6カーネルでは、替わりにIOスケジューラーのsysfs経由の設定値を使いましょう..\n" #: disk-utils/fdformat.c:31 #, c-format @@ -249,48 +250,47 @@ msgstr "" " file file to test\n" #: disk-utils/fsck.cramfs.c:164 -#, fuzzy, c-format +#, c-format msgid "stat failed: %s" -msgstr "(次のファイル: %s)" +msgstr "stat が失敗: %s" #: disk-utils/fsck.cramfs.c:168 disk-utils/fsck.cramfs.c:552 -#, fuzzy, c-format +#, c-format msgid "open failed: %s" -msgstr "openpty が失敗\n" +msgstr "open が失敗: %s" #: disk-utils/fsck.cramfs.c:173 #, c-format msgid "ioctl failed: unable to determine device size: %s" -msgstr "" +msgstr "ioctl が失敗: デバイスサイズを取得できません: %s" #: disk-utils/fsck.cramfs.c:181 -#, fuzzy, c-format +#, c-format msgid "not a block device or file: %s" -msgstr "%s: ブロックデバイスではありません\n" +msgstr "ブロックデバイスかファイルではありません: %s" #: disk-utils/fsck.cramfs.c:185 disk-utils/fsck.cramfs.c:227 msgid "file length too short" -msgstr "" +msgstr "ファイルの長さが短すぎます" #: disk-utils/fsck.cramfs.c:190 disk-utils/fsck.cramfs.c:198 #: disk-utils/fsck.cramfs.c:259 disk-utils/fsck.cramfs.c:279 -#, fuzzy, c-format +#, c-format msgid "read failed: %s" -msgstr "(次のファイル: %s)" +msgstr "読み込みに失敗しました: %s" #: disk-utils/fsck.cramfs.c:208 msgid "superblock magic not found" -msgstr "" +msgstr "スーパーブロックのマジック値が見つかりません" #: disk-utils/fsck.cramfs.c:217 -#, fuzzy msgid "unsupported filesystem features" -msgstr "ファイルシステムタイプを入力してください: " +msgstr "サポートされないファイルシステムの機能です" #: disk-utils/fsck.cramfs.c:220 -#, fuzzy, c-format +#, c-format msgid "superblock size (%d) too small" -msgstr "ブロックの数が少なすぎます" +msgstr "スーパーブロックのサイズ (%d) が少なすぎます" #: disk-utils/fsck.cramfs.c:224 #, fuzzy @@ -305,11 +305,11 @@ msgstr "警告: パーティション %s はディスクの終りを越えてい #: disk-utils/fsck.cramfs.c:234 #, c-format msgid "warning: old cramfs format\n" -msgstr "" +msgstr "警告: 古いcramfs形式です\n" #: disk-utils/fsck.cramfs.c:247 msgid "unable to test CRC: old cramfs format" -msgstr "" +msgstr "CRCをテストできません: 古いcramfs形式です" #: disk-utils/fsck.cramfs.c:273 disk-utils/fsck.cramfs.c:340 #: disk-utils/fsck.cramfs.c:478 login-utils/chfn.c:529 login-utils/chsh.c:439 @@ -318,14 +318,12 @@ msgid "malloc failed" msgstr "malloc に失敗" #: disk-utils/fsck.cramfs.c:298 -#, fuzzy msgid "crc error" -msgstr ", エラー" +msgstr "crcエラー" #: disk-utils/fsck.cramfs.c:365 -#, fuzzy msgid "root inode is not directory" -msgstr "root inode がディレクトリではありません" +msgstr "root inode がディレクトリではありません " #: disk-utils/fsck.cramfs.c:370 #, c-format @@ -334,7 +332,7 @@ msgstr "" #: disk-utils/fsck.cramfs.c:388 msgid "data block too large" -msgstr "" +msgstr "データブロックが大きすぎます" #: disk-utils/fsck.cramfs.c:392 #, c-format @@ -364,7 +362,7 @@ msgstr "" #: disk-utils/fsck.cramfs.c:440 #, fuzzy, c-format msgid "write failed: %s" -msgstr "(次のファイル: %s)" +msgstr "書き込みに失敗しました: %s" #: disk-utils/fsck.cramfs.c:453 #, fuzzy, c-format @@ -372,9 +370,9 @@ msgid "lchown failed: %s" msgstr "マウントに失敗しました" #: disk-utils/fsck.cramfs.c:459 -#, fuzzy, c-format +#, c-format msgid "chown failed: %s" -msgstr "マウントに失敗しました" +msgstr "chown に失敗しました: %s" #: disk-utils/fsck.cramfs.c:466 #, fuzzy, c-format @@ -387,30 +385,29 @@ msgid "directory inode has zero offset and non-zero size: %s" msgstr "" #: disk-utils/fsck.cramfs.c:495 -#, fuzzy, c-format +#, c-format msgid "mkdir failed: %s" -msgstr "/dev: chdir() が失敗: %m" +msgstr "mkdirが失敗: %s" #: disk-utils/fsck.cramfs.c:512 msgid "filename length is zero" -msgstr "" +msgstr "ファイル名の長さがゼロです" #: disk-utils/fsck.cramfs.c:515 msgid "bad filename length" -msgstr "" +msgstr "悪いファイル名の長さ" #: disk-utils/fsck.cramfs.c:522 -#, fuzzy msgid "bad inode offset" -msgstr "不正な inode サイズ" +msgstr "不正なiノードオフセット" #: disk-utils/fsck.cramfs.c:538 msgid "file inode has zero offset and non-zero size" -msgstr "" +msgstr "ファイルiノードはゼロオフセットかゼロではないサイズを持ちます" #: disk-utils/fsck.cramfs.c:541 msgid "file inode has zero size and non-zero offset" -msgstr "" +msgstr "ファイルiノードはゼロサイズかゼロではないオフセットを持ちます" #: disk-utils/fsck.cramfs.c:572 msgid "symbolic link has zero offset" @@ -418,7 +415,7 @@ msgstr "" #: disk-utils/fsck.cramfs.c:575 msgid "symbolic link has zero size" -msgstr "" +msgstr "シンボリックリンクはサイズがゼロです" #: disk-utils/fsck.cramfs.c:587 #, fuzzy, c-format @@ -426,9 +423,9 @@ msgid "size error in symlink: %s" msgstr "%s への書き込みエラー: %s" #: disk-utils/fsck.cramfs.c:602 -#, fuzzy, c-format +#, c-format msgid "symlink failed: %s" -msgstr "fsync に失敗" +msgstr "symlink が失敗: %s" #: disk-utils/fsck.cramfs.c:614 #, c-format @@ -443,7 +440,7 @@ msgstr "" #: disk-utils/fsck.cramfs.c:632 #, c-format msgid "socket has non-zero size: %s" -msgstr "" +msgstr "ソケットはゼロではないサイズを持ちます: %s" #: disk-utils/fsck.cramfs.c:637 #, c-format @@ -451,9 +448,9 @@ msgid "bogus mode: %s (%o)" msgstr "" #: disk-utils/fsck.cramfs.c:647 -#, fuzzy, c-format +#, c-format msgid "mknod failed: %s" -msgstr "マウントに失敗しました" +msgstr "mknod に失敗しました: %s" #: disk-utils/fsck.cramfs.c:683 #, c-format @@ -466,19 +463,16 @@ msgid "directory data end (%ld) != file data start (%ld)" msgstr "" #: disk-utils/fsck.cramfs.c:691 -#, fuzzy msgid "invalid file data offset" -msgstr "不正な id: %s\n" +msgstr "不正なファイルデータオフセット" #: disk-utils/fsck.cramfs.c:715 -#, fuzzy msgid "failed to allocate outbuffer" -msgstr "バッファの確保ができません。\n" +msgstr "出力バッファの確保に失敗しました" #: disk-utils/fsck.cramfs.c:728 -#, fuzzy msgid "compiled without -x support" -msgstr "mount: -f オプションのサポート無しでコンパイルされています\n" +msgstr "-x サポートなしでコンパイルされています" #: disk-utils/fsck.minix.c:210 #, c-format @@ -551,7 +545,7 @@ msgstr "スーパーブロックを書き込めません" #: disk-utils/fsck.minix.c:559 msgid "Unable to write inode map" -msgstr "inode マップを書き込めません" +msgstr "iノードマップを書き込めません" #: disk-utils/fsck.minix.c:561 msgid "Unable to write zone map" @@ -559,7 +553,7 @@ msgstr "ゾーンマップを書き込めません" #: disk-utils/fsck.minix.c:563 msgid "Unable to write inodes" -msgstr "inode を書き込めません" +msgstr "iノードを書き込めません" #: disk-utils/fsck.minix.c:590 msgid "seek failed" @@ -620,12 +614,12 @@ msgstr "inode を読込めません" #: disk-utils/fsck.minix.c:645 #, c-format msgid "Warning: Firstzone != Norm_firstzone\n" -msgstr "Warning: Firstzone != Norm_firstzone\n" +msgstr "警告: Firstzone != Norm_firstzone\n" #: disk-utils/fsck.minix.c:650 disk-utils/mkfs.minix.c:450 #, c-format msgid "%ld inodes\n" -msgstr "inode 数 %ld\n" +msgstr "iノード数 %ld\n" #: disk-utils/fsck.minix.c:651 disk-utils/mkfs.minix.c:451 #, c-format @@ -664,8 +658,7 @@ msgstr "" #: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:722 #, c-format msgid "Inode %d marked unused, but used for file '%s'\n" -msgstr "" -"Inode %d は不使用マークされていますが、ファイル '%s' が利用しています\n" +msgstr "iノード %d は不使用マークされていますが、ファイル '%s' が利用しています\n" #: disk-utils/fsck.minix.c:675 disk-utils/fsck.minix.c:726 msgid "Mark in use" @@ -824,12 +817,12 @@ msgid "" "%6ld inodes used (%ld%%)\n" msgstr "" "\n" -"%6ld iノードが使われた (%ld%%)\n" +"%6ld iノードが使用中 (%ld%%)\n" #: disk-utils/fsck.minix.c:1378 #, c-format msgid "%6ld zones used (%ld%%)\n" -msgstr "%6ld zone が使われた (%ld%%)\n" +msgstr "%6ld zone が使用中 (%ld%%)\n" #: disk-utils/fsck.minix.c:1380 #, c-format @@ -861,9 +854,9 @@ msgid "" "FILE SYSTEM HAS BEEN CHANGED\n" "----------------------------\n" msgstr "" -"----------------------------------\n" -"*ファイルシステムが変更されました*\n" -"----------------------------------\n" +"--------------------------------\n" +"ファイルシステムが変更されました\n" +"--------------------------------\n" #: disk-utils/isosize.c:129 #, c-format @@ -933,18 +926,18 @@ msgid "cannot get size of %s" msgstr "%s のサイズを取得できません" #: disk-utils/mkfs.bfs.c:188 -#, fuzzy, c-format +#, c-format msgid "blocks argument too large, max is %llu" -msgstr "ブロックの引数が大きすぎます。最大 %lu です" +msgstr "ブロックの引数が大きすぎます。最大 %llu です" #: disk-utils/mkfs.bfs.c:203 msgid "too many inodes - max is 512" -msgstr "i-ノードが多すぎます - 最大 512 です" +msgstr "iノードが多すぎます - 最大 512 です" #: disk-utils/mkfs.bfs.c:212 -#, fuzzy, c-format +#, c-format msgid "not enough space, need at least %llu blocks" -msgstr "領域が不十分です。最低でも %lu ブロック必要です" +msgstr "領域が不十分です。最低でも %llu ブロック必要です" #: disk-utils/mkfs.bfs.c:224 fdisk/fdisk.c:2345 #, c-format @@ -972,14 +965,14 @@ msgid "Inodes: %d (in 1 block)\n" msgstr "I-ノード: %d (1 ブロックあたり)\n" #: disk-utils/mkfs.bfs.c:232 -#, fuzzy, c-format +#, c-format msgid "Inodes: %d (in %lld blocks)\n" -msgstr "I-ノード: %d (%ld ブロックあたり)\n" +msgstr "I-ノード: %d (%lld ブロックあたり)\n" #: disk-utils/mkfs.bfs.c:234 -#, fuzzy, c-format +#, c-format msgid "Blocks: %lld\n" -msgstr "ブロック数: %ld\n" +msgstr "ブロック数: %lld\n" #: disk-utils/mkfs.bfs.c:235 #, c-format @@ -1018,8 +1011,7 @@ msgstr "%s の close でエラーが発生しました" #: disk-utils/mkfs.c:73 #, c-format msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n" -msgstr "" -"使い方: mkfs [-V] [-t ファイルシステム型] [fs オプション] デバイス [サイズ]\n" +msgstr "使い方: mkfs [-V] [-t ファイルシステム型] [fs オプション] デバイス [サイズ]\n" #: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:351 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246 @@ -1033,10 +1025,9 @@ msgid "mkfs (%s)\n" msgstr "mkfs (%s)\n" #: disk-utils/mkfs.cramfs.c:126 -#, fuzzy, c-format +#, c-format msgid "" -"usage: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n " -"name] dirname outfile\n" +"usage: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n name] dirname outfile\n" " -h print this help\n" " -v be verbose\n" " -E make all warnings errors (non-zero exit status)\n" @@ -1051,17 +1042,14 @@ msgid "" " dirname root of the filesystem to be compressed\n" " outfile output file\n" msgstr "" -"使い方: %s [-h] [-v] [-b blksize] [-e edition] [-i file] [-n name] dirname " -"outfile\n" -" -h このヘルプを表示\n" -" -v be verbose\n" +"使い方: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n name] dirname outfile\n" +" -h このヘルプを表示する\n" +" -v 詳細を表示する\n" " -E すべての警告をエラーとする (終了ステータスを 0 以外にする)\n" -" -b blksize 指定したブロックサイズを利用する。\n" -" ページサイズと同じである必要があります\n" +" -b blksize 指定したブロックサイズを利用する。ページサイズと同じである必要があります\n" " -e edition set edition number (part of fsid)\n" -" -i file ファイルシステム内にファイルイメージを挿入する (requires >= " -"2.4.0)\n" -" -n name set name of cramfs filesystem\n" +" -N endian cramfs のエンディアン (big|little|host) を設定する。デフォルトはhost -i file ファイルシステム内にファイルイメージを挿入する (requires >= 2.4.0)\n" +" -n name cramfs ファイルシステムの名前を設定する\n" " -p pad by %d bytes for boot code\n" " -s ディレクトリエントリをソートする (古いオプション。無視されます)\n" " -z make explicit holes (requires >= 2.3.39)\n" @@ -1075,8 +1063,7 @@ msgid "" " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n" msgstr "" "非常に長い (%zu バイト) ファイル名 `%s' が見つかりました。\n" -" mkcramfs.c 内の MAX_INPUT_NAMELEN を増やして再コンパイルしてください。終了し" -"ます。\n" +" mkcramfs.c 内の MAX_INPUT_NAMELEN を増やして再コンパイルしてください。終了します。\n" #: disk-utils/mkfs.cramfs.c:472 #, c-format @@ -1095,9 +1082,7 @@ msgstr "%6.2f%% (%+ld バイト)\t%s\n" #: disk-utils/mkfs.cramfs.c:854 #, c-format -msgid "" -"warning: guestimate of required size (upper bound) is %lldMB, but maximum " -"image size is %uMB. We might die prematurely.\n" +msgid "warning: guestimate of required size (upper bound) is %lldMB, but maximum image size is %uMB. We might die prematurely.\n" msgstr "" #: disk-utils/mkfs.cramfs.c:881 @@ -1105,9 +1090,9 @@ msgid "ROM image map" msgstr "ROM イメージマップ" #: disk-utils/mkfs.cramfs.c:895 -#, fuzzy, c-format +#, c-format msgid "Including: %s\n" -msgstr "不正な id: %s\n" +msgstr "含む: %s\n" #: disk-utils/mkfs.cramfs.c:901 #, c-format @@ -1132,7 +1117,7 @@ msgstr "CRC: %x\n" #: disk-utils/mkfs.cramfs.c:926 #, c-format msgid "not enough space allocated for ROM image (%lld allocated, %zu used)\n" -msgstr "" +msgstr "ROMイメージにおって十分な容量ではありません (%lld 確保、%zu 使用)\n" #: disk-utils/mkfs.cramfs.c:934 msgid "ROM image" @@ -1151,24 +1136,22 @@ msgstr "警告: ファイル名は 255 バイトに切り詰められます。\n #: disk-utils/mkfs.cramfs.c:950 #, c-format msgid "warning: files were skipped due to errors.\n" -msgstr "" +msgstr "警告: ファイルはエラーのためスキップされました。\n" #: disk-utils/mkfs.cramfs.c:953 #, c-format msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n" -msgstr "" +msgstr "警告: ファイルサイズは%luMBに切り詰められました (最小1バイト)。\n" #: disk-utils/mkfs.cramfs.c:958 #, c-format -msgid "" -"warning: uids truncated to %u bits. (This may be a security concern.)\n" -msgstr "" +msgid "warning: uids truncated to %u bits. (This may be a security concern.)\n" +msgstr "警告: uidは%uビットへ切り詰められました。 (セキュリティ上の懸念事項になるかもしれません。)\n" #: disk-utils/mkfs.cramfs.c:963 #, c-format -msgid "" -"warning: gids truncated to %u bits. (This may be a security concern.)\n" -msgstr "" +msgid "warning: gids truncated to %u bits. (This may be a security concern.)\n" +msgstr "警告: gidは%uビットへ切り詰められました。 (セキュリティ上の懸念事項になるかもしれません。)\n" #: disk-utils/mkfs.cramfs.c:968 #, c-format @@ -1298,17 +1281,17 @@ msgid "unable to open %s" msgstr "%s を開けません" #: disk-utils/mkfs.minix.c:649 -#, fuzzy, c-format +#, c-format msgid "cannot determine sector size for %s" -msgstr "%s のサイズを取得できません" +msgstr "%s のセクタサイズを取得できません" #: disk-utils/mkfs.minix.c:651 #, c-format msgid "block size smaller than physical sector size of %s" -msgstr "" +msgstr "ブロックサイズが %s の物理セクタサイズよりも小さい" #: disk-utils/mkfs.minix.c:654 -#, fuzzy, c-format +#, c-format msgid "cannot determine size of %s" msgstr "%s のサイズを取得できません" @@ -1327,35 +1310,34 @@ msgid "Bad user-specified page size %d\n" msgstr "不正なユーザ指定ページサイズ %d\n" #: disk-utils/mkswap.c:163 -#, fuzzy, c-format +#, c-format msgid "Using user-specified page size %d, instead of the system value %d\n" -msgstr "" -"システムのページサイズ値 %2$d/%3$d の代わりに、ユーザ指定値 %1$d を使います\n" +msgstr "システムのページサイズ値 %2$d の代わりに、ユーザ指定値 %1$d を使います\n" #: disk-utils/mkswap.c:187 #, c-format msgid "Bad swap header size, no label written.\n" -msgstr "" +msgstr "スワップヘッダサイズが正しくないため、ラベルは書き込まれません。\n" #: disk-utils/mkswap.c:197 #, c-format msgid "Label was truncated.\n" -msgstr "" +msgstr "ラベルは切り詰められました。\n" #: disk-utils/mkswap.c:203 -#, fuzzy, c-format +#, c-format msgid "no label, " -msgstr "ラベル" +msgstr "ラベルはありません, " #: disk-utils/mkswap.c:211 #, c-format msgid "no uuid\n" -msgstr "" +msgstr "uuidがありません\n" #: disk-utils/mkswap.c:276 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n" -msgstr "使い方: %s [-c] [-v0|-v1] [-pページサイズ] /dev/name [ブロック数]\n" +msgstr "使い方: %s [-c] [-pページサイズ] [-L ラベル] [-U UUID] /dev/name [ブロック数]\n" #: disk-utils/mkswap.c:290 msgid "too many bad pages" @@ -1391,9 +1373,9 @@ msgid "%s: %s: warning: don't erase bootbits sectors\n" msgstr "" #: disk-utils/mkswap.c:423 -#, fuzzy, c-format +#, c-format msgid " (%s partition table detected). " -msgstr " p BSD 領域テーブルを表示する" +msgstr " (%s パーティションテーブルを認識しました)。" #: disk-utils/mkswap.c:425 #, fuzzy, c-format @@ -1403,12 +1385,12 @@ msgstr " s 完全なディスクラベルを表示する" #: disk-utils/mkswap.c:495 #, c-format msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n" -msgstr "" +msgstr "%1$s: 警告: -U を無視します (UUIDsは%1$sによってサポートされません)\n" #: disk-utils/mkswap.c:511 -#, fuzzy, c-format +#, c-format msgid "%s: does not support swapspace version %d.\n" -msgstr "%s: エラー: 不明なバージョン %d\n" +msgstr "%s: スワップ空間のバージョン %d はサポートされていません。\n" #: disk-utils/mkswap.c:519 msgid "error: UUID parsing failed" @@ -1420,10 +1402,9 @@ msgid "%s: error: Nowhere to set up swap on?\n" msgstr "%s: エラー: スワップを有効にするための場所がない？\n" #: disk-utils/mkswap.c:547 -#, fuzzy, c-format +#, c-format msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n" -msgstr "" -"%s: エラー: サイズ %lu KiB がデバイスのサイズ %lu KiB よりも大きいです\n" +msgstr "%s: エラー: サイズ %llu KiB がデバイスのサイズ %llu KiB よりも大きいです\n" #: disk-utils/mkswap.c:556 #, c-format @@ -1431,28 +1412,28 @@ msgid "%s: error: swap area needs to be at least %ld KiB\n" msgstr "%s: エラー: スワップ領域は少なくとも %ld KiB 必要です\n" #: disk-utils/mkswap.c:573 -#, fuzzy, c-format +#, c-format msgid "%s: warning: truncating swap area to %llu KiB\n" -msgstr "%s: 警告: スワップ領域を %ld KiB に切り詰めました\n" +msgstr "%s: 警告: スワップ領域を %llu KiB に切り詰めました\n" #: disk-utils/mkswap.c:596 -#, fuzzy, c-format +#, c-format msgid "%s: error: will not try to make swapdevice on '%s'\n" -msgstr "'%s' にはスワップデヴァイスを作らないようにします" +msgstr "'%s: '%s' にはスワップデバイスを作らないようにします\n" #: disk-utils/mkswap.c:602 -#, fuzzy, c-format +#, c-format msgid "%s: error: %s is mounted; will not make swapspace.\n" -msgstr "%s はマウントされています -- ここにはファイルシステムをつくれません！" +msgstr "%s: %s はマウントされています; ここにはスワップ空間をつくれません。\n" #: disk-utils/mkswap.c:618 msgid "Unable to set up swap-space: unreadable" msgstr "スワップ空間を設定できません: 読込めません" #: disk-utils/mkswap.c:621 -#, fuzzy, c-format +#, c-format msgid "Setting up swapspace version 1, size = %llu KiB\n" -msgstr "スワップ空間バージョン %d を設定します、サイズ = %llu KiB\n" +msgstr "スワップ空間バージョン1を設定します、サイズ = %llu KiB\n" #: disk-utils/mkswap.c:632 #, c-format @@ -1466,7 +1447,7 @@ msgstr "fsync に失敗" #: disk-utils/mkswap.c:654 #, c-format msgid "%s: %s: unable to obtain selinux file label: %s\n" -msgstr "" +msgstr "%s: %s: selinuxのファイルラベルを含むことができません: %s\n" #: disk-utils/mkswap.c:660 #, fuzzy @@ -1487,47 +1468,48 @@ msgid "%s: unable to relabel %s to %s: %s\n" msgstr "%s: %s の名前を %s に変更できません: %s\n" #: disk-utils/raw.c:50 -#, fuzzy, c-format +#, c-format msgid "" "Usage:\n" " %s " -msgstr "使い方:\n" +msgstr "" +"使い方:\n" +" %s" #: disk-utils/raw.c:125 #, c-format -msgid "" -"Device '%s' is control raw dev (use raw where is greater than zero)\n" +msgid "Device '%s' is control raw dev (use raw where is greater than zero)\n" msgstr "" #: disk-utils/raw.c:145 -#, fuzzy, c-format +#, c-format msgid "Cannot locate block device '%s' (%s)\n" -msgstr "ロックファイル %s をロックできません: %s\n" +msgstr "ブロックファイル '%s' (%s) を配置できません\n" #: disk-utils/raw.c:151 -#, fuzzy, c-format +#, c-format msgid "Device '%s' is not a block dev\n" -msgstr "警告: %s はブロックデバイスではありません\n" +msgstr "警告: '%s' はブロックデバイスではありません\n" #: disk-utils/raw.c:186 #, fuzzy, c-format msgid "Cannot open master raw device '" -msgstr "デバイス %s を stat できません" +msgstr "マスターロウデバイスを開くことができません" #: disk-utils/raw.c:205 -#, fuzzy, c-format +#, c-format msgid "Cannot locate raw device '%s' (%s)\n" -msgstr "デバイス %s を stat できません" +msgstr "ロウデバイス '%s' (%s) を配置できません\n" #: disk-utils/raw.c:211 -#, fuzzy, c-format +#, c-format msgid "Raw device '%s' is not a character dev\n" -msgstr "/dev/%s: キャラクタデバイスではありません" +msgstr "ロウデバイス '%s' はキャラクタデバイスではありません\n" #: disk-utils/raw.c:216 -#, fuzzy, c-format +#, c-format msgid "Device '%s' is not a raw dev\n" -msgstr "%s はブロックスペシャルデバイスではありません" +msgstr "デバイス '%s' はロウデバイスではありません\n" #: disk-utils/raw.c:231 #, c-format @@ -1668,16 +1650,12 @@ msgid "enlarged logical partitions overlap" msgstr "拡大された論理領域が重複しています" #: fdisk/cfdisk.c:999 -msgid "" -"!!!! Internal error creating logical drive with no extended partition !!!!" -msgstr "" -"!!!! 内部エラー。拡張領域以外に論理ドライブを作成しようとしています !!!!" +msgid "!!!! Internal error creating logical drive with no extended partition !!!!" +msgstr "!!!! 内部エラー。拡張領域以外に論理ドライブを作成しようとしています !!!!" #: fdisk/cfdisk.c:1010 fdisk/cfdisk.c:1022 -msgid "" -"Cannot create logical drive here -- would create two extended partitions" -msgstr "" -"ここには論理ドライブを作成できません -- 2 つの拡張領域であれば作成します" +msgid "Cannot create logical drive here -- would create two extended partitions" +msgstr "ここには論理ドライブを作成できません -- 2 つの拡張領域であれば作成します" #: fdisk/cfdisk.c:1164 msgid "Menu item too long. Menu may look odd." @@ -1783,11 +1761,8 @@ msgid "Opened disk read-only - you have no permission to write" msgstr "ディスクを読込み専用で開きました -- あなたには書込み権限がありません" #: fdisk/cfdisk.c:1682 -msgid "" -"Warning!! Unsupported GPT (GUID Partition Table) detected. Use GNU Parted." -msgstr "" -"警告!! サポートしていない GPT (GUID パーティションテーブル) を検出しました。" -"GNU Parded を使ってください" +msgid "Warning!! Unsupported GPT (GUID Partition Table) detected. Use GNU Parted." +msgstr "警告!! サポートしていない GPT (GUID パーティションテーブル) を検出しました。GNU Parded を使ってください" #: fdisk/cfdisk.c:1701 msgid "Cannot get disk size" @@ -1806,10 +1781,8 @@ msgid "Warning!! This may destroy data on your disk!" msgstr "警告！ これはあなたのディスクにあるデータを破壊するかもしれません" #: fdisk/cfdisk.c:1876 -msgid "" -"Are you sure you want to write the partition table to disk? (yes or no): " -msgstr "" -"パーティション領域をディスクに書き込んでもよろしいですか？(yes または no): " +msgid "Are you sure you want to write the partition table to disk? (yes or no): " +msgstr "パーティション領域をディスクに書き込んでもよろしいですか？(yes または no): " #: fdisk/cfdisk.c:1882 msgid "no" @@ -1837,23 +1810,16 @@ msgstr "領域テーブルをディスクに書き込みました" #: fdisk/cfdisk.c:1923 #, fuzzy -msgid "" -"Wrote partition table, but re-read table failed. Run partprobe(8), kpartx" -"(8) or reboot to update table." -msgstr "" -"領域テーブルを書き込みましたが、再読込みに失敗。再起動して更新してください" +msgid "Wrote partition table, but re-read table failed. Run partprobe(8), kpartx(8) or reboot to update table." +msgstr "領域テーブルを書き込みましたが、再読込みに失敗。再起動して更新してください" #: fdisk/cfdisk.c:1933 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this." -msgstr "" -"ブート可能マーク付き基本領域がありません。DOS MBR はこれをブートできません。" +msgstr "ブート可能マーク付き基本領域がありません。DOS MBR はこれをブートできません。" #: fdisk/cfdisk.c:1935 -msgid "" -"More than one primary partition is marked bootable. DOS MBR cannot boot this." -msgstr "" -"ブート可能マーク付き基本領域が複数あります。DOS MBR はこれをブートできませ" -"ん。" +msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this." +msgstr "ブート可能マーク付き基本領域が複数あります。DOS MBR はこれをブートできません。" #: fdisk/cfdisk.c:1993 fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196 msgid "Enter filename or press RETURN to display on screen: " @@ -1909,9 +1875,8 @@ msgid "(%02X)" msgstr "(%02X)" #: fdisk/cfdisk.c:2096 -#, fuzzy msgid "None" -msgstr "終了" +msgstr "None" #: fdisk/cfdisk.c:2131 fdisk/cfdisk.c:2215 #, c-format @@ -1923,20 +1888,12 @@ msgid " First Last\n" msgstr " 最初の 最後の\n" #: fdisk/cfdisk.c:2134 -msgid "" -" # Type Sector Sector Offset Length Filesystem Type (ID) " -"Flag\n" -msgstr "" -" # 領域 セクタ セクタ オフセット 大きさ Filesystemタイプ(ID) フ" -"ラグ\n" +msgid " # Type Sector Sector Offset Length Filesystem Type (ID) Flag\n" +msgstr " # 領域 セクタ セクタ オフセット 大きさ Filesystemタイプ(ID) フラグ\n" #: fdisk/cfdisk.c:2135 -msgid "" -"-- ------- ----------- ----------- ------ ----------- -------------------- " -"----\n" -msgstr "" -"-- ------- ----------- ----------- ------ ----------- -------------------- " -"----\n" +msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n" +msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n" #: fdisk/cfdisk.c:2218 msgid " ---Starting---- ----Ending----- Start Number of\n" @@ -1948,8 +1905,7 @@ msgstr " # Flags Head Sect Cyl ID Head Sect Cyl セクタ番号 セクタ #: fdisk/cfdisk.c:2220 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n" -msgstr "" -"-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n" +msgstr "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n" #: fdisk/cfdisk.c:2253 msgid "Raw" @@ -2715,8 +2671,7 @@ msgstr "セクタ/シリンダ" #: fdisk/fdiskbsdlabel.c:481 #, c-format msgid "Must be <= sectors/track * tracks/cylinder (default).\n" -msgstr "" -"デフォルトで sectors/track * tracks/cylinder 以下でなければならない。\n" +msgstr "デフォルトで sectors/track * tracks/cylinder 以下でなければならない。\n" #: fdisk/fdiskbsdlabel.c:483 msgid "rpm" @@ -2784,7 +2739,7 @@ msgid "" "Syncing disks.\n" msgstr "" "\n" -"ディスクと同期させます。\n" +"ディスクと同期しています。\n" #: fdisk/fdisk.c:244 msgid "" @@ -2830,7 +2785,7 @@ msgstr "%s を開けません\n" #: fdisk/fdisk.c:269 #, c-format msgid "Unable to read %s\n" -msgstr "%s を読めません\n" +msgstr "%s を読むことができません\n" #: fdisk/fdisk.c:273 #, c-format @@ -3070,31 +3025,31 @@ msgid "Warning: ignoring extra data in partition table %d\n" msgstr "警告: 領域テーブル %d 内の特別なデータを無視します\n" #: fdisk/fdisk.c:782 -#, fuzzy, c-format +#, c-format msgid "omitting empty partition (%d)\n" -msgstr "警告: 空のパーティション\n" +msgstr "空のパーティション (%d) を省略しています\n" #: fdisk/fdisk.c:801 #, c-format msgid "Disk identifier: 0x%08x\n" -msgstr "" +msgstr "ディスク識別子: 0x%08x\n" #: fdisk/fdisk.c:810 #, c-format msgid "New disk identifier (current 0x%08x): " -msgstr "" +msgstr "新しいディスク識別子 (現在 0x%08x): " #: fdisk/fdisk.c:829 -#, fuzzy, c-format +#, c-format msgid "" "Building a new DOS disklabel with disk identifier 0x%08x.\n" "Changes will remain in memory only, until you decide to write them.\n" "After that, of course, the previous content won't be recoverable.\n" "\n" msgstr "" -"新たに DOS ディスクラベルを作成します。あなたが書き込みを決定するまで、変更" -"は\n" -"メモリ内だけに残します。その後はもちろん以前の内容は修復不可能になります。\n" +"新たに DOS ディスクラベルをディスク識別子 0x%08x で作成します。\n" +"あなたが書き込みを決定するまで、変更はメモリ内だけに残します。\n" +"その後はもちろん以前の内容は修復不可能になります。\n" #: fdisk/fdisk.c:861 #, c-format @@ -3115,9 +3070,7 @@ msgstr "" #: fdisk/fdisk.c:1032 #, c-format -msgid "" -"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF " -"disklabel\n" +msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n" msgstr "" "デバイスは正常な DOS 領域テーブルも、Sun, SGI や OSF ディスクラベルも\n" "含んでいません\n" @@ -3134,9 +3087,7 @@ msgstr "特別な拡張領域 %d を無視します\n" #: fdisk/fdisk.c:1074 #, c-format -msgid "" -"Warning: invalid flag 0x%04x of partition table %d will be corrected by w" -"(rite)\n" +msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n" msgstr "" "警告: 領域テーブル %2$d の不正なフラグ 0x%1$04x は w(書き込み)によって\n" "正常になります\n" @@ -3170,6 +3121,8 @@ msgid "" "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n" " 2^N: K (KibiByte), M (MebiByte), G (GibiByte)\n" msgstr "" +"サポート: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n" +" 2^N: K (KibiByte), M (MebiByte), G (GibiByte)\n" #: fdisk/fdisk.c:1269 #, c-format @@ -3389,7 +3342,7 @@ msgstr "" #: fdisk/fdisk.c:1826 #, c-format msgid "%*s Boot Start End Blocks Id System\n" -msgstr "%*s ブート 始点 終点 ブロック Id システム\n" +msgstr "%*s ブート 始点 終点 ブロック Id システム\n" #: fdisk/fdisk.c:1827 fdisk/fdisksgilabel.c:223 fdisk/fdisksunlabel.c:603 msgid "Device" @@ -3466,14 +3419,14 @@ msgid "Logical partition %d not entirely in partition %d\n" msgstr "論理領域 %d は領域 %d 全体になっていません\n" #: fdisk/fdisk.c:2007 -#, fuzzy, c-format +#, c-format msgid "Total allocated sectors %llu greater than the maximum %llu\n" -msgstr "合計確保セクタ %ld は最大値 %lld よりも大きいです\n" +msgstr "合計確保セクタ %llu は最大値 %llu よりも大きいです\n" #: fdisk/fdisk.c:2010 -#, fuzzy, c-format +#, c-format msgid "%lld unallocated %d-byte sectors\n" -msgstr "確保されていないセクタが %lld あります\n" +msgstr "%lld 未確保 %d バイトセクタ\n" #: fdisk/fdisk.c:2025 fdisk/fdisksgilabel.c:633 fdisk/fdisksunlabel.c:416 #, c-format @@ -3493,7 +3446,7 @@ msgstr "利用可能フリーセクタがありません\n" #: fdisk/fdisk.c:2112 #, c-format msgid "Last %1$s, +%2$s or +size{K,M,G}" -msgstr "" +msgstr "Last %1$s, +%2$s or +size{K,M,G}" #: fdisk/fdisk.c:2178 #, c-format @@ -3558,7 +3511,7 @@ msgstr "e 拡張" #: fdisk/fdisk.c:2237 #, c-format msgid "Invalid partition number for type `%c'\n" -msgstr "タイプ `%c' にとっては不正な領域番号です\n" +msgstr "タイプ `%c' にとっては不正なパーティション番号です\n" #: fdisk/fdisk.c:2273 #, c-format @@ -3566,16 +3519,16 @@ msgid "" "The partition table has been altered!\n" "\n" msgstr "" -"領域テーブルは交換されました！\n" +"パーティションテーブルは変更されました！\n" "\n" #: fdisk/fdisk.c:2287 #, c-format msgid "Calling ioctl() to re-read partition table.\n" -msgstr "ioctl() を呼び出して領域テーブルを再読込みします。\n" +msgstr "ioctl() を呼び出してパーティションテーブルを再読込みします。\n" #: fdisk/fdisk.c:2296 -#, fuzzy, c-format +#, c-format msgid "" "\n" "WARNING: Re-reading the partition table failed with error %d: %s.\n" @@ -3583,9 +3536,10 @@ msgid "" "the next reboot or after you run partprobe(8) or kpartx(8)\n" msgstr "" "\n" -"警告: 領域テーブルの再読込みがエラー %d で失敗しました: %s。\n" -"カーネルはまだ古いテーブルを使っています。\n" -"新しいテーブルは次回リブート時に使えるようになるでしょう。\n" +"警告: パーティションテーブルの再読込みがエラー %d で失敗しました: %s。\n" +"カーネルはまだ古いテーブルを使っています。新しいテーブルは\n" +"次回リブート時か、partprobe(8)またはkpartx(8)を実行した後に\n" +"使えるようになるでしょう\n" #: fdisk/fdisk.c:2304 #, c-format @@ -3600,21 +3554,23 @@ msgstr "" "fdisk マニュアルの追加情報ページを参照してください。\n" #: fdisk/fdisk.c:2310 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Error closing file\n" -msgstr "%s のクローズエラー\n" +msgstr "" +"\n" +"ファイルクローズ中にエラー\n" #: fdisk/fdisk.c:2314 #, c-format msgid "Syncing disks.\n" -msgstr "ディスクを同期させます。\n" +msgstr "ディスクを同期しています。\n" #: fdisk/fdisk.c:2361 #, c-format msgid "Partition %d has no data area\n" -msgstr "領域 %d にデータ領域がありません\n" +msgstr "パーティション %d にはデータ領域がありません\n" #: fdisk/fdisk.c:2366 msgid "New beginning of data" @@ -3645,19 +3601,17 @@ msgstr "警告: DOS 互換のためのセクタオフセットを設定します #, c-format msgid "" "\n" -"WARNING: GPT (GUID Partition Table) detected on '%s'! The util fdisk doesn't " -"support GPT. Use GNU Parted.\n" +"WARNING: GPT (GUID Partition Table) detected on '%s'! The util fdisk doesn't support GPT. Use GNU Parted.\n" "\n" msgstr "" "\n" -"警告: GPT (GUID パーティションテーブル) が '%s' に検出されました! この fdisk " -"ユーティリティは GPT をサポートしません。GNU Parted を使ってください。\n" +"警告: GPT (GUID パーティションテーブル) が '%s' に検出されました! この fdisk ユーティリティは GPT をサポートしません。GNU Parted を使ってください。\n" "\n" #: fdisk/fdisk.c:2533 #, c-format msgid "Disk %s doesn't contain a valid partition table\n" -msgstr "ディスク %s は正常な領域テーブルを含んでいません\n" +msgstr "ディスク %s は正常なパーティションテーブルを含んでいません\n" #: fdisk/fdisk.c:2544 #, c-format @@ -3677,14 +3631,11 @@ msgstr "%c: 不明なコマンド\n" #: fdisk/fdisk.c:2653 #, c-format msgid "This kernel finds the sector size itself - -b option ignored\n" -msgstr "" -"このカーネルはセクタサイズを自分認識します -- -b オプションは無視します\n" +msgstr "このカーネルはセクタサイズを自分認識します - -b オプションは無視します\n" #: fdisk/fdisk.c:2657 #, c-format -msgid "" -"Warning: the -b (set sector size) option should be used with one specified " -"device\n" +msgid "Warning: the -b (set sector size) option should be used with one specified device\n" msgstr "" "警告: -b (セクタサイズ設定) オプションは 1 つのデバイス指定と共に\n" "使用されるべきです\n" @@ -3692,8 +3643,7 @@ msgstr "" #: fdisk/fdisk.c:2717 #, c-format msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n" -msgstr "" -"%s でOSF/1 ディスクラベルを検出したので、ディスクラベルモードに移行します。\n" +msgstr "%s でOSF/1 ディスクラベルを検出したので、ディスクラベルモードに移行します。\n" #: fdisk/fdisk.c:2727 msgid "Command (m for help): " @@ -3725,8 +3675,8 @@ msgid "" "\n" msgstr "" "\n" -"\t残念ながら SGI 領域テーブル用のエキスパートメニューは\n" -"\t用意されていません。\n" +"\t残念ながら SGI パーティションテーブル用のエキスパートメニューは用意されていません。\n" +"\n" #: fdisk/fdiskmaclabel.c:30 msgid "" @@ -3824,9 +3774,7 @@ msgstr "Linux RAID" #: fdisk/fdisksgilabel.c:164 #, c-format -msgid "" -"According to MIPS Computer Systems, Inc the Label must not contain more than " -"512 bytes\n" +msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n" msgstr "" "MIPS Computer Systems, Inc によると、そのラベルは 512 バイト以上でなければ\n" "なりません\n" @@ -3952,7 +3900,7 @@ msgstr "複数の entire disk の項目があります。\n" #: fdisk/fdisksgilabel.c:446 fdisk/fdisksunlabel.c:388 #, c-format msgid "No partitions defined\n" -msgstr "領域が定義されていません\n" +msgstr "パーティションが定義されていません\n" #: fdisk/fdisksgilabel.c:452 #, c-format @@ -4111,15 +4059,14 @@ msgstr "" #: fdisk/fdisksgilabel.c:731 fdisk/fdisksunlabel.c:227 #, c-format msgid "" -"Warning: BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %" -"d.\n" +"Warning: BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %d.\n" "This value may be truncated for devices > 33.8 GB.\n" msgstr "" #: fdisk/fdisksgilabel.c:745 #, c-format msgid "Trying to keep parameters of partition %d.\n" -msgstr "領域 %d の値の保存を試みます。\n" +msgstr "パーティション %d の値の保存を試みます。\n" #: fdisk/fdisksgilabel.c:747 #, c-format @@ -4188,9 +4135,9 @@ msgstr "" "あるいは fresh label を強制してください (メインメニューの s コマンド)\n" #: fdisk/fdisksunlabel.c:153 -#, fuzzy, c-format +#, c-format msgid "Detected sun disklabel with wrong version [0x%08x].\n" -msgstr "間違ったチェックサム値の sgi ディスクラベルを検出しました。\n" +msgstr "間違ったバージョン [0x%08x] の sun ディスクラベルを検出しました。\n" #: fdisk/fdisksunlabel.c:158 #, fuzzy, c-format @@ -4198,14 +4145,13 @@ msgid "Detected sun disklabel with wrong sanity [0x%08x].\n" msgstr "間違ったチェックサム値の sgi ディスクラベルを検出しました。\n" #: fdisk/fdisksunlabel.c:163 -#, fuzzy, c-format +#, c-format msgid "Detected sun disklabel with wrong num_partitions [%u].\n" -msgstr "間違ったチェックサム値の sgi ディスクラベルを検出しました。\n" +msgstr "間違った num_partitions [%u] の sun ディスクラベルを検出しました。\n" #: fdisk/fdisksunlabel.c:168 #, fuzzy, c-format -msgid "" -"Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n" +msgid "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n" msgstr "" "警告: 領域テーブル %2$d の不正なフラグ 0x%1$04x は w(書き込み)によって\n" "正常になります\n" @@ -4340,7 +4286,7 @@ msgstr "" #: fdisk/fdisksunlabel.c:602 #, c-format msgid "%*s Flag Start End Blocks Id System\n" -msgstr "%*s フラグ 始点 終点 ブロック Id システム\n" +msgstr "%*s フラグ 始点 終点 ブロック Id システム\n" #: fdisk/fdisksunlabel.c:630 msgid "Number of alternate cylinders" @@ -4624,9 +4570,8 @@ msgid "Darwin boot" msgstr "Darwin ブート" #: fdisk/i386_sys_types.c:74 -#, fuzzy msgid "HFS / HFS+" -msgstr "OS/2 HPFS" +msgstr "HFS / HFS+" #: fdisk/i386_sys_types.c:75 msgid "BSDI fs" @@ -4770,8 +4715,7 @@ msgstr "パーティション復元ファイル (%s) の情報を取得できま #: fdisk/sfdisk.c:355 msgid "partition restore file has wrong size - not restoring\n" -msgstr "" -"パーティション復元ファイルのサイズが間違っています -- 復元を行ないません\n" +msgstr "パーティション復元ファイルのサイズが間違っています -- 復元を行ないません\n" #: fdisk/sfdisk.c:359 msgid "out of memory?\n" @@ -4814,8 +4758,7 @@ msgid "" "the entire disk. Using fdisk on it is probably meaningless.\n" "[Use the --force option if you really want this]\n" msgstr "" -"警告: start=%lu -- この値はパーティションではなくディスクそのもののようで" -"す。\n" +"警告: start=%lu -- この値はパーティションではなくディスクそのもののようです。\n" "ここに fdisk を利用するのは多分意味がないことです。\n" "[本当にこれを行ないたければ、--force オプションを使ってください]\n" @@ -4855,29 +4798,18 @@ msgstr "" #: fdisk/sfdisk.c:610 #, c-format -msgid "" -"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n" -msgstr "" -"パーティション %2$s のヘッド数として %1$s は不可能です: %3$lu (0-%4$lu にして" -"ください)\n" +msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n" +msgstr "パーティション %2$s のヘッド数として %1$s は不可能です: %3$lu (0-%4$lu にしてください)\n" #: fdisk/sfdisk.c:615 #, c-format -msgid "" -"%s of partition %s has impossible value for sector: %lu (should be in 1-%" -"lu)\n" -msgstr "" -"パーティション %2$s のセクタ数として %1$s は不可能です: %3$lu (1-%4$lu にして" -"ください)\n" +msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n" +msgstr "パーティション %2$s のセクタ数として %1$s は不可能です: %3$lu (1-%4$lu にしてください)\n" #: fdisk/sfdisk.c:620 #, c-format -msgid "" -"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%" -"lu)\n" -msgstr "" -"パーティション %2$s のシリンダ数として %1$s は不可能です: %3$lu (0-%4$lu にし" -"てください)\n" +msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n" +msgstr "パーティション %2$s のシリンダ数として %1$s は不可能です: %3$lu (0-%4$lu にしてください)\n" #: fdisk/sfdisk.c:660 #, c-format @@ -4894,14 +4826,14 @@ msgid "Re-reading the partition table ...\n" msgstr "パーティションテーブルを再読み込み中...\n" #: fdisk/sfdisk.c:827 -#, fuzzy msgid "" "The command to re-read the partition table failed.\n" "Run partprobe(8), kpartx(8) or reboot your system now,\n" "before using mkfs\n" msgstr "" -"パーティション再読込みコマンドが失敗しました\n" -"mkfs を使う前に、システムを再起動してください\n" +"パーティションテーブルを再読込みするコマンドが失敗しました。\n" +"mkfs を使う前に、partprobe(8) か kpartx(8) を実行するか、\n" +"システムを再起動してください\n" #: fdisk/sfdisk.c:833 #, c-format @@ -4946,9 +4878,9 @@ msgstr "" "\n" #: fdisk/sfdisk.c:951 -#, fuzzy, c-format +#, c-format msgid " Device Boot Start End #cyls #blocks Id System\n" -msgstr "デバイス ブート 始点 終点 #シリンダ #ブロック ID システム\n" +msgstr "デバイス ブート 始点 終点 #シリンダ #ブロック Id システム\n" #: fdisk/sfdisk.c:956 #, c-format @@ -4960,9 +4892,9 @@ msgstr "" "\n" #: fdisk/sfdisk.c:958 -#, fuzzy, c-format +#, c-format msgid " Device Boot Start End #sectors Id System\n" -msgstr " デバイス ブート 始点 終点 #セクタ ID システム\n" +msgstr "デバイス ブート 始点 終点 #セクタ Id システム\n" #: fdisk/sfdisk.c:961 #, c-format @@ -4974,7 +4906,7 @@ msgstr "" "\n" #: fdisk/sfdisk.c:963 -#, fuzzy, c-format +#, c-format msgid " Device Boot Start End #blocks Id System\n" msgstr " デバイス ブート 始点 終点 #ブロック ID システム\n" @@ -4988,9 +4920,9 @@ msgstr "" "\n" #: fdisk/sfdisk.c:968 -#, fuzzy, c-format +#, c-format msgid " Device Boot Start End MiB #blocks Id System\n" -msgstr "デバイス ブート 始点 終点 MB #ブロック ID システム\n" +msgstr "デバイス ブート 始点 終点 MiB #ブロック Id システム\n" #: fdisk/sfdisk.c:1062 #, c-format @@ -5049,8 +4981,7 @@ msgstr "変です、%d つのパーティションしか定義されていませ #: fdisk/sfdisk.c:1212 #, c-format msgid "Warning: partition %s has size 0 but is not marked Empty\n" -msgstr "" -"警告: パーティション %s はサイズ 0 ですが、空としてマークされていません\n" +msgstr "警告: パーティション %s はサイズ 0 ですが、空としてマークされていません\n" #: fdisk/sfdisk.c:1215 #, c-format @@ -5151,10 +5082,8 @@ msgstr "開始" #: fdisk/sfdisk.c:1356 #, c-format -msgid "" -"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n" -msgstr "" -"パーティション %s: 始点: (c,h,s) 期待値 (%ld,%ld,%ld) (%ld,%ld,%ld) を発見\n" +msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n" +msgstr "パーティション %s: 始点: (c,h,s) 期待値 (%ld,%ld,%ld) (%ld,%ld,%ld) を発見\n" #: fdisk/sfdisk.c:1362 msgid "end" @@ -5163,15 +5092,12 @@ msgstr "終了" #: fdisk/sfdisk.c:1365 #, c-format msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n" -msgstr "" -"パーティション %s: 終点: (c,h,s) 期待値 (%ld,%ld,%ld) (%ld,%ld,%ld) を発見\n" +msgstr "パーティション %s: 終点: (c,h,s) 期待値 (%ld,%ld,%ld) (%ld,%ld,%ld) を発見\n" #: fdisk/sfdisk.c:1368 #, c-format msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n" -msgstr "" -"シリンダ %2$ld にあるパーティション %1$s の終点はディスクの最後を越えていま" -"す\n" +msgstr "シリンダ %2$ld にあるパーティション %1$s の終点はディスクの最後を越えています\n" #: fdisk/sfdisk.c:1393 #, c-format @@ -5283,8 +5209,7 @@ msgstr "不正なタイプ\n" #: fdisk/sfdisk.c:2117 #, c-format msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n" -msgstr "" -"警告: 与えられたサイズ (%lu) は、許容できる最大サイズ (%lu) を越えています\n" +msgstr "警告: 与えられたサイズ (%lu) は、許容できる最大サイズ (%lu) を越えています\n" #: fdisk/sfdisk.c:2123 msgid "Warning: empty partition\n" @@ -5321,8 +5246,7 @@ msgid "" " \n" "Usually you only need to specify and (and perhaps ).\n" msgstr "" -"以下の書式で入力して下さい -- 指定しなかったフィールドには初期値をセットしま" -"す\n" +"以下の書式で入力して下さい -- 指定しなかったフィールドには初期値をセットします\n" " \n" "普通は と (そして恐らく )を指定するだけで構いません。\n" @@ -5360,11 +5284,8 @@ msgid " -i [or --increment]: number cylinders etc. from 1 instead of from 0" msgstr " -i [or --increment]: シリンダ数など。0 ではなく 1 から" #: fdisk/sfdisk.c:2312 -msgid "" -" -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/" -"MB" -msgstr "" -" -uS, -uB, -uC, -uM: セクタ/ブロック/シリンダ/MB のユニットの受理/報告" +msgid " -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/MB" +msgstr " -uS, -uB, -uC, -uM: セクタ/ブロック/シリンダ/MB のユニットの受理/報告" #: fdisk/sfdisk.c:2313 msgid " -T [or --list-types]:list the known partition types" @@ -5387,8 +5308,7 @@ msgid " -n : do not actually write to disk" msgstr " -n : ディスクへの実際の書込みを行わない" #: fdisk/sfdisk.c:2318 -msgid "" -" -O file : save the sectors that will be overwritten to file" +msgid " -O file : save the sectors that will be overwritten to file" msgstr " -O file : 上書きされるセクタをファイルに保存する" #: fdisk/sfdisk.c:2319 @@ -5412,12 +5332,8 @@ msgid " -g [or --show-geometry]: print the kernel's idea of the geometry" msgstr " -g [or --show-geometry]: カーネルのジオメトリ情報を表示する" #: fdisk/sfdisk.c:2324 -msgid "" -" -G [or --show-pt-geometry]: print geometry guessed from the partition " -"table" -msgstr "" -" -G [or --show-pt-geometry]: 領域テーブルから推測されるジオメトリ情報を表" -"示する" +msgid " -G [or --show-pt-geometry]: print geometry guessed from the partition table" +msgstr " -G [or --show-pt-geometry]: 領域テーブルから推測されるジオメトリ情報を表示する" #: fdisk/sfdisk.c:2325 msgid "" @@ -5428,8 +5344,7 @@ msgstr "" " またはそれらの記述子の入力を得る" #: fdisk/sfdisk.c:2327 -msgid "" -" -L [or --Linux]: do not complain about things irrelevant for Linux" +msgid " -L [or --Linux]: do not complain about things irrelevant for Linux" msgstr " -L [or --Linux]: Linux にそぐわなくても文句を云わない" #: fdisk/sfdisk.c:2328 @@ -5472,8 +5387,7 @@ msgstr "%s デバイス\t\t デバイス上のアクティブ領域をリスト #: fdisk/sfdisk.c:2342 #, c-format msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n" -msgstr "" -"%s デバイス n1 n2 ... n1 をアクティブにして..., 残りを非アクティブにします\n" +msgstr "%s デバイス n1 n2 ... n1 をアクティブにして..., 残りを非アクティブにします\n" #: fdisk/sfdisk.c:2343 #, c-format @@ -5484,8 +5398,7 @@ msgstr "%s -An デバイス\t n をアクティヴにし、それ以外を非ア #, c-format msgid "" "\n" -"WARNING: GPT (GUID Partition Table) detected on '%s'! The util sfdisk " -"doesn't support GPT. Use GNU Parted.\n" +"WARNING: GPT (GUID Partition Table) detected on '%s'! The util sfdisk doesn't support GPT. Use GNU Parted.\n" "\n" msgstr "" @@ -5693,9 +5606,9 @@ msgstr "" "(詳細は fdisk(8)を見てください。)\n" #: fsck/fsck.c:327 -#, fuzzy, c-format +#, c-format msgid "WARNING: couldn't open %s: %s\n" -msgstr "%s: %s を開けません: %s\n" +msgstr "警告: %s を開けません: %s\n" #: fsck/fsck.c:337 #, c-format @@ -5711,14 +5624,14 @@ msgid "" msgstr "" #: fsck/fsck.c:461 -#, fuzzy, c-format +#, c-format msgid "fsck: %s: not found\n" -msgstr "umount: %s: 見つかりません" +msgstr "fsck: %s: 見つかりません\n" #: fsck/fsck.c:577 #, c-format msgid "%s: wait: No more child process?!?\n" -msgstr "" +msgstr "%s: wait: 子プロセスは存在しない?!?\n" #: fsck/fsck.c:599 #, c-format @@ -5747,53 +5660,46 @@ msgid "" msgstr "" #: fsck/fsck.c:744 -#, fuzzy msgid "Couldn't allocate memory for filesystem types\n" -msgstr "mount: ファイルシステムタイプを指定する必要があります" +msgstr "ファイルシステムタイプのためのメモリを確保できませんでした\n" #: fsck/fsck.c:867 #, c-format -msgid "" -"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass " -"number\n" +msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n" msgstr "" #: fsck/fsck.c:894 #, c-format msgid "fsck: cannot check %s: fsck.%s not found\n" -msgstr "" +msgstr "fsck: %sをチェックできません: fsck.%sは見つかりません\n" #: fsck/fsck.c:950 -#, fuzzy msgid "Checking all file systems.\n" -msgstr "強制的に %s のファイルシステム検査します。\n" +msgstr "すべてのファイルシステム検査します。\n" #: fsck/fsck.c:1041 #, c-format msgid "--waiting-- (pass %d)\n" -msgstr "" +msgstr "--待機中-- (パス %d)\n" #: fsck/fsck.c:1061 -#, fuzzy -msgid "" -"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n" -msgstr "" -"使い方: mkfs [-V] [-t ファイルシステム型] [fs オプション] デバイス [サイズ]\n" +msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n" +msgstr "使い方: fsck [-AMNPRTV] [ -C [ fd ] ] [-t ファイルシステム型] [fs オプション] [filesys ...]\n" #: fsck/fsck.c:1099 -#, fuzzy, c-format +#, c-format msgid "%s: too many devices\n" -msgstr "%s: %s は lp デバイスではありません。\n" +msgstr "%s: デバイスが多すぎます\n" #: fsck/fsck.c:1110 -#, fuzzy, c-format +#, c-format msgid "Couldn't open %s: %s\n" msgstr "%s を開けません: %s\n" #: fsck/fsck.c:1112 -#, fuzzy, c-format +#, c-format msgid "Is /proc mounted?\n" -msgstr "%s はアンマウントされました\n" +msgstr "/proc はマウントされていますか?\n" #: fsck/fsck.c:1121 #, c-format @@ -5801,24 +5707,24 @@ msgid "Must be root to scan for matching filesystems: %s\n" msgstr "" #: fsck/fsck.c:1124 -#, fuzzy, c-format +#, c-format msgid "Couldn't find matching filesystem: %s\n" -msgstr "残りのファイルシステムをアンマウントします..." +msgstr "一致するファイルシステムが見つかりません: %s\n" #: fsck/fsck.c:1132 fsck/fsck.c:1218 -#, fuzzy, c-format +#, c-format msgid "%s: too many arguments\n" -msgstr "%s: 不明な引数 %s\n" +msgstr "%s: 引数が多すぎます\n" #: fsck/fsck.c:1252 -#, fuzzy, c-format +#, c-format msgid "fsck from %s\n" -msgstr "%s from %s\n" +msgstr "fsck from %s\n" #: fsck/fsck.c:1264 -#, fuzzy, c-format +#, c-format msgid "%s: Unable to allocate memory for fsck_path\n" -msgstr "inode 用バッファの確保ができません。" +msgstr "%s: fsck_pathのためのメモリを確保ができません。\n" #: getopt/getopt.c:229 msgid "Try `getopt --help' for more information.\n" @@ -5842,18 +5748,15 @@ msgstr " getopt [オプション] [--] オプション文字列 値\n" #: getopt/getopt.c:322 msgid " getopt [options] -o|--options optstring [options] [--]\n" -msgstr "" -" getopt [オプション] -o|--options オプション文字列 [オプション] [--]\n" +msgstr " getopt [オプション] -o|--options オプション文字列 [オプション] [--]\n" #: getopt/getopt.c:323 msgid " parameters\n" msgstr " 値\n" #: getopt/getopt.c:324 -msgid "" -" -a, --alternative Allow long options starting with single -\n" -msgstr "" -" -a, --alternative ロングオプションが - 一つで始まるのを許す\n" +msgid " -a, --alternative Allow long options starting with single -\n" +msgstr " -a, --alternative ロングオプションが - 一つで始まるのを許す\n" #: getopt/getopt.c:325 msgid " -h, --help This small usage guide\n" @@ -5864,8 +5767,7 @@ msgid " -l, --longoptions=longopts Long options to be recognized\n" msgstr " -l, --longoptions=longopts ロングオプションを理解させる\n" #: getopt/getopt.c:327 -msgid "" -" -n, --name=progname The name under which errors are reported\n" +msgid " -n, --name=progname The name under which errors are reported\n" msgstr " -n, --name=progname エラー報告の際の名前\n" #: getopt/getopt.c:328 @@ -5981,7 +5883,7 @@ msgstr "ハードウェア時計%s時刻を保持しているとみなします\ #: hwclock/hwclock.c:232 hwclock/hwclock.c:327 msgid "UTC" -msgstr " UTC " +msgstr "UTC" #: hwclock/hwclock.c:232 hwclock/hwclock.c:326 msgid "local" @@ -6039,8 +5941,7 @@ msgstr "ハードウェア時計に不正な値: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n" #: hwclock/hwclock.c:421 #, c-format msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n" -msgstr "" -"ハードウェア時計時刻 : %4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969 年以来 %ld 秒\n" +msgstr "ハードウェア時計時刻 : %4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969 年以来 %ld 秒\n" #: hwclock/hwclock.c:451 #, c-format @@ -6068,9 +5969,7 @@ msgstr "" #: hwclock/hwclock.c:572 #, c-format -msgid "" -"The Hardware Clock registers contain values that are either invalid (e.g. " -"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n" +msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n" msgstr "" "ハードウェア時計レジスタがおかしな値(例 何月50日)になっているか、\n" "捕捉できない範囲の値(例 2095年)になっています。\n" @@ -6133,8 +6032,7 @@ msgstr "" #: hwclock/hwclock.c:663 #, c-format msgid "" -"The date command issued by %s returned something other than an integer where " -"the converted time value was expected.\n" +"The date command issued by %s returned something other than an integer where the converted time value was expected.\n" "The command was:\n" " %s\n" "The response was:\n" @@ -6154,9 +6052,7 @@ msgstr "date 文字列 %s を 1969 年以来 %ld 秒とします\n" #: hwclock/hwclock.c:706 #, c-format -msgid "" -"The Hardware Clock does not contain a valid time, so we cannot set the " -"System Time from it.\n" +msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n" msgstr "" "ハードウェア時計は、正しい時刻を含んでいないので、ここから得られた値を\n" "システム時刻に設定できません。\n" @@ -6193,18 +6089,16 @@ msgstr "settimeofday() 呼び出しに失敗" #: hwclock/hwclock.c:782 #, c-format msgid "Current system time: %ld = %s\n" -msgstr "" +msgstr "現在のシステム時間: %ld = %s\n" #: hwclock/hwclock.c:805 #, c-format msgid "\tUTC: %s\n" -msgstr "" +msgstr "\tUTC: %s\n" #: hwclock/hwclock.c:852 #, c-format -msgid "" -"Not adjusting drift factor because the Hardware Clock previously contained " -"garbage.\n" +msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n" msgstr "ハードウェア時刻に以前のゴミが含まれており、ずれを修正できません。\n" #: hwclock/hwclock.c:857 @@ -6216,20 +6110,16 @@ msgstr "前回の調整以来、少なくとも一日経過しないと、ずれ #: hwclock/hwclock.c:863 #, c-format -msgid "" -"Not adjusting drift factor because it has been less than a day since the " -"last calibration.\n" +msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n" msgstr "前回の調整以来、少なくとも一日経過しないと、ずれを修正できません。\n" #: hwclock/hwclock.c:911 #, fuzzy, c-format msgid "" -"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor " -"of %f seconds/day.\n" +"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n" "Adjusting drift factor by %f seconds/day\n" msgstr "" -"過去 %2$d 秒の間に、一日あたり %3$f 秒ずらしているのですが、クロックが %1" -"$.1f 秒ずれました。\n" +"過去 %2$d 秒の間に、一日あたり %3$f 秒ずらしているのですが、クロックが %1$.1f 秒ずれました。\n" "一日あたり %4$f 秒ずれを修正します\n" #: hwclock/hwclock.c:961 @@ -6258,9 +6148,7 @@ msgstr "" #: hwclock/hwclock.c:1001 #, c-format -msgid "" -"Could not open file with the clock adjustment parameters in it (%s) for " -"writing" +msgid "Could not open file with the clock adjustment parameters in it (%s) for writing" msgstr "" #: hwclock/hwclock.c:1006 hwclock/hwclock.c:1011 @@ -6275,14 +6163,12 @@ msgstr "ずれの修正値は更新されませんでした。\n" #: hwclock/hwclock.c:1058 #, c-format -msgid "" -"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n" +msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n" msgstr "ハードウェア時計が、正常な時刻を含んでいないので、修正できません。\n" #: hwclock/hwclock.c:1066 #, fuzzy, c-format -msgid "" -"Not setting clock because last adjustment time is zero, so history is bad." +msgid "Not setting clock because last adjustment time is zero, so history is bad." msgstr "前回の調整以来、少なくとも一日経過しないと、ずれを修正できません。\n" #: hwclock/hwclock.c:1089 @@ -6313,8 +6199,7 @@ msgstr "シェルを変更しませんでした。\n" #: hwclock/hwclock.c:1259 #, c-format msgid "" -"The kernel keeps an epoch value for the Hardware Clock only on an Alpha " -"machine.\n" +"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n" "This copy of hwclock was built for a machine other than Alpha\n" "(and thus is presumably not running on an Alpha now). No action taken.\n" msgstr "" @@ -6335,9 +6220,7 @@ msgstr "カーネルはエポック値を %lu と想定しています\n" #: hwclock/hwclock.c:1273 #, c-format -msgid "" -"To set the epoch value, you must use the 'epoch' option to tell to what " -"value to set it.\n" +msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n" msgstr "" "エポック値を設定するためには、何の値を設定するかを知らせるために 'epoch'\n" "オプションを使わなければなりません。\n" @@ -6358,7 +6241,7 @@ msgid "%s from %s\n" msgstr "%s from %s\n" #: hwclock/hwclock.c:1313 -#, fuzzy, c-format +#, c-format msgid "" "hwclock - query and set the hardware clock (RTC)\n" "\n" @@ -6401,41 +6284,41 @@ msgstr "" "使い方: hwclock [機能] [オプション...]\n" "\n" "機能:\n" -" --help このヘルプを表示する\n" -" --show ハードウェア時計を読み取って、結果を表示する\n" -" --set --date で与えられた時刻を rtc に設定する\n" -" --hctosys システム時刻をハードウェア時計に合わせる\n" -" --systohc ハードウェア時計を現在のシステム時刻に合わせる\n" -" --adjust 時計が最後に設定または調整された時点から、システム的なずれ" -"を\n" -" 計算して rtc を調整する\n" -" --getepoch カーネルのハードウェア時刻のエポック値を表示する\n" -" --setepoch カーネルのハードウェア時刻のエポック値を --epoch として与" -"え\n" -" られた値に設定する\n" -" --version hwclock のバージョンを標準出力に表示する\n" +" -h | --help このヘルプを表示する\n" +" -r | --show ハードウェア時計を読み取って、結果を表示する\n" +" --set --date で与えられた時刻を rtc に設定する\n" +" -s | --hctosys システム時刻をハードウェア時計に合わせる\n" +" -w | --systohc ハードウェア時計を現在のシステム時刻に合わせる\n" +" --systz 現在のタイムゾーンをベースとしたシステム時間に合わせる\n" +" --adjust 時計が最後に設定または調整された時点から、システム的な\n" +" ずれを計算して rtc を調整する\n" +" --getepoch カーネルのハードウェア時刻のエポック値を表示する\n" +" --setepoch カーネルのハードウェア時刻のエポック値を --epoch として与えられた値に設定する\n" +" -v | --version hwclock のバージョンを標準出力に表示する\n" "\n" "オプション: \n" -" --utc ハードウェア時計を協定世界時刻で保持する\n" -" --localtime ハードウェア時計をローカル時刻で保持する\n" -" --rtc=path デフォルトの代わりに使用する /dev/... ファイルを指定する\n" -" --directisa %s の代わりに、直接 ISA バスにアクセスする\n" -" --badyear BIOS に問題があるため、rtc の年を無視する\n" -" --date ハードウェア時計に指定する時刻\n" -" --epoch=year ハードウェア時計のエポック値の起源に指定する年\n" -" --noadjfile /etc/adjtime にアクセスしない。--utc 又は --localtime\n" -" のいずれかの使用を必要とする\n" -" --adjfile=パス adjust ファイルのパスを指定する (デフォルトは /etc/" -"adjtime)\n" +" -u | --utc ハードウェア時計を協定世界時刻で保持する\n" +" --localtime ハードウェア時計をローカル時刻で保持する\n" +" -f | --rtc=path デフォルトの代わりに使用する /dev/... ファイルを指定する\n" +" --directisa %s の代わりに、直接 ISA バスにアクセスする\n" +" --badyear BIOS に問題があるため、rtc の年を無視する\n" +" --date ハードウェア時計に指定する時刻\n" +" --epoch=year ハードウェア時計のエポック値の起源に指定する年\n" +" --noadjfile /etc/adjtime にアクセスしない。--utc 又は --localtime\n" +" のいずれかの使用を必要とする\n" +" --adjfile=パス adjust ファイルのパスを指定する (デフォルトは\n" +" /etc/adjtime)\n" +" --test ハードウェア時計を更新する以外のすべてを行う\n" +" -D | --debug デバッグモード\n" #: hwclock/hwclock.c:1348 -#, fuzzy, c-format +#, c-format msgid "" " -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n" " tell hwclock the type of alpha you have (see hwclock(8))\n" "\n" msgstr "" -" --jensen, --arc, --srm, --funky-toy\n" +" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n" " あなたの alpha のタイプを指示する (hwclock(8) 参照)\n" #: hwclock/hwclock.c:1435 @@ -6449,7 +6332,7 @@ msgid "%s takes no non-option arguments. You supplied %d.\n" msgstr "%s は何らかのオプション引数を取ります。あなたは %d 個与えました。\n" #: hwclock/hwclock.c:1560 -#, fuzzy, c-format +#, c-format msgid "" "You have specified multiple functions.\n" "You can only perform one function at a time.\n" @@ -6459,37 +6342,23 @@ msgstr "" #: hwclock/hwclock.c:1567 #, c-format -msgid "" -"%s: The --utc and --localtime options are mutually exclusive. You specified " -"both.\n" -msgstr "" -"%s: --utc と --localtime オプションは相互排他的ですが、両方が指定されまし" -"た。\n" +msgid "%s: The --utc and --localtime options are mutually exclusive. You specified both.\n" +msgstr "%s: --utc と --localtime オプションは相互排他的ですが、両方が指定されました。\n" #: hwclock/hwclock.c:1574 #, c-format -msgid "" -"%s: The --adjust and --noadjfile options are mutually exclusive. You " -"specified both.\n" -msgstr "" -"%s: --adjust と --noadjfile オプションは相互排他的ですが、両方が指定されまし" -"た。\n" +msgid "%s: The --adjust and --noadjfile options are mutually exclusive. You specified both.\n" +msgstr "%s: --adjust と --noadjfile オプションは相互排他的ですが、両方が指定されました。\n" #: hwclock/hwclock.c:1581 #, c-format -msgid "" -"%s: The --adjfile and --noadjfile options are mutually exclusive. You " -"specified both.\n" -msgstr "" -"%s: --adjfile と --noadjfile オプションは相互排他的ですが、両方が指定されまし" -"た。\n" +msgid "%s: The --adjfile and --noadjfile options are mutually exclusive. You specified both.\n" +msgstr "%s: --adjfile と --noadjfile オプションは相互排他的ですが、両方が指定されました。\n" #: hwclock/hwclock.c:1590 #, c-format msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n" -msgstr "" -"%s: --noadjfile をつけた場合、--utc か --localtime のいずれかを指定しなければ" -"なりません\n" +msgstr "%s: --noadjfile をつけた場合、--utc か --localtime のいずれかを指定しなければなりません\n" #: hwclock/hwclock.c:1604 #, c-format @@ -6499,8 +6368,7 @@ msgstr "有効な設定時刻がありません。クロックを設定できま #: hwclock/hwclock.c:1621 #, c-format msgid "Sorry, only the superuser can change the Hardware Clock.\n" -msgstr "" -"残念ながら、ハードウェアク時計の変更はスーパーユーザでしか行なえません。\n" +msgstr "残念ながら、ハードウェアク時計の変更はスーパーユーザでしか行なえません。\n" #: hwclock/hwclock.c:1626 #, c-format @@ -6509,9 +6377,7 @@ msgstr "残念ながら、システム時計の変更はスーパーユーザで #: hwclock/hwclock.c:1631 #, c-format -msgid "" -"Sorry, only the superuser can change the Hardware Clock epoch in the " -"kernel.\n" +msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n" msgstr "" "残念ながら、カーネル内のハードウェア時計のエポック値を変更できるのは、\n" "スーパーユーザだけです。\n" @@ -6523,9 +6389,7 @@ msgstr "既知のどんな方法でも、ハードウェア時計にアクセス #: hwclock/hwclock.c:1655 #, c-format -msgid "" -"Use the --debug option to see the details of our search for an access " -"method.\n" +msgid "Use the --debug option to see the details of our search for an access method.\n" msgstr "--debug オプションでアクセス方法検索の詳細について見てください。\n" #: hwclock/kd.c:53 @@ -6606,8 +6470,7 @@ msgstr "割り込み更新をオフにするための %s への ioctl() が失 #: hwclock/rtc.c:303 #, c-format msgid "ioctl() to %s to turn on update interrupts failed unexpectedly" -msgstr "" -"割り込み更新をオンにするための %s への ioctl() が予期せぬ失敗に終わりました" +msgstr "割り込み更新をオンにするための %s への ioctl() が予期せぬ失敗に終わりました" #: hwclock/rtc.c:360 #, c-format @@ -6626,10 +6489,7 @@ msgstr "%s のオープンに失敗しました" #: hwclock/rtc.c:410 hwclock/rtc.c:454 #, c-format -msgid "" -"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' " -"device driver via the device special file %s. This file does not exist on " -"this system.\n" +msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s. This file does not exist on this system.\n" msgstr "" "カーネル内のエポック値を算出するには、スペシャルファイル %s を通じて\n" "Linux の 'rtc' デバイスドライバにアクセスする必要があります。しかし、この\n" @@ -6648,25 +6508,21 @@ msgstr "%s への ioctl(RTC_EPOCH_READ) が失敗しました" #: hwclock/rtc.c:427 #, c-format msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n" -msgstr "" -"%2$s から RTC_EPOCH_READ ioctl によってエポック %1$ld を読み取りました。\n" +msgstr "%2$s から RTC_EPOCH_READ ioctl によってエポック %1$ld を読み取りました。\n" #: hwclock/rtc.c:446 #, c-format msgid "The epoch value may not be less than 1900. You requested %ld\n" -msgstr "" -"エポック値は 1900 年以前ではあり得ません。あなたは %ld を要求しました\n" +msgstr "エポック値は 1900 年以前ではあり得ません。あなたは %ld を要求しました\n" #: hwclock/rtc.c:464 #, c-format msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n" -msgstr "" -"%2$s から RTC_EPOCH_READ ioctl によってエポック %1$ld を読み取りました。\n" +msgstr "%2$s から RTC_EPOCH_READ ioctl によってエポック %1$ld を読み取りました。\n" #: hwclock/rtc.c:469 #, c-format -msgid "" -"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n" +msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n" msgstr "%s のカーネルドライバは RTC_EPOCH_SET ioctl を持っていません。\n" #: hwclock/rtc.c:472 @@ -6745,15 +6601,11 @@ msgstr "%s: 入力が溢れました" #: login-utils/agetty.c:1207 #, c-format msgid "" -"Usage: %s [-8hiLmUw] [-l login_program] [-t timeout] [-I initstring] [-H " -"login_host] baud_rate,... line [termtype]\n" -"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] " -"line baud_rate,... [termtype]\n" +"Usage: %s [-8hiLmUw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n" +"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n" msgstr "" -"使い方: %s [-8hiLmUw] [-l ログインプログラム] [-t タイムアウト] [-I 初期化文" -"字列] [-H ログインホスト] ボーレート,... 行 [端末タイプ]\n" -"又は\t[-hiLmw] [-l ログインプログラム] [-t タイムアウト [-I 初期化文字列] [-" -"H ログインホスト] 行 ボーレート,... [端末タイプ]\n" +"使い方: %s [-8hiLmUw] [-l ログインプログラム] [-t タイムアウト] [-I 初期化文字列] [-H ログインホスト] ボーレート,... 行 [端末タイプ]\n" +"又は\t[-hiLmw] [-l ログインプログラム] [-t タイムアウト [-I 初期化文字列] [-H ログインホスト] 行 ボーレート,... [端末タイプ]\n" #: login-utils/checktty.c:91 login-utils/checktty.c:112 #, c-format @@ -6791,8 +6643,7 @@ msgstr "%s: ユーザ \"%s\" は存在しません。\n" #: login-utils/chfn.c:145 login-utils/chsh.c:131 #, c-format msgid "%s: can only change local entries; use yp%s instead.\n" -msgstr "" -"%s: ローカルの項目しか変更できません -- かわりに yp%s を使いましょう。\n" +msgstr "%s: ローカルの項目しか変更できません -- かわりに yp%s を使いましょう。\n" #: login-utils/chfn.c:156 login-utils/chsh.c:142 msgid "Unknown user context" @@ -6806,7 +6657,7 @@ msgstr "" #: login-utils/chfn.c:164 login-utils/chsh.c:150 #, c-format msgid "%s: Can't set default context for /etc/passwd" -msgstr "" +msgstr "%s: /etc/passwd のデフォルトコンテキストを設定できません" #: login-utils/chfn.c:178 #, c-format @@ -6854,15 +6705,15 @@ msgstr "[ --help ] [ --version ]\n" #: login-utils/chfn.c:378 msgid "Office" -msgstr "" +msgstr "オフィス" #: login-utils/chfn.c:379 msgid "Office Phone" -msgstr "" +msgstr "オフィスの電話" #: login-utils/chfn.c:380 msgid "Home Phone" -msgstr "" +msgstr "自宅の電話" #: login-utils/chfn.c:401 login-utils/chsh.c:321 #, c-format @@ -6905,17 +6756,13 @@ msgstr "%s: \"%s\" は /etc/shells リストの中にありません。\n" #: login-utils/chsh.c:164 #, c-format -msgid "" -"%s: Running UID doesn't match UID of user we're altering, shell change " -"denied\n" +msgid "%s: Running UID doesn't match UID of user we're altering, shell change denied\n" msgstr "" #: login-utils/chsh.c:170 #, c-format msgid "%s: Your shell is not in /etc/shells, shell change denied\n" -msgstr "" -"%s: あなたのシェルは /etc/shells にありませんので、シェルの変更が拒否されまし" -"た\n" +msgstr "%s: あなたのシェルは /etc/shells にありませんので、シェルの変更が拒否されました\n" #: login-utils/chsh.c:177 #, c-format @@ -7497,7 +7344,7 @@ msgstr "" #: login-utils/simpleinit.c:259 msgid "error running finalprog\n" -msgstr "finalprog 起動時にエラー発生\n" +msgstr "finalprog実行時にエラー発生\n" #: login-utils/simpleinit.c:263 msgid "error forking finalprog\n" @@ -7545,19 +7392,19 @@ msgid "no TERM or cannot stat tty\n" msgstr "端末がないか tty の状態を取得できません\n" #: login-utils/simpleinit.c:938 -#, fuzzy, c-format +#, c-format msgid "error stopping service: \"%s\"\n" -msgstr "エラーによりサービスを停止します: \"%s\"" +msgstr "サービスを停止する際にエラーが発生しました: \"%s\"\n" #: login-utils/simpleinit.c:950 -#, fuzzy, c-format +#, c-format msgid "Stopped service: %s\n" -msgstr "エラーによりサービスを停止します: \"%s\"" +msgstr "サービスを停止します: %s\n" #: login-utils/simpleinit.c:1070 -#, fuzzy, c-format +#, c-format msgid "error running programme: \"%s\"\n" -msgstr "finalprog 起動時にエラー発生\n" +msgstr "programme実行時にエラーが発生しました: \"%s\"\n" #: login-utils/ttymsg.c:75 msgid "too many iov's (change code in wall/ttymsg.c)" @@ -7604,14 +7451,14 @@ msgid "%s: can't link %s: %s\n" msgstr "%s: %s をリンクできません: %s\n" #: login-utils/vipw.c:202 -#, fuzzy, c-format +#, c-format msgid "%s: Can't get context for %s" -msgstr "%s へのタイムアウトを取得できません: %s\n" +msgstr "%s: %s のコンテキストを取得できません" #: login-utils/vipw.c:208 -#, fuzzy, c-format +#, c-format msgid "%s: Can't set context for %s" -msgstr "%s へのタイムアウトを取得できません: %s\n" +msgstr "%s: %s のコンテキストを設定できません" #: login-utils/vipw.c:217 #, c-format @@ -7718,12 +7565,12 @@ msgstr "聖 Tib の日" #: misc-utils/findfs.c:24 #, c-format msgid "Usage: %s LABEL=