summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorLaMont Jones <lamont@debian.org>2010-08-02 23:02:28 -0600
committerLaMont Jones <lamont@debian.org>2010-08-02 23:02:28 -0600
commit0864d694ca05ea9383ef09bc1bc3a182e15e2ffa (patch)
tree2e5237f1d4e2cac2efad97ce31abc386c1e37b6d /po/zh_CN.po
parent3cbdfd84fde6159d7778e70618fbbc8df219cafe (diff)
parent6c91f5e3e1de32c45ea0b38227ce35eb43eb2ebc (diff)
downloadutil-linux-old-0864d694ca05ea9383ef09bc1bc3a182e15e2ffa.tar.gz
Merge remote branch 'origin/master'
Conflicts: mount/Makefile.am sys-utils/ipcs.c tests/ts/blkid/images-fs/befs.img.bz2 tests/ts/blkid/images-fs/ddf-raid.img.bz2
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3001
1 files changed, 1713 insertions, 1288 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6838d617..116be111 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: util-linux-ng-2.14.1-rc2\n"
"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
"PO-Revision-Date: 2008-08-23 23:20+0800\n"
"Last-Translator: Ray Wang <wanglei1123@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -103,6 +103,11 @@ msgstr "重新读取分区表"
msgid "Usage:\n"
msgstr "用法:\n"
+#: disk-utils/blockdev.c:180
+#, c-format
+msgid " %s -V\n"
+msgstr ""
+
#: disk-utils/blockdev.c:181
#, c-format
msgid " %s --report [devices]\n"
@@ -122,6 +127,17 @@ msgstr "可用的命令:\n"
msgid "get size in 512-byte sectors"
msgstr "获得512字节的段大小"
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
#: disk-utils/blockdev.c:321
#, c-format
msgid "%s: Unknown command: %s\n"
@@ -223,15 +239,6 @@ msgstr ""
msgid "usage: %s [ -n ] device\n"
msgstr "用法: %s [ -n ] device\n"
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
#: disk-utils/fdformat.c:132
#, c-format
msgid "%s: not a block device\n"
@@ -334,7 +341,7 @@ msgstr ""
#: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
#: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
msgid "malloc failed"
msgstr ""
@@ -929,7 +936,7 @@ msgstr ""
msgid "%s is not a block special device"
msgstr ""
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
#, c-format
msgid "cannot open %s"
msgstr ""
@@ -953,7 +960,7 @@ msgstr ""
msgid "not enough space, need at least %llu blocks"
msgstr ""
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
#, c-format
msgid "Device: %s\n"
msgstr ""
@@ -1027,7 +1034,7 @@ msgstr ""
msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
msgstr ""
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
#: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
#, c-format
msgid "%s: Out of memory!\n"
@@ -1235,7 +1242,7 @@ msgstr ""
msgid "Weird values in do_check: probably bugs\n"
msgstr ""
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
msgid "seek failed in check_blocks"
msgstr ""
@@ -1315,168 +1322,174 @@ msgstr ""
msgid "Using user-specified page size %d, instead of the system value %d\n"
msgstr ""
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s 失败.\n"
+
+#: disk-utils/mkswap.c:197
#, c-format
msgid "Bad swap header size, no label written.\n"
msgstr ""
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
#, c-format
msgid "Label was truncated.\n"
msgstr ""
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
#, c-format
msgid "no label, "
msgstr ""
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
#, c-format
msgid "no uuid\n"
msgstr ""
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
#, c-format
msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
msgstr ""
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
msgid "too many bad pages"
msgstr ""
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
#: text-utils/more.c:2016 text-utils/more.c:2027
msgid "Out of memory"
msgstr ""
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
#, c-format
msgid "one bad page\n"
msgstr ""
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
#, c-format
msgid "%lu bad pages\n"
msgstr ""
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
msgid "unable to rewind swap-device"
msgstr ""
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
#, fuzzy
msgid "unable to alloc new libblkid probe"
msgstr "不能为 inodes 分配缓冲区"
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "不能为 inodes 分配缓冲区"
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
#, fuzzy
msgid "unable to erase bootbits sectors"
msgstr "不能读超级块"
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
#, c-format
msgid "%s: %s: warning: don't erase bootbits sectors\n"
msgstr ""
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
#, c-format
msgid " (%s partition table detected). "
msgstr ""
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
#, c-format
msgid " on whole disk. "
msgstr ""
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
#, c-format
msgid " (compiled without libblkid). "
msgstr ""
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
#, c-format
msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
msgstr ""
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
#, c-format
msgid "%s: does not support swapspace version %d.\n"
msgstr ""
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
msgid "error: UUID parsing failed"
msgstr ""
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
#, c-format
msgid "%s: error: Nowhere to set up swap on?\n"
msgstr ""
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
#, c-format
msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
msgstr ""
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
#, c-format
msgid "%s: error: swap area needs to be at least %ld KiB\n"
msgstr ""
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
#, c-format
msgid "%s: warning: truncating swap area to %llu KiB\n"
msgstr ""
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
#, c-format
msgid "%s: error: will not try to make swapdevice on '%s'\n"
msgstr ""
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
#, c-format
msgid "%s: error: %s is mounted; will not make swapspace.\n"
msgstr ""
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
msgid "Unable to set up swap-space: unreadable"
msgstr ""
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
#, c-format
msgid "Setting up swapspace version 1, size = %llu KiB\n"
msgstr ""
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
#, c-format
msgid "%s: %s: unable to write signature page: %s"
msgstr ""
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
msgid "fsync failed"
msgstr ""
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
#, c-format
msgid "%s: %s: unable to obtain selinux file label: %s\n"
msgstr ""
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
msgid "unable to matchpathcon()"
msgstr ""
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
msgid "unable to create new selinux context"
msgstr ""
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
msgid "couldn't compute selinux context"
msgstr ""
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
#, c-format
msgid "%s: unable to relabel %s to %s: %s\n"
msgstr ""
@@ -1539,61 +1552,107 @@ msgstr ""
msgid "Error setting raw device (%s)\n"
msgstr ""
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "%s:不是一个块设备\n"
+
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
msgstr ""
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
+#: disk-utils/swaplabel.c:71
+#, c-format
+msgid "%s: not a valid swap partition"
msgstr ""
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
+#: disk-utils/swaplabel.c:77
+#, c-format
+msgid "%s: unsupported swap version '%s'"
msgstr ""
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "不能读 inodes"
+
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "不能读 inodes"
+
+#: disk-utils/swaplabel.c:121
+#, c-format
+msgid "%s: failed to seek to swap UUID"
msgstr ""
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "不能读 inodes"
+
+#: disk-utils/swaplabel.c:136
+#, c-format
+msgid "%s: failed to seek to swap label "
msgstr ""
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
msgstr ""
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "在 write_block 中查找失败"
+
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "用法: %s [ -n ] device\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid> specify a new uuid\n"
msgstr ""
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
+#: disk-utils/swaplabel.c:169
+#, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
msgstr ""
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
msgstr ""
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
msgstr ""
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
msgstr ""
-#: fdisk/cfdisk.c:415
+#: fdisk/cfdisk.c:400
#, c-format
msgid "Disk has been changed.\n"
msgstr ""
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
#, c-format
msgid "Reboot the system to ensure the partition table is correctly updated.\n"
msgstr ""
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
#, c-format
msgid ""
"\n"
@@ -1602,773 +1661,773 @@ msgid ""
"page for additional information.\n"
msgstr ""
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
msgid "FATAL ERROR"
msgstr ""
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
msgid "Press any key to exit cfdisk"
msgstr ""
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
msgid "Cannot seek on disk drive"
msgstr ""
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
msgid "Cannot read disk drive"
msgstr ""
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
msgid "Cannot write disk drive"
msgstr ""
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
msgid "Too many partitions"
msgstr ""
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
msgid "Partition begins before sector 0"
msgstr ""
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
msgid "Partition ends before sector 0"
msgstr ""
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
msgid "Partition begins after end-of-disk"
msgstr ""
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
msgid "Partition ends after end-of-disk"
msgstr ""
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
msgid "Partition ends in the final partial cylinder"
msgstr ""
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
msgid "logical partitions not in disk order"
msgstr ""
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
msgid "logical partitions overlap"
msgstr ""
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
msgid "enlarged logical partitions overlap"
msgstr ""
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
msgid ""
"!!!! Internal error creating logical drive with no extended partition !!!!"
msgstr ""
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
msgid ""
"Cannot create logical drive here -- would create two extended partitions"
msgstr ""
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
msgid "Menu item too long. Menu may look odd."
msgstr ""
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
msgid "Menu without direction. Defaulting to horizontal."
msgstr ""
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
msgid "Illegal key"
msgstr ""
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
msgid "Press a key to continue"
msgstr ""
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
msgid "Primary"
msgstr ""
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
msgid "Create a new primary partition"
msgstr ""
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
msgid "Logical"
msgstr ""
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
msgid "Create a new logical partition"
msgstr ""
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
msgid "Cancel"
msgstr ""
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
msgid "Don't create a partition"
msgstr ""
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
msgid "!!! Internal error !!!"
msgstr ""
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
msgid "Size (in MB): "
msgstr ""
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
msgid "Beginning"
msgstr ""
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
msgid "Add partition at beginning of free space"
msgstr ""
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
msgid "End"
msgstr ""
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
msgid "Add partition at end of free space"
msgstr ""
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
msgid "No room to create the extended partition"
msgstr ""
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
msgid "No partition table.\n"
msgstr ""
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
msgid "No partition table. Starting with zero table."
msgstr ""
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
msgid "Bad signature on partition table"
msgstr ""
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
msgid "Unknown partition table type"
msgstr ""
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
msgid "Do you wish to start with a zero table [y/N] ?"
msgstr ""
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
msgid "You specified more cylinders than fit on disk"
msgstr ""
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
msgid "Cannot open disk drive"
msgstr ""
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
msgid "Opened disk read-only - you have no permission to write"
msgstr ""
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
msgid ""
"Warning!! Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
msgstr ""
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
msgid "Cannot get disk size"
msgstr ""
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
msgid "Bad primary partition"
msgstr ""
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
msgid "Bad logical partition"
msgstr ""
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
msgid "Warning!! This may destroy data on your disk!"
msgstr ""
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
msgid ""
"Are you sure you want to write the partition table to disk? (yes or no): "
msgstr ""
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
msgid "no"
msgstr ""
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
msgid "Did not write partition table to disk"
msgstr ""
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
msgid "yes"
msgstr ""
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
msgid "Please enter `yes' or `no'"
msgstr ""
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
msgid "Writing partition table to disk..."
msgstr ""
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
msgid "Wrote partition table to disk"
msgstr ""
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
msgid ""
"Wrote partition table, but re-read table failed. Run partprobe(8), kpartx"
"(8) or reboot to update table."
msgstr ""
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
msgstr ""
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
msgid ""
"More than one primary partition is marked bootable. DOS MBR cannot boot this."
msgstr ""
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
msgid "Enter filename or press RETURN to display on screen: "
msgstr ""
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
#, c-format
msgid "Cannot open file '%s'"
msgstr ""
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
#, c-format
msgid "Disk Drive: %s\n"
msgstr ""
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
msgid "Sector 0:\n"
msgstr ""
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
#, c-format
msgid "Sector %d:\n"
msgstr ""
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
msgid " None "
msgstr ""
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
msgid " Pri/Log"
msgstr ""
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
msgid " Primary"
msgstr ""
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
msgid " Logical"
msgstr ""
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
msgid "Unknown"
msgstr ""
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
msgid "Boot"
msgstr ""
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
#, c-format
msgid "(%02X)"
msgstr ""
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
msgid "None"
msgstr ""
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
#, c-format
msgid "Partition Table for %s\n"
msgstr ""
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
msgid " First Last\n"
msgstr ""
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
msgid ""
" # Type Sector Sector Offset Length Filesystem Type (ID) "
"Flag\n"
msgstr ""
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
msgid ""
"-- ------- ----------- ----------- ------ ----------- -------------------- "
"----\n"
msgstr ""
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
msgid " ---Starting---- ----Ending----- Start Number of\n"
msgstr ""
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
msgid " # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n"
msgstr ""
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
msgstr ""
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
msgid "Raw"
msgstr ""
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
msgid "Print the table using raw data format"
msgstr ""
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
msgid "Sectors"
msgstr ""
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
msgid "Print the table ordered by sectors"
msgstr ""
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
msgid "Table"
msgstr ""
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
msgid "Just print the partition table"
msgstr ""
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
msgid "Don't print the table"
msgstr ""
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
msgid "Help Screen for cfdisk"
msgstr ""
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
msgid "This is cfdisk, a curses based disk partitioning program, which"
msgstr ""
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
msgid "allows you to create, delete and modify partitions on your hard"
msgstr ""
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
msgid "disk drive."
msgstr ""
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
msgstr ""
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
msgid "Command Meaning"
msgstr ""
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
msgid "------- -------"
msgstr ""
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
msgid " b Toggle bootable flag of the current partition"
msgstr ""
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
msgid " d Delete the current partition"
msgstr ""
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
msgid " g Change cylinders, heads, sectors-per-track parameters"
msgstr ""
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
msgid " WARNING: This option should only be used by people who"
msgstr ""
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
msgid " know what they are doing."
msgstr ""
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
msgid " h Print this screen"
msgstr ""
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
msgid " m Maximize disk usage of the current partition"
msgstr ""
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
msgid " Note: This may make the partition incompatible with"
msgstr ""
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
msgid " DOS, OS/2, ..."
msgstr ""
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
msgid " n Create new partition from free space"
msgstr ""
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
msgid " p Print partition table to the screen or to a file"
msgstr ""
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
msgid " There are several different formats for the partition"
msgstr ""
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
msgid " that you can choose from:"
msgstr ""
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
msgid " r - Raw data (exactly what would be written to disk)"
msgstr ""
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
msgid " s - Table ordered by sectors"
msgstr ""
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
msgid " t - Table in raw format"
msgstr ""
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
msgid " q Quit program without writing partition table"
msgstr ""
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
msgid " t Change the filesystem type"
msgstr ""
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
msgid " u Change units of the partition size display"
msgstr ""
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
msgid " Rotates through MB, sectors and cylinders"
msgstr ""
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
msgid " W Write partition table to disk (must enter upper case W)"
msgstr ""
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
msgid " Since this might destroy data on the disk, you must"
msgstr ""
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
msgid " either confirm or deny the write by entering `yes' or"
msgstr ""
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
msgid " `no'"
msgstr ""
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
msgid "Up Arrow Move cursor to the previous partition"
msgstr ""
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
msgid "Down Arrow Move cursor to the next partition"
msgstr ""
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
msgid "CTRL-L Redraws the screen"
msgstr ""
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
msgid " ? Print this screen"
msgstr ""
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr ""
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
msgid "case letters (except for Writes)."
msgstr ""
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
msgid "Cylinders"
msgstr ""
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
msgid "Change cylinder geometry"
msgstr ""
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
msgid "Heads"
msgstr ""
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
msgid "Change head geometry"
msgstr ""
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
msgid "Change sector geometry"
msgstr ""
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
msgid "Done"
msgstr ""
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
msgid "Done with changing geometry"
msgstr ""
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
msgid "Enter the number of cylinders: "
msgstr ""
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
msgid "Illegal cylinders value"
msgstr ""
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
msgid "Enter the number of heads: "
msgstr ""
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
msgid "Illegal heads value"
msgstr ""
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
msgid "Enter the number of sectors per track: "
msgstr ""
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
msgid "Illegal sectors value"
msgstr ""
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
msgid "Enter filesystem type: "
msgstr ""
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
msgid "Cannot change FS Type to empty"
msgstr ""
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
msgid "Cannot change FS Type to extended"
msgstr ""
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
#, c-format
msgid "Unk(%02X)"
msgstr ""
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
msgid ", NC"
msgstr ""
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
msgid "NC"
msgstr ""
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
msgid "Pri/Log"
msgstr ""
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
#, c-format
msgid "Unknown (%02X)"
msgstr ""
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
#, c-format
msgid "Disk Drive: %s"
msgstr ""
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
#, c-format
msgid "Size: %lld bytes, %lld MB"
msgstr ""
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
#, c-format
msgid "Size: %lld bytes, %lld.%lld GB"
msgstr ""
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
#, c-format
msgid "Heads: %d Sectors per Track: %d Cylinders: %lld"
msgstr ""
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
msgid "Name"
msgstr ""
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
msgid "Flags"
msgstr ""
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
msgid "Part Type"
msgstr ""
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
msgid "FS Type"
msgstr ""
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
msgid "[Label]"
msgstr ""
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
msgid " Sectors"
msgstr ""
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
msgid " Cylinders"
msgstr ""
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
msgid " Size (MB)"
msgstr ""
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
msgid " Size (GB)"
msgstr ""
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
msgid "Bootable"
msgstr ""
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
msgid "Toggle bootable flag of the current partition"
msgstr ""
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
msgid "Delete"
msgstr ""
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
msgid "Delete the current partition"
msgstr ""
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
msgid "Geometry"
msgstr ""
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
msgid "Change disk geometry (experts only)"
msgstr ""
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
msgid "Help"
msgstr ""
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
msgid "Print help screen"
msgstr ""
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
msgid "Maximize"
msgstr ""
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
msgid "Maximize disk usage of the current partition (experts only)"
msgstr ""
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
msgid "New"
msgstr ""
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
msgid "Create new partition from free space"
msgstr ""
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
msgid "Print"
msgstr ""
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
msgid "Print partition table to the screen or to a file"
msgstr ""
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
msgid "Quit"
msgstr ""
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
msgid "Quit program without writing partition table"
msgstr ""
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
msgid "Type"
msgstr ""
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
msgstr ""
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
msgid "Units"
msgstr ""
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
msgid "Change units of the partition size display (MB, sect, cyl)"
msgstr ""
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
msgid "Write"
msgstr ""
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
msgid "Write partition table to disk (this might destroy data)"
msgstr ""
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
msgid "Cannot make this partition bootable"
msgstr ""
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
msgid "Cannot delete an empty partition"
msgstr ""
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
msgid "Cannot maximize this partition"
msgstr ""
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
msgid "This partition is unusable"
msgstr ""
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
msgid "This partition is already in use"
msgstr ""
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
msgid "Cannot change the type of an empty partition"
msgstr ""
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
msgid "No more partitions"
msgstr ""
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
msgid "Illegal command"
msgstr ""
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
#, c-format
msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
msgstr ""
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
#, c-format
msgid ""
"\n"
@@ -2411,9 +2470,9 @@ msgid ""
"BSD label for device: %s\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
msgid "Command action"
msgstr ""
@@ -2433,9 +2492,9 @@ msgstr ""
msgid " l list known filesystem types"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
msgid " m print this menu"
msgstr ""
@@ -2447,14 +2506,14 @@ msgstr ""
msgid " p print BSD partition table"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
msgid " q quit without saving changes"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
msgid " r return to main menu"
msgstr ""
@@ -2497,13 +2556,13 @@ msgstr ""
msgid "BSD disklabel command (m for help): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
#, c-format
msgid "First %s"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr ""
@@ -2646,7 +2705,7 @@ msgstr ""
msgid "tracks/cylinder"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
#: fdisk/sfdisk.c:930
msgid "cylinders"
msgstr ""
@@ -2704,7 +2763,7 @@ msgstr ""
msgid "Partition (a-%c): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
#, c-format
msgid "The maximum number of partitions has been created\n"
msgstr ""
@@ -2726,233 +2785,218 @@ msgid ""
"Syncing disks.\n"
msgstr ""
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:257
msgid ""
-"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
-" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
-" fdisk -s PARTITION Give partition size(s) in blocks\n"
-" fdisk -v Give fdisk version\n"
-"Here DISK is something like /dev/hdb or /dev/sda\n"
-"and PARTITION is something like /dev/hda7\n"
-"-u: give Start and End in sector (instead of cylinder) units\n"
-"-b 2048: (for certain MO disks) use 2048-byte sectors\n"
-msgstr ""
-
-#: fdisk/fdisk.c:260
-msgid ""
-"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
-"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
-" or: fdisk /dev/sdc (for the third SCSI disk)\n"
-" or: fdisk /dev/eda (for the first PS/2 ESDI drive)\n"
-" or: fdisk /dev/rd/c0d0 or: fdisk /dev/ida/c0d0 (for RAID devices)\n"
-" ...\n"
+"Usage:\n"
+" fdisk [options] <disk> change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition> give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size> sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>] compatible mode: 'dos' or 'nondos' (default)\n"
+" -h print this help text\n"
+" -u[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"
+" -v print program version\n"
+" -C <number> specify the number of cylinders\n"
+" -H <number> specify the number of heads\n"
+" -S <number> specify the number of sectors per track\n"
+"\n"
msgstr ""
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:274
#, c-format
msgid "Unable to open %s\n"
msgstr ""
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
#, c-format
msgid "Unable to read %s\n"
msgstr ""
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
#, c-format
msgid "Unable to seek on %s\n"
msgstr ""
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
#, c-format
msgid "Unable to write %s\n"
msgstr ""
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr ""
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
msgid "Unable to allocate any more memory\n"
msgstr ""
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
msgid "Fatal error\n"
msgstr ""
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
msgid " a toggle a read only flag"
msgstr ""
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
msgid " b edit bsd disklabel"
msgstr ""
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
msgid " c toggle the mountable flag"
msgstr ""
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
msgid " d delete a partition"
msgstr ""
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
msgid " l list known partition types"
msgstr ""
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
msgid " n add a new partition"
msgstr ""
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
msgid " o create a new empty DOS partition table"
msgstr ""
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
msgid " p print the partition table"
msgstr ""
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
msgid " s create a new empty Sun disklabel"
msgstr ""
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
msgid " t change a partition's system id"
msgstr ""
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
msgid " u change display/entry units"
msgstr ""
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
msgid " v verify the partition table"
msgstr ""
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
msgid " w write table to disk and exit"
msgstr ""
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
msgid " x extra functionality (experts only)"
msgstr ""
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
msgid " a select bootable partition"
msgstr ""
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
msgid " b edit bootfile entry"
msgstr ""
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
msgid " c select sgi swap partition"
msgstr ""
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
msgid " a toggle a bootable flag"
msgstr ""
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
msgid " c toggle the dos compatibility flag"
msgstr ""
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
msgid " a change number of alternate cylinders"
msgstr ""
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
msgid " c change number of cylinders"
msgstr ""
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
msgid " d print the raw data in the partition table"
msgstr ""
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
msgid " e change number of extra sectors per cylinder"
msgstr ""
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
msgid " h change number of heads"
msgstr ""
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
msgid " i change interleave factor"
msgstr ""
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
msgid " o change rotation speed (rpm)"
msgstr ""
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
msgid " s change number of sectors/track"
msgstr ""
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
msgid " y change number of physical cylinders"
msgstr ""
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
msgid " b move beginning of data in a partition"
msgstr ""
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
msgid " e list extended partitions"
msgstr ""
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
msgid " g create an IRIX (SGI) partition table"
msgstr ""
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
msgid " f fix partition order"
msgstr ""
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
msgid " i change the disk identifier"
msgstr ""
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
#, c-format
msgid "You must set"
msgstr ""
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
msgid "heads"
msgstr ""
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
msgid "sectors"
msgstr ""
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
#, c-format
msgid ""
"%s%s.\n"
"You can do this from the extra functions menu.\n"
msgstr ""
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
msgid " and "
msgstr ""
-#: fdisk/fdisk.c:747
-#, c-format
-msgid ""
-"\n"
-"The number of cylinders for this disk is set to %d.\n"
-"There is nothing wrong with that, but this is larger than 1024,\n"
-"and could in certain setups cause problems with:\n"
-"1) software that runs at boot time (e.g., old versions of LILO)\n"
-"2) booting and partitioning software from other OSs\n"
-" (e.g., DOS FDISK, OS/2 FDISK)\n"
-msgstr ""
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
#, c-format
msgid ""
"\n"
@@ -2963,70 +3007,69 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
#, c-format
msgid ""
"\n"
"The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
msgstr ""
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
#, c-format
msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
"\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+" switch off the mode (with command 'c')."
msgstr ""
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
#, c-format
msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
"\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+" change units to sectors.\n"
msgstr ""
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
#, c-format
msgid "Bad offset in primary extended partition\n"
msgstr ""
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
#, c-format
msgid ""
"Warning: omitting partitions after #%d.\n"
"They will be deleted if you save this partition table.\n"
msgstr ""
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr ""
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr ""
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
#, c-format
msgid "omitting empty partition (%d)\n"
msgstr ""
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
#, c-format
msgid "Disk identifier: 0x%08x\n"
msgstr ""
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
#, c-format
msgid "New disk identifier (current 0x%08x): "
msgstr ""
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
#, c-format
msgid ""
"Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3035,152 +3078,148 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
#, c-format
msgid "You will not be able to write the partition table.\n"
msgstr ""
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
#, c-format
msgid ""
"This disk has both DOS and BSD magic.\n"
"Give the 'b' command to go to BSD mode.\n"
msgstr ""
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
#, c-format
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
msgstr ""
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
#, c-format
msgid "Internal error\n"
msgstr ""
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
"(rite)\n"
msgstr ""
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
#, c-format
msgid ""
"\n"
"got EOF thrice - exiting..\n"
msgstr ""
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
msgid "Hex code (type L to list codes): "
msgstr ""
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
#, c-format
msgid "%s (%u-%u, default %u): "
msgstr ""
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
#, c-format
msgid "Unsupported suffix: '%s'.\n"
msgstr ""
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
#, c-format
msgid ""
"Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
" 2^N: K (KibiByte), M (MebiByte), G (GibiByte)\n"
msgstr ""
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
#, c-format
msgid "Using default value %u\n"
msgstr ""
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
#, c-format
msgid "Value out of range.\n"
msgstr ""
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
msgid "Partition number"
msgstr ""
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr ""
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
#, c-format
msgid "Selected partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
#, c-format
msgid "No partition is defined yet!\n"
msgstr ""
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
#, c-format
msgid "All primary partitions have been defined already!\n"
msgstr ""
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
msgid "cylinder"
msgstr ""
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
msgid "sector"
msgstr ""
-#: fdisk/fdisk.c:1548
+#: fdisk/fdisk.c:1614
#, c-format
-msgid "Changing display/entry units to %s\n"
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
msgstr ""
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1616
+#, c-format
+msgid "Changing display/entry units to sectors\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1626
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr ""
-#: fdisk/fdisk.c:1569
+#: fdisk/fdisk.c:1636
#, c-format
-msgid "DOS Compatibility flag is set\n"
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
msgstr ""
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
#, c-format
msgid "DOS Compatibility flag is not set\n"
msgstr ""
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr ""
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
#, c-format
msgid ""
"Type 0 means free space to many systems\n"
@@ -3189,14 +3228,14 @@ msgid ""
"a partition using the `d' command.\n"
msgstr ""
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
#, c-format
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
msgstr ""
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
#, c-format
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
@@ -3204,7 +3243,7 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
#, c-format
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
@@ -3212,113 +3251,118 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr ""
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
#, c-format
msgid "System type of partition %d is unchanged: %x (%s)\n"
msgstr ""
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr ""
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr ""
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr ""
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr ""
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
#, c-format
msgid "Partition %i does not end on cylinder boundary.\n"
msgstr ""
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
#, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
msgstr ""
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
#, c-format
msgid ""
"\n"
"Disk %s: %ld MB, %lld bytes\n"
msgstr ""
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
#, c-format
msgid ""
"\n"
"Disk %s: %ld.%ld GB, %lld bytes\n"
msgstr ""
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
#, c-format
msgid "%d heads, %llu sectors/track, %d cylinders"
msgstr ""
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
#, c-format
msgid ", total %llu sectors"
msgstr ""
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
#, c-format
msgid "Units = %s of %d * %d = %d bytes\n"
msgstr ""
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
#, c-format
msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
msgstr ""
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
#, c-format
msgid "Alignment offset: %lu bytes\n"
msgstr ""
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
#, c-format
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
#, fuzzy, c-format
msgid "Done.\n"
msgstr "完成\n"
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
#, c-format
msgid ""
"This doesn't look like a partition table\n"
@@ -3326,23 +3370,23 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr ""
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
msgid "Device"
msgstr ""
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
#, c-format
msgid ""
"\n"
"Partition table entries are not in disk order\n"
msgstr ""
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
#, c-format
msgid ""
"\n"
@@ -3350,87 +3394,87 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
#, c-format
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr ""
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr ""
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
#, c-format
msgid "Partition %d: sector %d greater than maximum %llu\n"
msgstr ""
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr ""
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr ""
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
#, c-format
msgid "Total allocated sectors %llu greater than the maximum %llu\n"
msgstr ""
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
#, c-format
msgid "Remaining %lld unallocated %d-byte sectors\n"
msgstr ""
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
#, c-format
msgid "Sector %llu is already allocated\n"
msgstr ""
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
#, c-format
msgid "No free sectors available\n"
msgstr ""
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
#, c-format
msgid "Last %1$s, +%2$s or +size{K,M,G}"
msgstr ""
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
#, c-format
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3439,7 +3483,7 @@ msgid ""
"\tWARNING: This will destroy the present disk contents.\n"
msgstr ""
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
#, c-format
msgid ""
"\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3448,22 +3492,22 @@ msgid ""
"\tWARNING: This will destroy the present disk contents.\n"
msgstr ""
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
#, c-format
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
#, c-format
msgid "All logical partitions are in use\n"
msgstr ""
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
#, c-format
msgid "Adding a primary partition\n"
msgstr ""
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
#, c-format
msgid ""
"Command action\n"
@@ -3471,32 +3515,32 @@ msgid ""
" p primary partition (1-4)\n"
msgstr ""
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
msgid "l logical (5 or over)"
msgstr ""
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
msgid "e extended"
msgstr ""
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr ""
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
#, c-format
msgid ""
"The partition table has been altered!\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
#, c-format
msgid "Calling ioctl() to re-read partition table.\n"
msgstr ""
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
#, c-format
msgid ""
"\n"
@@ -3505,7 +3549,7 @@ msgid ""
"the next reboot or after you run partprobe(8) or kpartx(8)\n"
msgstr ""
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
#, c-format
msgid ""
"\n"
@@ -3514,49 +3558,49 @@ msgid ""
"information.\n"
msgstr ""
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
#, c-format
msgid ""
"\n"
"Error closing file\n"
msgstr ""
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
#, c-format
msgid "Syncing disks.\n"
msgstr ""
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
#, c-format
msgid "Partition %d has no data area\n"
msgstr ""
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
msgid "New beginning of data"
msgstr ""
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
msgid "Expert command (m for help): "
msgstr ""
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
msgid "Number of cylinders"
msgstr ""
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
msgid "Number of heads"
msgstr ""
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
msgid "Number of sectors"
msgstr ""
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
#, c-format
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
#, c-format
msgid ""
"\n"
@@ -3565,64 +3609,64 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr ""
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
#, c-format
msgid "Cannot open %s\n"
msgstr ""
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
#, c-format
msgid "cannot open %s\n"
msgstr ""
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
#, c-format
msgid "%c: unknown command\n"
msgstr ""
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
#, c-format
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
#, c-format
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
msgstr ""
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
#, c-format
msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
msgid "Command (m for help): "
msgstr ""
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
#, c-format
msgid ""
"\n"
"The current boot file is: %s\n"
msgstr ""
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
msgid "Please enter the name of the new boot file: "
msgstr ""
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
#, c-format
msgid "Boot file unchanged\n"
msgstr ""
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
#, c-format
msgid ""
"\n"
@@ -3699,15 +3743,15 @@ msgstr ""
msgid "SGI xvm"
msgstr ""
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
msgid "Linux swap"
msgstr ""
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
msgid "Linux native"
msgstr ""
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
msgid "Linux LVM"
msgstr ""
@@ -3811,7 +3855,7 @@ msgstr ""
msgid "More than one entire disk entry present.\n"
msgstr ""
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
#, c-format
msgid "No partitions defined\n"
msgstr ""
@@ -3900,7 +3944,7 @@ msgid ""
"Type YES if you are sure about tagging this partition differently.\n"
msgstr ""
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
msgid "YES\n"
msgstr ""
@@ -3950,7 +3994,7 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
#, c-format
msgid ""
"Warning: BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %"
@@ -3968,55 +4012,55 @@ msgstr ""
msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
msgid "Unassigned"
msgstr ""
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
msgid "SunOS root"
msgstr ""
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
msgid "SunOS swap"
msgstr ""
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
msgid "SunOS usr"
msgstr ""
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
msgid "Whole disk"
msgstr ""
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
msgid "SunOS stand"
msgstr ""
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
msgid "SunOS var"
msgstr ""
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
msgid "SunOS home"
msgstr ""
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
msgid "SunOS alt sectors"
msgstr ""
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
msgid "SunOS cachefs"
msgstr ""
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
msgid "SunOS reserved"
msgstr ""
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
msgid "Linux raid autodetect"
msgstr ""
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
#, c-format
msgid ""
"Detected sun disklabel with wrong checksum.\n"
@@ -4025,28 +4069,28 @@ msgid ""
"or force a fresh label (s command in main menu)\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
#, c-format
msgid "Detected sun disklabel with wrong version [0x%08x].\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
#, c-format
msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
#, c-format
msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
#, c-format
msgid ""
"Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
#, c-format
msgid ""
"Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4055,50 +4099,50 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
msgid "Sectors/track"
msgstr ""
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
#, c-format
msgid "Partition %d doesn't end on cylinder boundary\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
#, c-format
msgid "Partition %d overlaps with others in sectors %d-%d\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
#, c-format
msgid "Unused gap - sectors 0-%d\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
#, c-format
msgid "Unused gap - sectors %d-%d\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
#, c-format
msgid ""
"Other partitions already cover the whole disk.\n"
"Delete some/shrink them before retry.\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
#, c-format
msgid ""
"It is highly recommended that the third partition covers the whole disk\n"
"and is of type `Whole disk'\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
#, c-format
msgid "Sector %d is already allocated\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
#, c-format
msgid ""
"You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4106,14 +4150,14 @@ msgid ""
"to %d %s\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
#, c-format
msgid ""
"If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
"partition as Whole disk (5), starting at 0, with %u sectors\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
msgid ""
"It is highly recommended that the partition at offset 0\n"
"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4122,12 +4166,12 @@ msgid ""
"tagged with 82 (Linux swap): "
msgstr ""
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
#, c-format
msgid ""
"\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
"%d extra sects/cyl, interleave %d:1\n"
"Label ID: %s\n"
"Volume ID: %s\n"
@@ -4135,37 +4179,37 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
#, c-format
msgid ""
"\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
#, c-format
msgid "%*s Flag Start End Blocks Id System\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
msgid "Number of alternate cylinders"
msgstr ""
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
msgid "Extra sectors per cylinder"
msgstr ""
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
msgid "Interleave factor"
msgstr ""
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
msgid "Rotation speed (rpm)"
msgstr ""
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
msgid "Number of physical cylinders"
msgstr ""
@@ -4374,6 +4418,10 @@ msgstr ""
msgid "Linux swap / Solaris"
msgstr ""
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr ""
+
#: fdisk/i386_sys_types.c:58
msgid "OS/2 hidden C: drive"
msgstr ""
@@ -4952,248 +5000,248 @@ msgstr ""
msgid "Failed saving the old sectors - aborting\n"
msgstr ""
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
#, c-format
msgid "Failed writing the partition on %s\n"
msgstr ""
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
msgid "long or incomplete input line - quitting\n"
msgstr ""
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
#, c-format
msgid "input error: `=' expected after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
#, c-format
msgid "input error: unexpected character %c after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
#, c-format
msgid "unrecognized input: %s\n"
msgstr ""
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
msgid "number too big\n"
msgstr ""
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
msgid "trailing junk after number\n"
msgstr ""
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
msgid "no room for partition descriptor\n"
msgstr ""
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
msgid "cannot build surrounding extended partition\n"
msgstr ""
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
msgid "too many input fields\n"
msgstr ""
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
msgid "No room for more\n"
msgstr ""
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
msgid "Illegal type\n"
msgstr ""
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
#, c-format
msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
msgid "Warning: empty partition\n"
msgstr ""
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
#, c-format
msgid "Warning: bad partition start (earliest %lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
msgid "unrecognized bootable flag - choose - or *\n"
msgstr ""
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
msgid "partial c,h,s specification?\n"
msgstr ""
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
msgid "Extended partition not where expected\n"
msgstr ""
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
msgid "bad input\n"
msgstr ""
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
msgid "too many partitions\n"
msgstr ""
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
msgid ""
"Input in the following format; absent fields get a default value.\n"
"<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
"Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
msgstr ""
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
#, c-format
msgid "Usage: %s [options] device ...\n"
msgstr ""
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
msgid "device: something like /dev/hda or /dev/sda"
msgstr ""
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
msgid "useful options:"
msgstr ""
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
msgid " -s [or --show-size]: list size of a partition"
msgstr ""
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
msgid " -c [or --id]: print or change partition Id"
msgstr ""
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
msgid " -l [or --list]: list partitions of each device"
msgstr ""
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
msgid " -d [or --dump]: idem, but in a format suitable for later input"
msgstr ""
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
msgid " -i [or --increment]: number cylinders etc. from 1 instead of from 0"
msgstr ""
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
msgid ""
" -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/"
"MB"
msgstr ""
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
msgid " -T [or --list-types]:list the known partition types"
msgstr ""
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
msgid " -D [or --DOS]: for DOS-compatibility: waste a little space"
msgstr ""
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
msgid " -R [or --re-read]: make kernel reread partition table"
msgstr ""
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
msgid " -N# : change only the partition with number #"
msgstr ""
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
msgid " -n : do not actually write to disk"
msgstr ""
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
msgid ""
" -O file : save the sectors that will be overwritten to file"
msgstr ""
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
msgid " -I file : restore these sectors again"
msgstr ""
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
msgid " -v [or --version]: print version"
msgstr ""
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
msgid " -? [or --help]: print this message"
msgstr ""
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
msgid "dangerous options:"
msgstr ""
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
msgid " -g [or --show-geometry]: print the kernel's idea of the geometry"
msgstr ""
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
msgid ""
" -G [or --show-pt-geometry]: print geometry guessed from the partition "
"table"
msgstr ""
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
msgid ""
" -x [or --show-extended]: also list extended partitions on output\n"
" or expect descriptors for them on input"
msgstr ""
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
msgid ""
" -L [or --Linux]: do not complain about things irrelevant for Linux"
msgstr ""
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
msgid " -q [or --quiet]: suppress warning messages"
msgstr ""
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
msgid " You can override the detected geometry using:"
msgstr ""
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
msgid " -C# [or --cylinders #]:set the number of cylinders to use"
msgstr ""
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
msgid " -H# [or --heads #]: set the number of heads to use"
msgstr ""
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
msgid " -S# [or --sectors #]: set the number of sectors to use"
msgstr ""
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
msgid "You can disable all consistency checking with:"
msgstr ""
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
msgid " -f [or --force]: do what I say, even if it is stupid"
msgstr ""
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
msgid "Usage:"
msgstr ""
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
#, c-format
msgid "%s device\t\t list active partitions on device\n"
msgstr ""
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
#, c-format
msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
msgstr ""
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
#, c-format
msgid "%s -An device\t activate partition n, inactivate the other ones\n"
msgstr ""
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
#, c-format
msgid ""
"\n"
@@ -5202,108 +5250,108 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
#, c-format
msgid "Use the --force flag to overrule this check.\n"
msgstr ""
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
msgid "no command?\n"
msgstr ""
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
#, c-format
msgid "total: %llu blocks\n"
msgstr ""
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
msgid "usage: sfdisk --print-id device partition-number\n"
msgstr ""
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
msgid "usage: sfdisk --change-id device partition-number Id\n"
msgstr ""
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
msgid "usage: sfdisk --id device partition-number [Id]\n"
msgstr ""
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
msgid "can specify only one device (except with -l or -s)\n"
msgstr ""
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
#, c-format
msgid "cannot open %s read-write\n"
msgstr ""
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
#, c-format
msgid "cannot open %s for reading\n"
msgstr ""
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
#, c-format
msgid "%s: OK\n"
msgstr ""
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
#, c-format
msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
msgstr ""
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
#, c-format
msgid "Cannot get size of %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
#, c-format
msgid "bad active byte: 0x%x instead of 0x80\n"
msgstr ""
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
msgid ""
"Done\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
#, c-format
msgid ""
"You have %d active primary partitions. This does not matter for LILO,\n"
"but the DOS MBR will only boot a disk with 1 active partition.\n"
msgstr ""
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
#, c-format
msgid "partition %s has id %x and is not hidden\n"
msgstr ""
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
#, c-format
msgid "Bad Id %lx\n"
msgstr ""
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
msgid "This disk is currently in use.\n"
msgstr ""
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
#, c-format
msgid "Fatal error: cannot find %s\n"
msgstr ""
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
#, c-format
msgid "Warning: %s is not a block device\n"
msgstr ""
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
msgid "Checking that no-one is using this disk right now ...\n"
msgstr ""
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
msgid ""
"\n"
"This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5311,90 +5359,90 @@ msgid ""
"Use the --no-reread flag to suppress this check.\n"
msgstr ""
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
msgid "Use the --force flag to overrule all checks.\n"
msgstr ""
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
msgid "OK\n"
msgstr ""
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
#, c-format
msgid "Old situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
#, c-format
msgid "Partition %d does not exist, cannot change it\n"
msgstr ""
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
#, c-format
msgid "New situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
msgid ""
"I don't like these partitions - nothing changed.\n"
"(If you really want this, use the --force option.)\n"
msgstr ""
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
msgid "I don't like this - probably you should answer No\n"
msgstr ""
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
#, c-format
msgid "Are you satisfied with this? [ynq] "
msgstr ""
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
#, c-format
msgid "Do you want to write this to disk? [ynq] "
msgstr ""
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
#, c-format
msgid ""
"\n"
"sfdisk: premature end of input\n"
msgstr ""
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
msgid "Quitting - nothing changed\n"
msgstr ""
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
#, c-format
msgid "Please answer one of y,n,q\n"
msgstr ""
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
#, c-format
msgid ""
"Successfully wrote the new partition table\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
msgid ""
"If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
"to zero the first 512 bytes: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
"(See fdisk(8).)\n"
msgstr ""
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr ""
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr ""
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
msgid ""
"WARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
@@ -5402,113 +5450,113 @@ msgid ""
"\n"
msgstr ""
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
#, c-format
msgid "fsck: %s: not found\n"
msgstr ""
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr ""
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr ""
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr ""
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr ""
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr ""
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
msgstr ""
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
msgid "Couldn't allocate memory for filesystem types\n"
msgstr ""
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
#, c-format
msgid ""
"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
"number\n"
msgstr ""
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
#, c-format
msgid "%s: skipping nonexistent device\n"
msgstr ""
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr ""
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
msgid "Checking all file systems.\n"
msgstr ""
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr ""
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
msgid ""
"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
msgstr ""
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
#, fuzzy, c-format
msgid "%s: too many devices\n"
msgstr "%s:不是一个块设备\n"
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
#, c-format
msgid "Couldn't open %s: %s\n"
msgstr ""
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
#, c-format
msgid "Is /proc mounted?\n"
msgstr ""
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
#, c-format
msgid "Must be root to scan for matching filesystems: %s\n"
msgstr ""
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
#, c-format
msgid "Couldn't find matching filesystem: %s\n"
msgstr ""
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
#, fuzzy, c-format
msgid "%s: too many arguments\n"
msgstr "%s 需要一个参数\n"
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
#, c-format
msgid "fsck from %s\n"
msgstr ""
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
#, fuzzy, c-format
msgid "%s: Unable to allocate memory for fsck_path\n"
msgstr "不能为 inodes 分配缓冲区"
@@ -5969,7 +6017,13 @@ msgstr ""
msgid "Unable to set system clock.\n"
msgstr ""
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
#, c-format
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5978,39 +6032,39 @@ msgid ""
"(and thus is presumably not running on an Alpha now). No action taken.\n"
msgstr ""
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
#, c-format
msgid "Unable to get the epoch value from the kernel.\n"
msgstr ""
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr ""
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
#, c-format
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
msgstr ""
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr ""
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
#, c-format
msgid "Unable to set the epoch value in the kernel.\n"
msgstr ""
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
#, c-format
msgid "%s from %s\n"
msgstr ""
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -6029,6 +6083,7 @@ msgid ""
" --getepoch print out the kernel's hardware clock epoch value\n"
" --setepoch set the kernel's hardware clock epoch value to the \n"
" value given with --epoch\n"
+" --predict predict rtc reading at time given with --date\n"
" -v | --version print out the version of hwclock to stdout\n"
"\n"
"Options: \n"
@@ -6050,7 +6105,7 @@ msgid ""
"\n"
msgstr ""
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
#, c-format
msgid ""
" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6058,77 +6113,77 @@ msgid ""
"\n"
msgstr ""
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
#, c-format
msgid "%s: Unable to connect to audit system\n"
msgstr ""
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr ""
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
#, c-format
msgid ""
"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
"both.\n"
msgstr ""
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
#, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
"specified both.\n"
msgstr ""
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
#, c-format
msgid ""
"%s: The --adjfile and --noadjfile options are mutually exclusive. You "
"specified both.\n"
msgstr ""
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
#, c-format
msgid "No usable set-to time. Cannot set clock.\n"
msgstr ""
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
#, c-format
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr ""
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
#, c-format
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr ""
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
#, c-format
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
msgstr ""
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
#, c-format
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr ""
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
#, c-format
msgid ""
"Use the --debug option to see the details of our search for an access "
@@ -6408,12 +6463,12 @@ msgstr ""
msgid "Changing finger information for %s.\n"
msgstr ""
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
#, c-format
msgid "%s: PAM failure, aborting: %s\n"
msgstr ""
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
#: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
#: mount/lomount.c:745
msgid "Password: "
@@ -6627,244 +6682,249 @@ msgstr ""
msgid "FATAL: can't reopen tty: %s"
msgstr ""
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr ""
+
+#: login-utils/login.c:238
msgid "FATAL: bad tty"
msgstr ""
-#: login-utils/login.c:436
+#: login-utils/login.c:445
#, c-format
msgid "login: -h for super-user only.\n"
msgstr ""
-#: login-utils/login.c:479
+#: login-utils/login.c:488
#, c-format
msgid "usage: login [-fp] [username]\n"
msgstr ""
-#: login-utils/login.c:574
+#: login-utils/login.c:578
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr ""
-#: login-utils/login.c:591
+#: login-utils/login.c:595
msgid "login: "
msgstr ""
-#: login-utils/login.c:635
+#: login-utils/login.c:639
#, c-format
msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:640
+#: login-utils/login.c:644
#, c-format
msgid ""
"Login incorrect\n"
"\n"
msgstr ""
-#: login-utils/login.c:649
+#: login-utils/login.c:653
#, c-format
msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:653
+#: login-utils/login.c:657
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:658
+#: login-utils/login.c:662
#, c-format
msgid ""
"\n"
"Login incorrect\n"
msgstr ""
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
#, c-format
msgid ""
"\n"
"Session setup problem, abort.\n"
msgstr ""
-#: login-utils/login.c:687
+#: login-utils/login.c:691
#, c-format
msgid "NULL user name in %s:%d. Abort."
msgstr ""
-#: login-utils/login.c:694
+#: login-utils/login.c:698
#, c-format
msgid "Invalid user name \"%s\" in %s:%d. Abort."
msgstr ""
-#: login-utils/login.c:713
+#: login-utils/login.c:717
#, c-format
msgid "login: Out of memory\n"
msgstr ""
-#: login-utils/login.c:757
+#: login-utils/login.c:761
msgid "Illegal username"
msgstr ""
-#: login-utils/login.c:800
+#: login-utils/login.c:804
#, c-format
msgid "%s login refused on this terminal.\n"
msgstr ""
-#: login-utils/login.c:805
+#: login-utils/login.c:809
#, c-format
msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
msgstr ""
-#: login-utils/login.c:809
+#: login-utils/login.c:813
#, c-format
msgid "LOGIN %s REFUSED ON TTY %s"
msgstr ""
-#: login-utils/login.c:863
+#: login-utils/login.c:867
#, c-format
msgid "Login incorrect\n"
msgstr ""
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr ""
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr ""
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr ""
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr ""
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr ""
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
#, c-format
msgid "You have new mail.\n"
msgstr ""
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
#, c-format
msgid "You have mail.\n"
msgstr ""
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
#, c-format
msgid "login: failure forking: %s"
msgstr ""
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
#, c-format
msgid "TIOCSCTTY failed: %m"
msgstr ""
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
msgid "setuid() failed"
msgstr ""
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
#, c-format
msgid "No directory %s!\n"
msgstr ""
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr ""
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
#, c-format
msgid "login: no memory for shell script.\n"
msgstr ""
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
#, c-format
msgid "login: couldn't exec shell script: %s.\n"
msgstr ""
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
#, c-format
msgid "login: no shell: %s.\n"
msgstr ""
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
#, c-format
msgid ""
"\n"
"%s login: "
msgstr ""
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
#, c-format
msgid "login name much too long.\n"
msgstr ""
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
msgid "NAME too long"
msgstr ""
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
#, c-format
msgid "login names may not start with '-'.\n"
msgstr ""
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
#, c-format
msgid "too many bare linefeeds.\n"
msgstr ""
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
msgid "EXCESSIVE linefeeds"
msgstr ""
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
#, c-format
msgid "Login timed out after %d seconds\n"
msgstr ""
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
#, c-format
msgid "Last login: %.*s "
msgstr ""
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
#, c-format
msgid "from %.*s\n"
msgstr ""
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
#, c-format
msgid "on %.*s\n"
msgstr ""
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
#, c-format
msgid "LOGIN FAILURE FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
#, c-format
msgid "LOGIN FAILURE ON %s, %s"
msgstr ""
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
#, c-format
msgid "%d LOGIN FAILURES FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
#, c-format
msgid "%d LOGIN FAILURES ON %s, %s"
msgstr ""
@@ -7115,7 +7175,7 @@ msgstr ""
#: login-utils/simpleinit.c:938
#, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
msgstr ""
#: login-utils/simpleinit.c:950
@@ -7125,7 +7185,7 @@ msgstr ""
#: login-utils/simpleinit.c:1070
#, c-format
-msgid "error running programme: \"%s\"\n"
+msgid "error at starting service \"%s\"\n"
msgstr ""
#: login-utils/ttymsg.c:75
@@ -7252,25 +7312,25 @@ msgstr ""
msgid "%s: can't read temporary file.\n"
msgstr ""
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
#, c-format
msgid "illegal day value: use 1-%d"
msgstr ""
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
msgid "illegal month value: use 1-12"
msgstr ""
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
msgid "illegal year value: use 1-9999"
msgstr ""
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
#, c-format
msgid "%s %d"
msgstr ""
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
#, c-format
msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
msgstr ""
@@ -7294,6 +7354,109 @@ msgstr ""
msgid "unable to resolve '%s'"
msgstr "不能读 inodes"
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: 未知命令: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "不能为 inodes 分配缓冲区"
+
+#: misc-utils/findmnt.c:359
+msgid "failed to initialize libmount tab"
+msgstr ""
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s 失败.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: %s ioctl 错误\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab search in static table of filesystems\n"
+" -m, --mtab search in table of mounted filesystems\n"
+" -k, --kernel search in kernel table of mounted \n"
+" filesystems (default)\n"
+"\n"
+" -c, --canonicalize canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only print the first found filesystem only\n"
+" -h, --help print this help\n"
+" -i, --invert invert sense of matching\n"
+" -l, --list use list format ouput\n"
+" -n, --noheadings don't print headings\n"
+" -u, --notruncate don't truncate text in columns\n"
+" -O, --options <list> limit the set of filesystems by mount options\n"
+" -o, --output <list> output columns\n"
+" -r, --raw use raw format output\n"
+" -a, --ascii use ascii chars for tree formatting\n"
+" -t, --types <list> limit the set of filesystem by FS types\n"
+" -S, --source <string> device, LABEL= or UUID=device\n"
+" -T, --target <string> mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "%s: 未知命令: %s\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+msgid "failed to initialize libmount iterator"
+msgstr ""
+
+#: misc-utils/findmnt.c:685
+msgid "failed to initialize libmount cache"
+msgstr ""
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "不能为 inodes 分配缓冲区"
+
+#: misc-utils/findmnt.c:707
+msgid "failed to initialize output column"
+msgstr ""
+
#: misc-utils/kill.c:207
#, c-format
msgid "%s: unknown signal %s\n"
@@ -7443,7 +7606,7 @@ msgstr ""
msgid "call: %s from to files...\n"
msgstr ""
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
#, c-format
msgid ""
"Warning: `%s' is a link.\n"
@@ -7451,54 +7614,54 @@ msgid ""
"Script not started.\n"
msgstr ""
-#: misc-utils/script.c:173
+#: misc-utils/script.c:182
#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
msgstr ""
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
#, c-format
msgid "Script started, file is %s\n"
msgstr ""
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
#, c-format
msgid "%s: write error %d: %s\n"
msgstr ""
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
#, c-format
msgid "Script started on %s"
msgstr ""
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
#, c-format
msgid "%s: write error: %s\n"
msgstr ""
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
#, c-format
msgid "%s: cannot write script file, error: %s\n"
msgstr ""
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
#, c-format
msgid ""
"\n"
"Script done on %s"
msgstr ""
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
#, c-format
msgid "Script done, file is %s\n"
msgstr ""
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
#, c-format
msgid "openpty failed\n"
msgstr ""
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
#, c-format
msgid "Out of pty's\n"
msgstr ""
@@ -7837,6 +8000,16 @@ msgstr ""
msgid "bad response length"
msgstr ""
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "不能读 inodes"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "不能读 inodes"
+
#: misc-utils/uuidd.c:268
#, c-format
msgid "uuidd daemon already running at pid %s\n"
@@ -7867,6 +8040,11 @@ msgstr ""
msgid "operation %d, incoming num = %d\n"
msgstr ""
+#: misc-utils/uuidd.c:362
+#, c-format
+msgid "operation %d\n"
+msgstr ""
+
#: misc-utils/uuidd.c:378
#, c-format
msgid "Generated time UUID: %s\n"
@@ -7884,7 +8062,7 @@ msgstr ""
#: misc-utils/uuidd.c:415
#, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
msgstr ""
#: misc-utils/uuidd.c:427
@@ -7904,12 +8082,12 @@ msgstr ""
#: misc-utils/uuidd.c:534
#, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
msgstr ""
#: misc-utils/uuidd.c:536
#, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
msgstr ""
#: misc-utils/uuidd.c:557
@@ -7937,82 +8115,80 @@ msgstr "用法: %s [ -n ] device\n"
msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
msgstr ""
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
msgid "calloc failed"
msgstr ""
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
#, fuzzy
msgid "strdup failed"
msgstr "%s 失败.\n"
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, c-format
+msgid "error: %s: probing initialization failed"
+msgstr ""
+
+#: misc-utils/wipefs.c:213
+#, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
msgstr ""
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
#, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
msgstr ""
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
#, c-format
msgid "%s: failed to seek to offset 0x%jx"
msgstr ""
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
#, fuzzy, c-format
msgid "%s: write failed"
msgstr "%s 失败.\n"
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
#, c-format
msgid "%zd bytes ["
msgstr ""
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
#, c-format
msgid "] erased at offset 0x%jx (%s)\n"
msgstr ""
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
#, fuzzy, c-format
msgid "%s: open failed"
msgstr "%s 失败.\n"
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
#, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
msgstr ""
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
#, c-format
msgid ""
" -a, --all wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help this help\n"
-" -n, --no-act everything to be done except for the write() call\n"
+" -h, --help show this help text\n"
+" -n, --no-act do everything except the actual write() call\n"
" -o, --offset <num> offset to erase, in bytes\n"
" -p, --parsable print out in parsable instead of printable format\n"
msgstr ""
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
#, c-format
msgid ""
"\n"
"For more information see wipefs(8).\n"
msgstr ""
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
msgid "--offset and --all are mutually exclusive"
msgstr ""
@@ -8249,7 +8425,7 @@ msgstr ""
msgid "This mount was compiled without loop support. Please recompile.\n"
msgstr ""
-#: mount/lomount.c:886
+#: mount/lomount.c:888
#, c-format
msgid ""
"\n"
@@ -8264,7 +8440,7 @@ msgid ""
" %1$s [ options ] {-f|--find|loopdev} <file> setup\n"
msgstr ""
-#: mount/lomount.c:896
+#: mount/lomount.c:898
#, c-format
msgid ""
"\n"
@@ -8280,389 +8456,428 @@ msgid ""
"\n"
msgstr ""
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1023
+#, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
#, c-format
msgid "Loop device is %s\n"
msgstr ""
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
#, c-format
msgid "stolen loop=%s...trying again\n"
msgstr ""
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
#, c-format
msgid "%s: %s: device is busy"
msgstr ""
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
#, c-format
msgid "No loop support was available at compile time. Please recompile.\n"
msgstr ""
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+" It's possible that information reported by mount(8) is not\n"
+" up to date. For actual information about system mount points\n"
+" check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
#, c-format
msgid "mount: improperly quoted option string '%s'"
msgstr ""
-#: mount/mount.c:362
+#: mount/mount.c:372
#, c-format
msgid "mount: translated %s '%s' to '%s'\n"
msgstr ""
-#: mount/mount.c:526
+#: mount/mount.c:536
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr ""
-#: mount/mount.c:531
+#: mount/mount.c:541
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr ""
-#: mount/mount.c:555
+#: mount/mount.c:565
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr ""
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
#, c-format
msgid "mount: error writing %s: %s"
msgstr ""
-#: mount/mount.c:580
+#: mount/mount.c:590
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr ""
-#: mount/mount.c:663
+#: mount/mount.c:683
#, c-format
msgid "mount: cannot set group id: %s"
msgstr ""
-#: mount/mount.c:666
+#: mount/mount.c:686
#, c-format
msgid "mount: cannot set user id: %s"
msgstr ""
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
#, c-format
msgid "mount: cannot fork: %s"
msgstr ""
-#: mount/mount.c:842
+#: mount/mount.c:865
#, c-format
msgid "Trying %s\n"
msgstr ""
-#: mount/mount.c:870
+#: mount/mount.c:893
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr ""
-#: mount/mount.c:873
+#: mount/mount.c:896
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr ""
-#: mount/mount.c:876
+#: mount/mount.c:899
#, c-format
msgid " and it looks like this is swapspace\n"
msgstr ""
-#: mount/mount.c:878
+#: mount/mount.c:901
#, c-format
msgid " I will try type %s\n"
msgstr ""
-#: mount/mount.c:902
+#: mount/mount.c:926
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr ""
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+" use -t <type> to explicitly specify the filesystem type or\n"
+" use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
msgid "mount failed"
msgstr ""
-#: mount/mount.c:995
+#: mount/mount.c:1024
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr ""
-#: mount/mount.c:1065
+#: mount/mount.c:1109
msgid "mount: loop device specified twice"
msgstr ""
-#: mount/mount.c:1070
+#: mount/mount.c:1114
msgid "mount: type specified twice"
msgstr ""
-#: mount/mount.c:1082
+#: mount/mount.c:1142
#, c-format
msgid "mount: skipping the setup of a loop device\n"
msgstr ""
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1155
+#, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1160
#, c-format
msgid "mount: according to mtab %s is already mounted on %s as loop"
msgstr ""
-#: mount/mount.c:1104
+#: mount/mount.c:1170
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr ""
-#: mount/mount.c:1113
+#: mount/mount.c:1179
#, c-format
msgid "mount: stolen loop=%s ...trying again\n"
msgstr ""
-#: mount/mount.c:1118
+#: mount/mount.c:1184
#, c-format
msgid "mount: stolen loop=%s"
msgstr ""
-#: mount/mount.c:1123
+#: mount/mount.c:1189
#, c-format
msgid "mount: failed setting up loop device\n"
msgstr ""
-#: mount/mount.c:1134
+#: mount/mount.c:1200
#, c-format
msgid "mount: setup loop device successfully\n"
msgstr ""
-#: mount/mount.c:1168
+#: mount/mount.c:1234
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr ""
-#: mount/mount.c:1185
+#: mount/mount.c:1251
#, c-format
msgid "mount: can't open %s: %s"
msgstr ""
-#: mount/mount.c:1206
+#: mount/mount.c:1272
msgid "mount: argument to -p or --pass-fd must be a number"
msgstr ""
-#: mount/mount.c:1219
+#: mount/mount.c:1285
#, c-format
msgid "mount: cannot open %s for setting speed"
msgstr ""
-#: mount/mount.c:1222
+#: mount/mount.c:1288
#, c-format
msgid "mount: cannot set speed: %s"
msgstr ""
-#: mount/mount.c:1314
+#: mount/mount.c:1379
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s\n"
msgstr ""
-#: mount/mount.c:1371
+#: mount/mount.c:1435
#, c-format
msgid "mount: warning: %s seems to be mounted read-write.\n"
msgstr ""
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr ""
+
+#: mount/mount.c:1482
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr ""
-#: mount/mount.c:1407
+#: mount/mount.c:1485
msgid "mount: you must specify the filesystem type"
msgstr ""
-#: mount/mount.c:1410
+#: mount/mount.c:1488
msgid "mount: mount failed"
msgstr ""
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr ""
-#: mount/mount.c:1418
+#: mount/mount.c:1496
msgid "mount: permission denied"
msgstr ""
-#: mount/mount.c:1420
+#: mount/mount.c:1498
msgid "mount: must be superuser to use mount"
msgstr ""
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
#, c-format
msgid "mount: %s is busy"
msgstr ""
-#: mount/mount.c:1430
+#: mount/mount.c:1508
msgid "mount: proc already mounted"
msgstr ""
-#: mount/mount.c:1432
+#: mount/mount.c:1510
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr ""
-#: mount/mount.c:1438
+#: mount/mount.c:1516
#, c-format
msgid "mount: mount point %s does not exist"
msgstr ""
-#: mount/mount.c:1440
+#: mount/mount.c:1518
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr ""
-#: mount/mount.c:1445
+#: mount/mount.c:1523
#, c-format
msgid "mount: special device %s does not exist"
msgstr ""
-#: mount/mount.c:1457
+#: mount/mount.c:1535
#, c-format
msgid ""
"mount: special device %s does not exist\n"
" (a path prefix is not a directory)\n"
msgstr ""
-#: mount/mount.c:1469
+#: mount/mount.c:1547
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr ""
-#: mount/mount.c:1471
+#: mount/mount.c:1549
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
" missing codepage or helper program, or other error"
msgstr ""
-#: mount/mount.c:1478
+#: mount/mount.c:1556
msgid ""
" (for several filesystems (e.g. nfs, cifs) you might\n"
" need a /sbin/mount.<type> helper program)"
msgstr ""
-#: mount/mount.c:1487
+#: mount/mount.c:1565
msgid ""
" (could this be the IDE device where you in fact use\n"
" ide-scsi so that sr0 or sda or so is needed?)"
msgstr ""
-#: mount/mount.c:1492
+#: mount/mount.c:1570
msgid ""
" (aren't you trying to mount an extended partition,\n"
" instead of some logical partition inside?)"
msgstr ""
-#: mount/mount.c:1499
+#: mount/mount.c:1577
msgid ""
" In some cases useful info is found in syslog - try\n"
" dmesg | tail or so\n"
msgstr ""
-#: mount/mount.c:1505
+#: mount/mount.c:1583
msgid "mount table full"
msgstr ""
-#: mount/mount.c:1507
+#: mount/mount.c:1585
#, c-format
msgid "mount: %s: can't read superblock"
msgstr ""
-#: mount/mount.c:1513
+#: mount/mount.c:1591
#, c-format
msgid "mount: %s: unknown device"
msgstr ""
-#: mount/mount.c:1518
+#: mount/mount.c:1596
#, c-format
msgid "mount: unknown filesystem type '%s'"
msgstr ""
-#: mount/mount.c:1530
+#: mount/mount.c:1608
#, c-format
msgid "mount: probably you meant %s"
msgstr ""
-#: mount/mount.c:1533
+#: mount/mount.c:1611
msgid "mount: maybe you meant 'iso9660'?"
msgstr ""
-#: mount/mount.c:1536
+#: mount/mount.c:1614
msgid "mount: maybe you meant 'vfat'?"
msgstr ""
-#: mount/mount.c:1539
+#: mount/mount.c:1617
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
-#: mount/mount.c:1547
+#: mount/mount.c:1625
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr ""
-#: mount/mount.c:1549
+#: mount/mount.c:1627
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
-" (maybe `insmod driver'?)"
+" (maybe `modprobe driver'?)"
msgstr ""
-#: mount/mount.c:1552
+#: mount/mount.c:1630
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr ""
-#: mount/mount.c:1555
+#: mount/mount.c:1633
#, c-format
msgid "mount: %s is not a block device"
msgstr ""
-#: mount/mount.c:1560
+#: mount/mount.c:1638
#, c-format
msgid "mount: %s is not a valid block device"
msgstr ""
-#: mount/mount.c:1563
+#: mount/mount.c:1641
msgid "block device "
msgstr ""
-#: mount/mount.c:1565
+#: mount/mount.c:1643
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr ""
-#: mount/mount.c:1569
+#: mount/mount.c:1647
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr ""
-#: mount/mount.c:1573
+#: mount/mount.c:1651
#, c-format
msgid "mount: cannot remount %s%s read-write, is write-protected"
msgstr ""
-#: mount/mount.c:1588
+#: mount/mount.c:1666
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr ""
-#: mount/mount.c:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr ""
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
#, c-format
msgid "mount: no medium found on %s"
msgstr ""
-#: mount/mount.c:1622
+#: mount/mount.c:1692
#, c-format
msgid ""
"mount: %s does not contain SELinux labels.\n"
@@ -8672,22 +8887,22 @@ msgid ""
" this file system. For more details see restorecon(8) and mount(8).\n"
msgstr ""
-#: mount/mount.c:1701
+#: mount/mount.c:1771
#, c-format
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
-#: mount/mount.c:1707
+#: mount/mount.c:1777
#, c-format
msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
msgstr ""
-#: mount/mount.c:1802
+#: mount/mount.c:1872
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr ""
-#: mount/mount.c:1937
+#: mount/mount.c:2007
#, c-format
msgid ""
"Usage: mount -V : print version\n"
@@ -8724,39 +8939,39 @@ msgid ""
"For many more details, say man 8 mount .\n"
msgstr ""
-#: mount/mount.c:2265
+#: mount/mount.c:2335
#, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
msgstr ""
-#: mount/mount.c:2268
+#: mount/mount.c:2338
msgid "mount: only root can do that"
msgstr ""
-#: mount/mount.c:2279
+#: mount/mount.c:2349
msgid "nothing was mounted"
msgstr ""
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
msgid "mount: no such partition found"
msgstr ""
-#: mount/mount.c:2300
+#: mount/mount.c:2370
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr ""
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
#, c-format
msgid "[mntent]: warning: no final newline at the end of %s\n"
msgstr ""
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
#, c-format
msgid "[mntent]: line %d in %s is bad%s\n"
msgstr ""
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
msgid "; rest of file ignored"
msgstr ""
@@ -8769,7 +8984,7 @@ msgstr ""
msgid "not enough memory"
msgstr ""
-#: mount/swapon.c:84
+#: mount/swapon.c:85
#, c-format
msgid ""
"The <special> parameter:\n"
@@ -8780,7 +8995,7 @@ msgid ""
"\n"
msgstr ""
-#: mount/swapon.c:92
+#: mount/swapon.c:93
#, c-format
msgid ""
"\n"
@@ -8793,7 +9008,7 @@ msgid ""
"\n"
msgstr ""
-#: mount/swapon.c:106
+#: mount/swapon.c:107
#, c-format
msgid ""
"\n"
@@ -8805,124 +9020,129 @@ msgid ""
"\n"
msgstr ""
-#: mount/swapon.c:140
+#: mount/swapon.c:142
#, c-format
msgid "%s: unexpected file format"
msgstr ""
-#: mount/swapon.c:205
+#: mount/swapon.c:217
#, c-format
msgid "%s: reinitializing the swap."
msgstr ""
-#: mount/swapon.c:209
+#: mount/swapon.c:221
#, fuzzy
msgid "fork failed"
msgstr "查找失败"
-#: mount/swapon.c:225
+#: mount/swapon.c:237
#, fuzzy
msgid "execv failed"
msgstr "查找失败"
-#: mount/swapon.c:233
+#: mount/swapon.c:245
msgid "waitpid failed"
msgstr ""
-#: mount/swapon.c:257
+#: mount/swapon.c:269
#, fuzzy, c-format
msgid "%s: lseek failed"
msgstr "查找失败"
-#: mount/swapon.c:263
+#: mount/swapon.c:275
#, c-format
msgid "%s: write signature failed"
msgstr ""
-#: mount/swapon.c:350
+#: mount/swapon.c:362
#, c-format
msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
msgstr ""
-#: mount/swapon.c:355
+#: mount/swapon.c:367
msgid "different"
msgstr ""
-#: mount/swapon.c:355
+#: mount/swapon.c:367
msgid "same"
msgstr ""
-#: mount/swapon.c:370
+#: mount/swapon.c:382
#, fuzzy, c-format
msgid "%s: stat failed"
msgstr "%s 失败.\n"
-#: mount/swapon.c:380
+#: mount/swapon.c:392
#, c-format
msgid "%s: insecure permissions %04o, %04o suggested."
msgstr ""
-#: mount/swapon.c:388
+#: mount/swapon.c:400
#, c-format
msgid "%s: skipping - it appears to have holes."
msgstr ""
-#: mount/swapon.c:402
+#: mount/swapon.c:414
#, fuzzy, c-format
msgid "%s: get size failed"
msgstr "查找失败"
-#: mount/swapon.c:408
+#: mount/swapon.c:420
#, c-format
msgid "%s: read swap header failed"
msgstr ""
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
#, c-format
msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
msgstr ""
-#: mount/swapon.c:426
+#: mount/swapon.c:438
#, c-format
msgid "%s: swap format pagesize does not match."
msgstr ""
-#: mount/swapon.c:431
+#: mount/swapon.c:443
#, c-format
msgid ""
"%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
msgstr ""
-#: mount/swapon.c:440
+#: mount/swapon.c:452
#, c-format
msgid "%s: software suspend data detected. Rewriting the swap signature."
msgstr ""
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
#, c-format
msgid "%s on %s\n"
msgstr ""
-#: mount/swapon.c:486
+#: mount/swapon.c:498
#, fuzzy, c-format
msgid "%s: swapon failed"
msgstr "%s 失败.\n"
-#: mount/swapon.c:493
+#: mount/swapon.c:505
#, c-format
msgid "cannot find the device for %s"
msgstr ""
-#: mount/swapon.c:526
+#: mount/swapon.c:538
msgid "Not superuser."
msgstr ""
-#: mount/swapon.c:529
+#: mount/swapon.c:541
#, fuzzy, c-format
msgid "%s: swapoff failed"
msgstr "%s 失败.\n"
-#: mount/swapon.c:797
+#: mount/swapon.c:809
#, c-format
msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
msgstr ""
@@ -8932,37 +9152,37 @@ msgstr ""
msgid "umount: compiled without support for -f\n"
msgstr ""
-#: mount/umount.c:111
+#: mount/umount.c:114
#, c-format
msgid "umount: cannot set group id: %s"
msgstr ""
-#: mount/umount.c:114
+#: mount/umount.c:117
#, c-format
msgid "umount: cannot set user id: %s"
msgstr ""
-#: mount/umount.c:139
+#: mount/umount.c:142
#, c-format
msgid "umount: cannot fork: %s"
msgstr ""
-#: mount/umount.c:160
+#: mount/umount.c:163
#, c-format
msgid "umount: %s: invalid block device"
msgstr ""
-#: mount/umount.c:162
+#: mount/umount.c:165
#, c-format
msgid "umount: %s: not mounted"
msgstr ""
-#: mount/umount.c:164
+#: mount/umount.c:167
#, c-format
msgid "umount: %s: can't write superblock"
msgstr ""
-#: mount/umount.c:168
+#: mount/umount.c:171
#, c-format
msgid ""
"umount: %s: device is busy.\n"
@@ -8970,51 +9190,51 @@ msgid ""
" the device is found by lsof(8) or fuser(1))"
msgstr ""
-#: mount/umount.c:173
+#: mount/umount.c:176
#, c-format
msgid "umount: %s: not found"
msgstr ""
-#: mount/umount.c:175
+#: mount/umount.c:178
#, c-format
msgid "umount: %s: must be superuser to umount"
msgstr ""
-#: mount/umount.c:177
+#: mount/umount.c:180
#, c-format
msgid "umount: %s: block devices not permitted on fs"
msgstr ""
-#: mount/umount.c:179
+#: mount/umount.c:182
#, c-format
msgid "umount: %s: %s"
msgstr ""
-#: mount/umount.c:235
+#: mount/umount.c:241
#, c-format
msgid "no umount2, trying umount...\n"
msgstr ""
-#: mount/umount.c:252
+#: mount/umount.c:258
#, c-format
msgid "umount: %s busy - remounted read-only\n"
msgstr ""
-#: mount/umount.c:263
+#: mount/umount.c:269
#, c-format
msgid "umount: could not remount %s read-only\n"
msgstr ""
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
-msgstr ""
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
+msgstr "%s 已经挂载.\t"
-#: mount/umount.c:367
+#: mount/umount.c:373
msgid "umount: cannot find list of filesystems to unmount"
msgstr ""
-#: mount/umount.c:399
+#: mount/umount.c:405
#, c-format
msgid ""
"Usage: umount -h | -V\n"
@@ -9022,80 +9242,84 @@ msgid ""
" umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
msgstr ""
-#: mount/umount.c:468
+#: mount/umount.c:474
#, c-format
msgid "device %s is associated with %s\n"
msgstr ""
-#: mount/umount.c:474
+#: mount/umount.c:480
#, c-format
msgid "device %s is not associated with %s\n"
msgstr ""
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+msgid "Cannot unmount \"\"\n"
msgstr ""
-#: mount/umount.c:493
+#: mount/umount.c:499
#, c-format
-msgid "Trying to umount %s\n"
+msgid "Trying to unmount %s\n"
msgstr ""
-#: mount/umount.c:506
+#: mount/umount.c:512
msgid "umount: confused when analyzing mtab"
msgstr ""
-#: mount/umount.c:511
+#: mount/umount.c:517
#, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
msgstr ""
-#: mount/umount.c:518
+#: mount/umount.c:524
#, c-format
msgid "Could not find %s in mtab\n"
msgstr ""
-#: mount/umount.c:525
+#: mount/umount.c:531
#, c-format
msgid "umount: %s is not mounted (according to mtab)"
msgstr ""
-#: mount/umount.c:549
+#: mount/umount.c:555
#, c-format
msgid "umount: it seems %s is mounted multiple times"
msgstr ""
-#: mount/umount.c:563
+#: mount/umount.c:569
#, c-format
msgid "umount: %s is not in the fstab (and you are not root)"
msgstr ""
-#: mount/umount.c:569
+#: mount/umount.c:575
#, c-format
msgid "umount: %s mount disagrees with the fstab"
msgstr ""
-#: mount/umount.c:610
+#: mount/umount.c:616
#, c-format
msgid "umount: only %s can unmount %s from %s"
msgstr ""
-#: mount/umount.c:701
+#: mount/umount.c:711
msgid "umount: only root can do that"
msgstr ""
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
#, c-format
msgid ""
"\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
"\n"
"Set policy:\n"
" chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
"\n"
"Get policy:\n"
" chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
"\n"
"Scheduling policies:\n"
" -b | --batch set policy to SCHED_BATCH\n"
@@ -9103,74 +9327,95 @@ msgid ""
" -i | --idle set policy to SCHED_IDLE\n"
" -o | --other set policy to SCHED_OTHER\n"
" -r | --rr set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+" -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
"\n"
"Options:\n"
" -h | --help display this help\n"
-" -p | --pid operate on existing given pid\n"
" -m | --max show min and max valid priorities\n"
+" -p | --pid operate on existing given pid\n"
" -v | --verbose display status information\n"
" -V | --version output version information\n"
"\n"
msgstr ""
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
#, c-format
msgid "failed to get pid %d's policy"
msgstr ""
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
#, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
msgstr ""
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
#, c-format
msgid "unknown\n"
msgstr ""
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
#, c-format
msgid "failed to get pid %d's attributes"
msgstr ""
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
#, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's new scheduling priority: %d\n"
msgstr ""
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:178
#, c-format
msgid "SCHED_%s min/max priority\t: %d/%d\n"
msgstr ""
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
#, c-format
msgid "SCHED_%s not supported?\n"
msgstr ""
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
#, fuzzy
msgid "failed to parse pid"
msgstr "不能读 inodes"
-#: schedutils/chrt.c:225
-msgid "current"
+#: schedutils/chrt.c:273
+msgid "failed to parse priority"
msgstr ""
-#: schedutils/chrt.c:233
-msgid "failed to parse priority"
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
msgstr ""
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:289
#, c-format
msgid "failed to set pid %d's policy"
msgstr ""
-#: schedutils/chrt.c:242
-msgid "new"
-msgstr ""
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
#, c-format
msgid "failed to execute %s"
msgstr ""
@@ -9192,7 +9437,7 @@ msgid ""
"\n"
"Usage:\n"
" ionice [ options ] -p <pid> [<pid> ...]\n"
-" ionoce [ options ] <command> [<arg> ...]\n"
+" ionice [ options ] <command> [<arg> ...]\n"
"\n"
"Options:\n"
" -n <classdata> class data (0-7, lower being higher prio)\n"
@@ -9221,11 +9466,116 @@ msgstr ""
msgid "bad prio class %d"
msgstr ""
-#: schedutils/ionice.c:187
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
+msgstr "%s 失败.\n"
+
+#: schedutils/taskset.c:38
+#, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid operate on existing given pid\n"
+" -c, --cpu-list display and specify cpus in list format\n"
+" -h, --help display this help\n"
+" -V, --version output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+" %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+" %1$s -p 700\n"
+"Or set it:\n"
+" %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+" %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+" e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+
+#: schedutils/taskset.c:113
+msgid "cannot determine NR_CPUS; aborting"
+msgstr ""
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
#, fuzzy
-msgid "execvp failed"
+msgid "cpuset_alloc failed"
msgstr "查找失败"
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "不能读 inodes"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "不能读 inodes"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "不能读 inodes"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+msgid "parse error at lines: "
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:503
+msgid "parse error at line: "
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:523
+#, c-format
+msgid " and %d."
+msgstr ""
+
#: sys-utils/ctrlaltdel.c:27
#, c-format
msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -9359,7 +9709,15 @@ msgstr ""
msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
msgstr ""
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#: sys-utils/fallocate.c:52
#, c-format
msgid ""
" -h, --help this help\n"
@@ -9368,34 +9726,38 @@ msgid ""
" -l, --length <num> length of the allocation, in bytes\n"
msgstr ""
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
#, c-format
msgid ""
"\n"
"For more information see fallocate(1).\n"
msgstr ""
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
msgid "no length argument specified"
msgstr ""
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
msgid "invalid length value specified"
msgstr ""
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
msgid "invalid offset value specified"
msgstr ""
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
msgid "no filename specified."
msgstr ""
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+msgid "unexpected number of arguments"
+msgstr ""
+
+#: sys-utils/fallocate.c:146
msgid "keep size mode (-n option) unsupported"
msgstr ""
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
#, c-format
msgid "%s: fallocate failed"
msgstr ""
@@ -9442,6 +9804,57 @@ msgstr ""
msgid "%s: fork failed: %s\n"
msgstr "%s 失败.\n"
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "用法: %s [ -n ] device\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help this help\n"
+" -f, --freeze freeze the filesystem\n"
+" -u, --unfreeze unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:90
+msgid "no action specified"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:92
+msgid "no filename specified"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s 失败.\n"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "根 inode 不是一个目录"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "%s 失败.\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "%s 失败.\n"
+
#: sys-utils/ipcmk.c:84
#, c-format
msgid ""
@@ -9526,690 +9939,700 @@ msgid ""
" [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
msgstr ""
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
#, c-format
msgid "%s: illegal key (%s)\n"
msgstr ""
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
msgid "permission denied for key"
msgstr ""
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
msgid "already removed key"
msgstr ""
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
msgid "invalid key"
msgstr ""
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
msgid "unknown error in key"
msgstr ""
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
msgid "permission denied for id"
msgstr ""
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
msgid "invalid id"
msgstr ""
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
msgid "already removed id"
msgstr ""
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
msgid "unknown error in id"
msgstr ""
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
#, c-format
msgid "%s: %s (%s)\n"
msgstr ""
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
#, c-format
msgid "%s: unknown argument: %s\n"
msgstr ""
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr ""
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
#, c-format
msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+" %1$s [-s|-m|-q] -i id\n"
+" %1$s -h for help\n"
msgstr ""
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
#, c-format
msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+" %1$s [resource] -i id\n"
+"\n"
msgstr ""
#: sys-utils/ipcs.c:127
#, c-format
msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
msgstr ""
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:131
#, c-format
msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+" -h display this help\n"
+" -i id print details on resource identified by id\n"
+"\n"
msgstr ""
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
#, c-format
msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+" -m shared memory segments\n"
+" -q message queues\n"
+" -s semaphores\n"
+" -a all (default)\n"
+"\n"
msgstr ""
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
#, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+" -t time\n"
+" -p pid\n"
+" -c creator\n"
+" -l limits\n"
+" -u summary\n"
msgstr ""
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
#, c-format
msgid "kernel not configured for shared memory\n"
msgstr ""
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
#, c-format
msgid "------ Shared Memory Limits --------\n"
msgstr ""
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
#, c-format
msgid "max number of segments = %lu\n"
msgstr ""
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
#, c-format
msgid "max seg size (kbytes) = %lu\n"
msgstr ""
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
#, c-format
msgid "max total shared memory (kbytes) = %llu\n"
msgstr ""
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
#, c-format
msgid "min seg size (bytes) = %lu\n"
msgstr ""
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
#, c-format
msgid "------ Shared Memory Status --------\n"
msgstr ""
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
#, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident %ld\n"
+"pages swapped %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
msgstr ""
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
#, c-format
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr ""
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
msgid "shmid"
msgstr ""
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
msgid "perms"
msgstr ""
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
msgid "cuid"
msgstr ""
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
msgid "cgid"
msgstr ""
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
msgid "uid"
msgstr ""
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
msgid "gid"
msgstr ""
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
#, c-format
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr ""
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
msgid "owner"
msgstr ""
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
msgid "attached"
msgstr ""
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
msgid "detached"
msgstr ""
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
msgid "changed"
msgstr ""
-#: sys-utils/ipcs.c:299
+#: sys-utils/ipcs.c:327
#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
msgstr ""
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
msgid "cpid"
msgstr ""
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
msgid "lpid"
msgstr ""
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
#, c-format
msgid "------ Shared Memory Segments --------\n"
msgstr ""
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
msgid "key"
msgstr ""
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
msgid "bytes"
msgstr ""
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
msgid "nattch"
msgstr ""
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
msgid "status"
msgstr ""
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
msgid "Not set"
msgstr ""
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
msgid "dest"
msgstr ""
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
msgid "locked"
msgstr ""
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
#, c-format
msgid "kernel not configured for semaphores\n"
msgstr ""
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
#, c-format
msgid "------ Semaphore Limits --------\n"
msgstr ""
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
#, c-format
msgid "max number of arrays = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
#, c-format
msgid "max semaphores per array = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
#, c-format
msgid "max ops per semop call = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
#, c-format
msgid "semaphore max value = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
#, c-format
msgid "------ Semaphore Status --------\n"
msgstr ""
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
#, c-format
msgid "used arrays = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
#, c-format
msgid "allocated semaphores = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
#, c-format
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr ""
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
msgid "semid"
msgstr ""
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
#, c-format
msgid "------ Semaphore Operation/Change Times --------\n"
msgstr ""
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
msgid "last-op"
msgstr ""
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
msgid "last-changed"
msgstr ""
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
#, c-format
msgid "------ Semaphore Arrays --------\n"
msgstr ""
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
msgid "nsems"
msgstr ""
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
#, c-format
msgid "kernel not configured for message queues\n"
msgstr ""
-#: sys-utils/ipcs.c:490
+#: sys-utils/ipcs.c:518
#, c-format
-msgid "------ Messages: Limits --------\n"
+msgid "------ Messages Limits --------\n"
msgstr ""
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
#, c-format
msgid "max queues system wide = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:497
+#: sys-utils/ipcs.c:525
#, c-format
-msgid "------ Messages: Status --------\n"
+msgid "------ Messages Status --------\n"
msgstr ""
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
#, c-format
msgid "allocated queues = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
#, c-format
msgid "used headers = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
#, c-format
msgid "used space = %d bytes\n"
msgstr ""
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:532
#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+msgid "------ Message Queues Creators/Owners --------\n"
msgstr ""
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
msgid "msqid"
msgstr ""
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
#, c-format
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr ""
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
msgid "send"
msgstr ""
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
msgid "recv"
msgstr ""
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
msgid "change"
msgstr ""
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
#, c-format
msgid "------ Message Queues PIDs --------\n"
msgstr ""
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
msgid "lspid"
msgstr ""
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
msgid "lrpid"
msgstr ""
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
#, c-format
msgid "------ Message Queues --------\n"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
msgid "used-bytes"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
msgid "messages"
msgstr ""
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
#, fuzzy
msgid "shmctl failed"
msgstr "%s 失败.\n"
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
#, c-format
msgid ""
"\n"
"Shared memory Segment shmid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
#, c-format
msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr ""
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
#, c-format
msgid "att_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
#, c-format
msgid "det_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
#, c-format
msgid "change_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
#, fuzzy
msgid "msgctl failed"
msgstr "%s 失败.\n"
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
#, c-format
msgid ""
"\n"
"Message Queue msqid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
#, c-format
msgid "send_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
#, fuzzy
msgid "semctl failed"
msgstr "查找失败"
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
#, c-format
msgid ""
"\n"
"Semaphore Array semid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:653
+#: sys-utils/ipcs.c:681
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
#, c-format
msgid "nsems = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
#, c-format
msgid "otime = %-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
#, c-format
msgid "ctime = %-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
msgid "semnum"
msgstr ""
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
msgid "value"
msgstr ""
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
msgid "ncount"
msgstr ""
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
msgid "zcount"
msgstr ""
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
msgid "pid"
msgstr ""
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, c-format
+msgid "invalid iflag: %s"
+msgstr ""
+
+#: sys-utils/ldattach.c:151
#, c-format
msgid ""
"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
msgstr ""
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
msgid ""
"\n"
"Known <ldisc> names:\n"
msgstr ""
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
#, c-format
msgid "invalid speed: %s"
msgstr ""
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
#, c-format
msgid "ldattach from %s\n"
msgstr ""
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
msgid "invalid option"
msgstr ""
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
#, c-format
msgid "invalid line discipline: %s"
msgstr ""
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
#, c-format
msgid "%s is not a serial line"
msgstr ""
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
#, c-format
msgid "cannot get terminal attributes for %s"
msgstr ""
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
#, c-format
msgid "speed %d unsupported"
msgstr ""
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
#, c-format
msgid "cannot set terminal attributes for %s"
msgstr ""
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
msgid "cannot set line discipline"
msgstr ""
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
msgid "cannot daemonize"
msgstr ""
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
#, fuzzy
msgid "none"
msgstr "完成\n"
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
msgid "para"
msgstr ""
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
msgid "full"
msgstr ""
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
-#, c-format
-msgid "error: %s"
-msgstr ""
+#: sys-utils/lscpu.c:158
+#, fuzzy, c-format
+msgid "error: cannot open %s"
+msgstr "%s: 不能打开 %s\n"
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
+#, fuzzy, c-format
+msgid "failed to read: %s"
+msgstr "不能读 inodes"
+
+#: sys-utils/lscpu.c:209
#, c-format
-msgid "error parse: %s"
+msgid "parse error: %s"
msgstr ""
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
msgid "error: strdup failed"
msgstr ""
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "不能为 inodes 分配缓冲区"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "不能读 inodes"
+
+#: sys-utils/lscpu.c:318
#, fuzzy
msgid "error: uname failed"
msgstr "查找失败"
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
-msgstr ""
-
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+#, fuzzy
+msgid "error: calloc failed"
+msgstr "查找失败"
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
#, c-format
msgid ""
"# The following is the parsable format, which can be fed to other\n"
@@ -10218,69 +10641,82 @@ msgid ""
"# CPU,Core,Socket,Node"
msgstr ""
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
msgid "CPU op-mode(s):"
msgstr ""
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
msgid "Thread(s) per core:"
msgstr ""
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
msgid "Core(s) per socket:"
msgstr ""
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
msgid "CPU socket(s):"
msgstr ""
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
msgid "NUMA node(s):"
msgstr ""
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
msgid "Vendor ID:"
msgstr ""
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
msgid "CPU family:"
msgstr ""
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
msgid "Model:"
msgstr ""
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
msgid "Stepping:"
msgstr ""
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
msgid "CPU MHz:"
msgstr ""
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
msgid "Virtualization:"
msgstr ""
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
msgid "Hypervisor vendor:"
msgstr ""
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
msgid "Virtualization type:"
msgstr ""
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
#, c-format
msgid "%s cache:"
msgstr ""
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
#, fuzzy, c-format
msgid "Usage: %s [option]\n"
msgstr "用法: %s [ -n ] device\n"
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
msgid ""
"CPU architecture information helper\n"
"\n"
@@ -10289,65 +10725,6 @@ msgid ""
" -s, --sysroot use the directory as a new system root.\n"
msgstr ""
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr ""
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-
-#: sys-utils/rdev.c:78
-msgid ""
-" rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-
-#: sys-utils/rdev.c:79
-msgid " rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2"
-msgstr ""
-
-#: sys-utils/rdev.c:80
-msgid " rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)"
-msgstr ""
-
-#: sys-utils/rdev.c:81
-msgid " rdev -r /dev/fd0 627 set the RAMDISK size"
-msgstr ""
-
-#: sys-utils/rdev.c:82
-msgid " rdev -v /dev/fd0 1 set the bootup VIDEOMODE"
-msgstr ""
-
-#: sys-utils/rdev.c:83
-msgid " rdev -o N ... use the byte offset N"
-msgstr ""
-
-#: sys-utils/rdev.c:84
-msgid " rootflags ... same as rdev -R"
-msgstr ""
-
-#: sys-utils/rdev.c:85
-msgid " ramsize ... same as rdev -r"
-msgstr ""
-
-#: sys-utils/rdev.c:86
-msgid " vidmode ... same as rdev -v"
-msgstr ""
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-
-#: sys-utils/rdev.c:88
-msgid " use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr ""
-
#: sys-utils/readprofile.c:72 text-utils/more.c:798
#, c-format
msgid "out of memory"
@@ -10446,11 +10823,12 @@ msgstr ""
msgid "%d: old priority %d, new priority %d\n"
msgstr ""
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
#, c-format
msgid ""
"usage: %s [options]\n"
" -d | --device <device> select rtc device (rtc0|rtc1|...)\n"
+" -n | --dry-run does everything, but suspend\n"
" -l | --local RTC uses local timezone\n"
" -m | --mode standby|mem|... sleep mode\n"
" -s | --seconds <seconds> seconds to sleep\n"
@@ -10460,104 +10838,129 @@ msgid ""
" -V | --version show version\n"
msgstr ""
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
msgid "read rtc time"
msgstr ""
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
msgid "read system time"
msgstr ""
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
msgid "convert rtc time"
msgstr ""
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
msgid "set rtc alarm"
msgstr ""
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
msgid "enable rtc alarm"
msgstr ""
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
msgid "set rtc wake alarm"
msgstr ""
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
#, c-format
msgid "%s: unrecognized suspend state '%s'\n"
msgstr ""
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
#, c-format
msgid "%s: illegal interval %s seconds\n"
msgstr ""
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
#, c-format
msgid "%s: illegal time_t value %s\n"
msgstr ""
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
#, c-format
msgid "%s: version %s\n"
msgstr ""
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
#, c-format
msgid "%s: assuming RTC uses UTC ...\n"
msgstr ""
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
#, c-format
msgid "Using UTC time.\n"
msgstr ""
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
#, c-format
msgid "Using local time.\n"
msgstr ""
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
#, c-format
msgid "%s: must provide wake time\n"
msgstr ""
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
msgid "malloc() failed"
msgstr ""
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
#, c-format
msgid "%s: %s not enabled for wakeup events\n"
msgstr ""
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
#, c-format
msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
msgstr ""
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
#, c-format
msgid "%s: time doesn't go backward to %s\n"
msgstr ""
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
#, c-format
msgid "%s: wakeup from \"%s\" using %s at %s\n"
msgstr ""
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
#, c-format
msgid "%s: unable to execute %s: %s\n"
msgstr ""
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
msgid "rtc read"
msgstr ""
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
msgid "disable rtc alarm interrupt"
msgstr ""
@@ -10649,6 +11052,10 @@ msgstr ""
msgid "%s: %s not an lp device.\n"
msgstr ""
+#: sys-utils/tunelp.c:259
+msgid "LPGETSTATUS error"
+msgstr ""
+
#: sys-utils/tunelp.c:263
#, c-format
msgid "%s status is %d"
@@ -10679,6 +11086,11 @@ msgstr ""
msgid ", error"
msgstr ""
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "查找失败"
+
#: sys-utils/tunelp.c:285
msgid "LPGETIRQ error"
msgstr ""
@@ -10722,6 +11134,15 @@ msgid "unshare failed"
msgstr "查找失败"
#: sys-utils/unshare.c:118
+msgid "cannot set group id"
+msgstr ""
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "%s: 不能打开 %s\n"
+
+#: sys-utils/unshare.c:125
#, fuzzy, c-format
msgid "exec %s failed"
msgstr "%s 失败.\n"
@@ -11195,3 +11616,7 @@ msgstr ""
#, c-format
msgid "Out of memory when growing buffer.\n"
msgstr ""
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "查找失败"