po: merge changes

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

1 files changed, 29 insertions, 24 deletions

diff --git a/po/sl.po b/po/sl.po
index c86fc8a44..03d298766 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre6\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: 2006-03-05 12:29+0200\n"
 "Last-Translator: Simon Mihevc <simonmihevc@email.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -5877,29 +5877,34 @@ msgstr ""
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: tip dat. sistema mora biti podan"
 
-#: 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
+#, fuzzy, c-format
+msgid "%s: skipping nonexistent device\n"
+msgstr "%s: %s ni lp naprava.\n"
+
+#: 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
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Prisilni pregled datotečnega sistema na %s.\n"
 
-#: fsck/fsck.c:1041
+#: fsck/fsck.c:1066
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1061
+#: fsck/fsck.c:1086
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
@@ -5907,42 +5912,42 @@ msgstr ""
 "Uporaba: mkfs [-V] [-t tip dat. sistema] [izbire dat. sist.] naprava "
 "[velikost]\n"
 
-#: fsck/fsck.c:1099
+#: fsck/fsck.c:1124
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s ni lp naprava.\n"
 
-#: fsck/fsck.c:1110
+#: fsck/fsck.c:1135
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "%s ni mogoče odpreti: %s\n"
 
-#: fsck/fsck.c:1112
+#: fsck/fsck.c:1137
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s je odklopljen\n"
 
-#: 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
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Odklapljam preostale datotečne sisteme..."
 
-#: 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: neznan argument: %s\n"
 
-#: fsck/fsck.c:1252
+#: fsck/fsck.c:1277
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s iz %s\n"
 
-#: fsck/fsck.c:1264
+#: fsck/fsck.c:1289
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "Dodelitev medpomnilnika za inode ni možna"
@@ -9282,7 +9287,7 @@ msgstr "mount: tip ni bil podan - predpostavlja se smbfs zaradi predpone // \n"
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je že priklopljen v %s\n"
 
-#: mount/mount.c:1936
+#: mount/mount.c:1937
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9347,24 +9352,24 @@ msgstr ""
 "Druge izbire: [-nfFrsvw] [-o izbire].\n"
 "Podrobnosti lahko poiščete v priročniku z ukazom: man 8 mount\n"
 
-#: mount/mount.c:2261
+#: mount/mount.c:2264
 #, fuzzy, c-format
 msgid "mount: only root can do that (effective UID is %d)"
 msgstr "mount: to lahko izvede samo sistemski skrbnik"
 
-#: mount/mount.c:2264
+#: mount/mount.c:2267
 msgid "mount: only root can do that"
 msgstr "mount: to lahko izvede samo sistemski skrbnik"
 
-#: mount/mount.c:2275
+#: mount/mount.c:2278
 msgid "nothing was mounted"
 msgstr "nič ni bilo priklopljeno"
 
-#: mount/mount.c:2293 mount/mount.c:2319
+#: mount/mount.c:2296 mount/mount.c:2322
 msgid "mount: no such partition found"
 msgstr "mount: takega razdelka nisem našel"
 
-#: mount/mount.c:2296
+#: mount/mount.c:2299
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s ni mogoče najti v %s ali %s"
@@ -9384,11 +9389,11 @@ msgstr "[mntent]: vrstici %d in %s sta poškodovani%s\n"
 msgid "; rest of file ignored"
 msgstr "; preostanek datoteke bo ignoriran"
 
-#: mount/sundries.c:31
+#: mount/sundries.c:32
 msgid "bug in xstrndup call"
 msgstr "hrošč v klicu xstrndup"
 
-#: 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 "premalo pomnilnika"
@@ -10073,7 +10078,7 @@ msgstr "%s: slaba vrednost\n"
 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 "vejitev ni uspela\n"
@@ -11879,7 +11884,7 @@ msgstr "stanja naprave %s ni mogoče dobiti"
 
 #: 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