po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 29 insertions, 24 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 99de4e6c0..cd45f529f 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: 2009-11-20 15:37+0100\n"
+"POT-Creation-Date: 2009-12-09 11:32+0100\n"
 "PO-Revision-Date: 2008-08-23 23:20+0800\n"
 "Last-Translator: Ray Wang <wanglei1123@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -5443,68 +5443,73 @@ msgstr ""
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr ""
 
-#: fsck/fsck.c:867
+#: fsck/fsck.c:883
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:894
+#: fsck/fsck.c:893
+#, c-format
+msgid "%s: skipping nonexistent device\n"
+msgstr ""
+
+#: fsck/fsck.c:919
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:950
+#: fsck/fsck.c:975
 msgid "Checking all file systems.\n"
 msgstr ""
 
-#: fsck/fsck.c:1041
+#: fsck/fsck.c:1066
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1061
+#: fsck/fsck.c:1086
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 
-#: fsck/fsck.c:1099
+#: fsck/fsck.c:1124
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s:不是一个块设备\n"
 
-#: fsck/fsck.c:1110
+#: fsck/fsck.c:1135
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1112
+#: fsck/fsck.c:1137
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr ""
 
-#: fsck/fsck.c:1121
+#: fsck/fsck.c:1146
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1149
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1132 fsck/fsck.c:1218
+#: fsck/fsck.c:1157 fsck/fsck.c:1243
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s 需要一个参数\n"
 
-#: fsck/fsck.c:1252
+#: fsck/fsck.c:1277
 #, c-format
 msgid "fsck from %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1264
+#: fsck/fsck.c:1289
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "不能为 inodes 分配缓冲区"
@@ -8685,7 +8690,7 @@ msgstr ""
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1936
+#: mount/mount.c:1937
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8722,24 +8727,24 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2261
+#: mount/mount.c:2264
 #, c-format
 msgid "mount: only root can do that (effective UID is %d)"
 msgstr ""
 
-#: mount/mount.c:2264
+#: mount/mount.c:2267
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2275
+#: mount/mount.c:2278
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2293 mount/mount.c:2319
+#: mount/mount.c:2296 mount/mount.c:2322
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2296
+#: mount/mount.c:2299
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8758,11 +8763,11 @@ msgstr ""
 msgid "; rest of file ignored"
 msgstr ""
 
-#: mount/sundries.c:31
+#: mount/sundries.c:32
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/sundries.c:224 mount/sundries.c:280 mount/sundries.c:289
+#: mount/sundries.c:225 mount/sundries.c:281 mount/sundries.c:296
 #: mount/xmalloc.c:11
 msgid "not enough memory"
 msgstr ""
@@ -9423,7 +9428,7 @@ msgstr ""
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:294
+#: sys-utils/flock.c:296
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s 失败.\n"
@@ -11126,7 +11131,7 @@ msgstr ""
 
 #: text-utils/tailf.c:109
 #, c-format
-msgid "incomplete write to \"%s\" (written %ld, expected %ld)\n"
+msgid "incomplete write to \"%s\" (written %zd, expected %zd)\n"
 msgstr ""
 
 #: text-utils/tailf.c:147