From dea22a3de9a02f2ac0453828d9c2d5a360e7eb36 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 2 Jul 2009 15:07:49 +0200
Subject: [PATCH] po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 po/POTFILES.in       |   4 +-
 po/ca.po             | 268 ++++++++++++++++++++++---------------------
 po/cs.po             | 268 ++++++++++++++++++++++---------------------
 po/da.po             | 268 ++++++++++++++++++++++---------------------
 po/de.po             | 268 ++++++++++++++++++++++---------------------
 po/es.po             | 268 ++++++++++++++++++++++---------------------
 po/et.po             | 268 ++++++++++++++++++++++---------------------
 po/eu.po             | 268 ++++++++++++++++++++++---------------------
 po/fi.po             | 268 ++++++++++++++++++++++---------------------
 po/fr.po             | 268 ++++++++++++++++++++++---------------------
 po/hu.po             | 268 ++++++++++++++++++++++---------------------
 po/id.po             | 268 ++++++++++++++++++++++---------------------
 po/it.po             | 268 ++++++++++++++++++++++---------------------
 po/ja.po             | 268 ++++++++++++++++++++++---------------------
 po/nl.po             | 268 ++++++++++++++++++++++---------------------
 po/pl.po             | 268 ++++++++++++++++++++++---------------------
 po/pt_BR.po          | 268 ++++++++++++++++++++++---------------------
 po/ru.po             | 268 ++++++++++++++++++++++---------------------
 po/sl.po             | 268 ++++++++++++++++++++++---------------------
 po/sv.po             | 268 ++++++++++++++++++++++---------------------
 po/tr.po             | 268 ++++++++++++++++++++++---------------------
 po/uk.po             | 268 ++++++++++++++++++++++---------------------
 po/util-linux-ng.pot | 256 +++++++++++++++++++++--------------------
 po/vi.po             | 268 ++++++++++++++++++++++---------------------
 po/zh_CN.po          | 268 ++++++++++++++++++++++---------------------
 25 files changed, 3332 insertions(+), 3092 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 334b8e5e..96655a7e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -58,8 +58,10 @@ login-utils/simpleinit.c
 login-utils/ttymsg.c
 login-utils/vipw.c
 login-utils/wall.c
+misc-utils/blkid.c
 misc-utils/cal.c
 misc-utils/ddate.c
+misc-utils/findfs.c
 misc-utils/kill.c
 misc-utils/logger.c
 misc-utils/look.c
@@ -96,8 +98,6 @@ partx/unixware.c
 schedutils/chrt.c
 schedutils/ionice.c
 schedutils/taskset.c
-shlibs/blkid/bin/blkid.c
-shlibs/blkid/bin/findfs.c
 shlibs/blkid/src/cache.c
 shlibs/blkid/src/config.c
 shlibs/blkid/src/dev.c
diff --git a/po/ca.po b/po/ca.po
index 296e3f0d..7f1df901 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre3\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2005-09-17 13:40+0200\n"
 "Last-Translator: Josep Puigdemont <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -944,7 +944,7 @@ msgstr "no es pot fer \"stat\" al dispositiu %s"
 msgid "%s is not a block special device"
 msgstr "%s no es un dispositiu de bloc especial"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "%s no es pot obrir"
@@ -1535,53 +1535,53 @@ msgid ""
 "  %s "
 msgstr "Forma d'ús:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "no es pot fer \"stat\" al dispositiu %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: no és un dispositiu de caràcter"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s no es un dispositiu de bloc especial"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "No s'ha pogut blocar el fitxer de blocat %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Avís: %s no és un dispositiu de blocs\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "no es pot fer \"stat\" al dispositiu %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "no es pot fer \"stat\" al dispositiu %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: no és un dispositiu de caràcter"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s no es un dispositiu de bloc especial"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "s'ha produït un error en aturar el servei: \"%s\""
@@ -6988,8 +6988,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM ha fallat; s'està avortant: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Contrasenya: "
 
@@ -7901,6 +7901,16 @@ msgstr "forma d'ús: %s [+format] [dia mes any]\n"
 msgid "St. Tib's Day"
 msgstr "Dia de Sant Tibb"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "no es pot obrir %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8433,121 +8443,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ senyal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argument -l incorrecte %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "connector nfs"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "connexió nfs"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Escriu"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "s'ha llegit %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "No s'ha pogut obrir %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "No s'ha pogut obrir %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "s'ha produït un error en llegir %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "identificador invàlid"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: valor incorrecte\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8696,63 +8706,63 @@ msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "no s'ha pogut tornar a nomenar %s per %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: no s'ha pogut obtenir informació sobre el dispositiu %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", desplaçament %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", límit de mida %lld"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", xifratge %s (tipus %d)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", desplaçament %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", tipus de xifratge %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: no s'ha pogut obtenir informació sobre el dispositiu %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: no s'ha pogut obrir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: l'usuari \"%s\" no existeix.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: no teniu permisos per llegir /dev/loop#"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: no s'ha trobat cap dispositiu loop lliure"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8762,54 +8772,54 @@ msgstr ""
 "       no reconegui els dispositius loop? (Si es així, recompileu-lo o feu\n"
 "       «modprobe loop».)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr ""
 "S'ha esgotat la memòria en augmentar la mida de la memòria intermèdia.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "mount: %s%s està protegit contra escriptura; es muntarà en només lectura"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "No s'ha pogut blocar en memòria, s'està sortint.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): èxit\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): èxit\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: no s'ha pogut suprimir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Aquest mount s'ha compilat sense suport per a loop. Recompileu-lo.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8829,7 +8839,7 @@ msgstr ""
 "  %s -f                                                # cerca no usats\n"
 "  %s [ -e xifratge ] [ -o desplaçament ] {-f|disp_loop} fitxer # configura\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8845,22 +8855,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: no s'ha pogut obrir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: dispositiu ocupat"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9521,42 +9531,42 @@ msgstr "No sou el superusuari.\n"
 msgid "%s: swapoff failed"
 msgstr "la cerca ha fallat"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: està compilat sense suport per a -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: no s'ha pogut bifurcar: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositiu de blocs no vàlid"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: no està muntat"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: no s'ha pogut escriure el superbloc"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9564,52 +9574,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: no s'ha trobat"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: haureu de ser superusuari per poder usar umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: dispositius de blocs no permesos en el sistema de fitxers"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existeix, s'està provant amb umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ocupat - s'ha tornat a muntar de només lectura\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: no s'ha pogut tornar a muntar %s de només lectura\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmuntat\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: no s'ha pogut trobar la llista dels sistemes de fitxers a desmuntar"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9621,55 +9631,65 @@ msgstr ""
 "                   [-O opcions]\n"
 "            umount [-f] [-r] [-n] [-v] especial | node...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "El sector %d ja està assignat\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "El sector %d ja està assignat\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "No s'ha pogut desmuntar «»\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "S'està intentant desmuntar %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No s'ha pogut trobar %s a mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no està muntat (segons mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembla que %s s'ha muntat diverses vegades"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s no està al fstab (i no sou el root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: el muntatge de %s no concorda amb el fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: només %s pot desmuntar %s des de %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: només el root pot fer això"
 
@@ -9814,16 +9834,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "no s'ha pogut executar exec\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "no es pot obrir %s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10712,65 +10722,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id invàlid : %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "identificador invàlid"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id invàlid : %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s no es un dispositiu de bloc especial"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "No s'ha pogut cercar a la unitat de disc"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "no es pot obtenir la mida de %s"
diff --git a/po/cs.po b/po/cs.po
index 117701c6..21aac273 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2009-04-20 13:39+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -919,7 +919,7 @@ msgstr "volání stat pro zařízení %s selhalo"
 msgid "%s is not a block special device"
 msgstr "%s není blokovým zařízením"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "%s nelze otevřít"
@@ -1502,7 +1502,7 @@ msgstr ""
 "Použití:\n"
 "  %s "
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
@@ -1510,47 +1510,47 @@ msgstr ""
 "Zařízení „%s“ je řídicí syrové zařízení (použijte raw<N>, kde <N> je větší "
 "než nula)\n"
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "Syrové zařízení „%s“ nelze nalézt (%s)\n"
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "Syrové zařízení „%s“ není znak znakovým zařízením\n"
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "Zařízení „%s“ není syrovým zařízením\n"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Blokové zařízení „%s“ nelze nalézt (%s)\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Zařízení „%s“ není blokovým zařízením\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, c-format
 msgid "Cannot open master raw device '"
 msgstr "Hlavní syrové zařízení nelze otevřít „"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "Syrové zařízení „%s“ nelze nalézt (%s)\n"
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "Syrové zařízení „%s“ není znak znakovým zařízením\n"
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "Zařízení „%s“ není syrovým zařízením\n"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr "Chyba při dotazování se na syrové zařízené (%s)\n"
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr "raw%d:\tnapojeno na hlavní %d, vedlejší %d\n"
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Chyba při nastavování syrového zařízení (%s)\n"
@@ -6876,8 +6876,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: chyba PAM, končím: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Heslo: "
 
@@ -7777,6 +7777,16 @@ msgstr "Použití: %s [+FORMÁT] [DEN MĚSÍC ROK]\n"
 msgid "St. Tib's Day"
 msgstr "Den svatého Tiba"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr "Použití: %s JMENOVKA=<JMENOVKA>|UUID=<UUID>\n"
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "„%s“ nelze přeložit"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8318,122 +8328,122 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "         %s -l [ signál ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: chybný argument %s pro přepínač -l\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs soket"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Uložit"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "přečteno %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 #, fuzzy
 msgid "bad response length"
 msgstr "chybná délka jména souboru"
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "%s nebylo možné otevřít: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "%s nebylo možné otevřít: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Chyba při čtení %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "neplatný přepínač"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: chybné číslo: %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "chyba při změně módu %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8582,63 +8592,63 @@ msgstr "chyba při změně vlastníka %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nelze přejmenovat na %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: informace o zařízení %s nelze získat: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", odsazení %<PRIu64>"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", velikostní limit %<PRIu64>"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", šifrování %s (typ %<PRIu32>)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", odsazení %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", šifrovací typ %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: informace o zařízení %s nelze získat: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: zařízení %s nelze otevřít: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: adresář /dev neexistuje."
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: chybí oprávnění na prohlédnutí /dev/loop%s<N>"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: žádné volné loop zařízení nelze najít"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8648,51 +8658,51 @@ msgstr ""
 "       nezná loop zařízení? (Pokud je tomu tak, pak jej znovu přeložte,\n"
 "       či zkuste „modprobe loop“.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "Během čtení hesla došla paměť"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "varování: %s je již spojeno s %s\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "varování: %s: je chráněno proti zápisu, připojuji pouze pro čtení.\n"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Nelze zamknout v paměti. Končím.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "selhalo ioctl LOOP_SET_FD: %s\n"
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): úspěch\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): úspěch\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: zařízení %s nelze smazat: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Tento program byl přeložen bez podpory pro loop. Přeložte jej znovu.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8716,7 +8726,7 @@ msgstr ""
 "SOUBOREM\n"
 " %1$s [PŘEPÍNAČE] {-f|--find|LOOP_ZAŘÍZENÍ} SOUBOR  nastaví\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8743,22 +8753,22 @@ msgstr ""
 " -v | --verbose           upovídaný režim\n"
 "\n"
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loop zařízení %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "ukradený loop=%s… zkouším znovu\n"
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: zařízení se právě používá"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Podpora pro loop nebyla při překladu zadána. Přeložte program znovu.\n"
@@ -9449,42 +9459,42 @@ msgstr "Nejste superuživatel."
 msgid "%s: swapoff failed"
 msgstr "%s: swapoff selhal"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount byl přeložen bez podpory pro -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: číslo skupiny (GID) nelze nastavit: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: číslo uživatele (UID) nelze nastavit: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: volání fork selhalo: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: blokové zařízení %s je chybné"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s není připojeno"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: superblok nelze na %s zapsat"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9495,52 +9505,52 @@ msgstr ""
 "        (V některých případech lze získat užitečné informace o procesech,\n"
 "        které se zařízením pracují, pomocí nástrojů lsof(8) a fuser(1).)"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s nelze najít"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: musíte být superuživatelem, abyste mohl odpojit %s"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: bloková zařízení nejsou na systému souborů povolena"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nenalezl jsem umount2, zkouším umount…\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s je právě používáno - znovu připojeno v režimu pro pouze čtení\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s nelze znovu připojit v režimu pouze pro čtení\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s odpojeno\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznam systémů souborů na odpojení nelze nalézt"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9551,55 +9561,65 @@ msgstr ""
 "         umount -a [-f] [-r] [-n] [-v] [-t TYPY_VFS] [-O VOLBY]\n"
 "         umount [-f] [-r] [-n] [-v] SPECIÁLNÍ_SOUBOR | UZEL…\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "varování: %s je již spojeno s %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "varování: %s je již spojeno s %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "\"\" nelze odpojit\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Zkouším odpojit %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr "umount: analýza mtab dává matoucí výsledky"
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr "umount: %s nelze odpojit – %s je přes něj připojen na stejné místo."
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s nelze v mtab najít\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: podle mtab není %s připojeno"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: zdá se, že %s je připojeno více než jednou"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s není ve fstab (a vy nejste root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: připojení %s neodpovídá fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "unmount: pouze uživatel %s může odpojit %s ze %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: toto může provést pouze uživatel root"
 
@@ -9784,16 +9804,6 @@ msgstr "chybná plánovací třída %d"
 msgid "execvp failed"
 msgstr "funkce execvp selhala"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr "Použití: %s JMENOVKA=<JMENOVKA>|UUID=<UUID>\n"
-
-#: shlibs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "„%s“ nelze přeložit"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10685,7 +10695,7 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10694,7 +10704,7 @@ msgstr ""
 "\n"
 "Použití: %s [-dhV78neo12] [-s RYCHLOST] LDISC ZAŘÍZENÍ\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10702,50 +10712,50 @@ msgstr ""
 "\n"
 "Známá jména LDISC (disciplíny linky):\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "chybná rychlost: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach z %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "neplatný přepínač"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "neplatná disciplína linky: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s není sériovou linkou"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "nelze zjistit vlastnosti terminálu %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "rychlost %d nepodporována"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "vlastnosti terminálu %s nelze nastavit"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "disciplínu linky nelze nastavit"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "nelze se démonizovat"
 
diff --git a/po/da.po b/po/da.po
index f22888b2..bde7ca32 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2005-08-15 21:00+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -927,7 +927,7 @@ msgstr "kunne ikke finde enheden %s"
 msgid "%s is not a block special device"
 msgstr "%s er ikke en blokenhed"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "kunne ikke åbne %s"
@@ -1505,53 +1505,53 @@ msgid ""
 "  %s "
 msgstr "Brug:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "kunne ikke finde enheden %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ikke en tegnenhed"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s er ikke en blokenhed"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Kunne ikke låse låsefilen %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Advarsel: %s er ikke en blokenhed\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "kunne ikke finde enheden %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "kunne ikke finde enheden %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ikke en tegnenhed"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s er ikke en blokenhed"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "fejl ved forsøg på at stoppe tjenesten: \"%s\""
@@ -6840,8 +6840,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM-fejl, afbryder: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Adgangskode: "
 
@@ -7737,6 +7737,16 @@ msgstr "brug: %s [+format] [dag m
 msgid "St. Tib's Day"
 msgstr "St. Tibs-dag"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "kunne ikke åbne %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8266,121 +8276,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ signal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: ugyldigt -l parameter %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "NFS-sokkel"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "NFS-forbindelse"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Skriv"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "læs %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Kunne ikke åbne %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Kunne ikke åbne %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Fejl ved læsning af %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "ugyldigt id"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: ugyldig værdi\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "fejl ved ændring af filtilstand for %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8523,63 +8533,63 @@ msgstr "fejl ved 
 msgid "can't rename %s to %s: %s\n"
 msgstr "kunne ikke omdøbe %s til %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: kunne ikke få oplysninger om enheden %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", forskydning %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", størrelsesgrænse %lld"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", kryptering %s (type %d)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", forskydning %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", krypteringstype %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: kunne ikke få oplysninger om enheden %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kunne ikke åbne enheden %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: bruger \"%s\" eksisterer ikke.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: har ikke rettigheder til at kigge i /dev/loop#"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: kunne ikke finde nogen ledig loop-enhed"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8588,53 +8598,53 @@ msgstr ""
 "%s: Kunne ikke finde nogen loop-enhed. Måske kender denne kerne ikke til\n"
 "       loop-enheder? (I så fald, genoversæt eller 'modprobe loop.o'.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Løb tør for hukommelse under forstørring af buffer.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kunne ikke låse ind i hukommelsen, afslutter.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): lykkedes\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): lykkedes\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: kunne ikke slette enheden %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Denne 'mount' er oversat uden loop-understøttelse. Genoversæt venligst.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8654,7 +8664,7 @@ msgstr ""
 "  %s -f                                                  # find ubenyttet\n"
 "  %s [ -e kryptering ] [ -o forskydning ] {-f|loop_enhed} fil # klargør\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8670,22 +8680,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: kunne ikke åbne enheden %s: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: enhed optaget"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9336,42 +9346,42 @@ msgstr "Ikke superbruger.\n"
 msgid "%s: swapoff failed"
 msgstr "forgrening mislykkedes\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: oversat uden understøttelse af tilvalget -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: kunne ikke sætte hastigheden: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: kunne ikke sætte hastigheden: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kunne ikke forgrene: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ugyldig blokenhed"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ikke monteret"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kunne ikke skrive superblok"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9379,52 +9389,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ikke fundet"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: skal være superbruger for at afmontere"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blokenheder tillades ikke på dette fs"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, forsøger umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s optaget - genmonteret skrivebeskyttet\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunne ikke montere %s skrivebeskyttet\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s afmonteret\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: kunne ikke finde listen over filsystemer, der skulle afmonteres"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9435,55 +9445,65 @@ msgstr ""
 "      umount -a [-f] [-r] [-n] [-v] [-t vfstyper] [-O tilvalg]\n"
 "      umount [-f] [-r] [-n] [-v] speciel | knude...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor %d er allerede allokeret\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor %d er allerede allokeret\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Kan ikke afmontere \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Forsøger at afmontere %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunne ikke finde %s i mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s er ikke monteret (ifølge mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det lader til, at %s er monteret flere gange"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s er ikke i fstab (og du er ikke root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s montering stemmer ikke med fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: kun %s kan afmontere %s fra %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: dette kan kun root gøre"
 
@@ -9628,16 +9648,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "programkørsel mislykkedes\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "kunne ikke åbne %s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10515,65 +10525,65 @@ msgstr "zantal"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ugyldigt id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s fra %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "ugyldigt id"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ugyldigt id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s er ikke en blokenhed"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "Kan ikke få størrelsen af %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "Kan ikke få størrelsen af %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Kan ikke søge på drev"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "Kan ikke få størrelsen af %s"
diff --git a/po/de.po b/po/de.po
index c4a887ae..a799d66c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2008-01-09 17:38+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -960,7 +960,7 @@ msgstr "kann nicht auf Gerät %s zugreifen"
 msgid "%s is not a block special device"
 msgstr "%s ist kein blockorientiertes Gerät"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "es ist nicht möglich, %s zu öffnen"
@@ -1545,55 +1545,55 @@ msgid ""
 "  %s "
 msgstr "Aufruf:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "kann nicht auf Gerät %s zugreifen"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s ist kein zeichenorientiertes Gerät"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s ist kein blockorientiertes Gerät"
-
 # This one should be merged with the next one by using
 # error() instead of printf()
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Konnte die Lock-Datei %s nicht sperren: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Warnung: %s ist kein blockorientiertes Gerät\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "kann nicht auf Gerät %s zugreifen"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "kann nicht auf Gerät %s zugreifen"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s ist kein zeichenorientiertes Gerät"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s ist kein blockorientiertes Gerät"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Fehler beim Stoppen des Service „%s“"
@@ -7064,8 +7064,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM-Fehlschlag, breche ab: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Passwort: "
 
@@ -7984,6 +7984,16 @@ msgstr "Aufruf: %s [+Format] [Tag Monat Jahr]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tib’s Day"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "kann %s nicht öffnen"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8520,121 +8530,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "        %s -l [ Signal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: Ungültiges Argument %s für die Option „-l“.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "NFS-Socket"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "NFS-Verbindung"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Schreib."
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "read %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Konnte %s nicht öffnen: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Konnte %s nicht öffnen: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "ungültige ID"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: Ungültiger Wert\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8786,65 +8796,65 @@ msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "Konnte %s nicht in %s umbenennen: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: Konnte keine Informationen über das Gerät %s erhalten: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", Offset %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", Größenbeschränkung %lld"
 
 # Verschlüsselungstyp
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", Verschlüsselungsmethode %s (Typ %d)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", Offset %d"
 
 # Verschlüsselungstyp
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", Verschlüsselungstyp %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: Konnte keine Informationen über das Gerät %s erhalten: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: Konnte das Gerät %s nicht öffnen: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: Nutzer „%s“ existiert nicht.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: Keine Zugriffsrechte, um auf /dev/loop# zu schauen"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: Konnte kein freies „loop“-Gerät finden"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8854,56 +8864,56 @@ msgstr ""
 "       kein „loop“-Gerät? (Wenn dies der Fall ist, dann sollten Sie den\n"
 "       Kernel neu kompilieren oder „modprobe loop“ ausführen.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
 # That sounds somehow dumb.
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s ist schreibgeschützt, wird eingehängt im Nur-Lese-Modus"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Konnte kein Lock im Speicher bekommen, beende.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): Erfolg\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): Erfolg\n"
 
 # this is actually an open()…
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: Konnte das Gerät %s nicht löschen: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Dieses mount wurde ohne Loop-Unterstützung übersetzt. Bitte neu übersetzen.\n"
 
 # Setup
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8927,7 +8937,7 @@ msgstr ""
 "  Setup:\n"
 "    %s [ -e Verschlüsselung ] [ -o Offset ] {-f|loop-Gerät} Datei\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8943,12 +8953,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: Konnte das Gerät %s nicht öffnen: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
@@ -8957,12 +8967,12 @@ msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
 # libc.po:
 # "Device or resource busy"
 # "Das Gerät oder die Ressource ist belegt"
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: Das Gerät wird momentan noch benutzt"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9646,42 +9656,42 @@ msgstr "Nicht Superuser.\n"
 msgid "%s: swapoff failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: Die Unterstützung für -f wurde nicht mit übersetzt\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: kein gültiges blockorientiertes Gerät"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s ist nicht eingehängt"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: Konnte den „Superblock“ nicht schreiben"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9689,52 +9699,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: Nicht gefunden"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: nur der Superuser kann umount durchführen"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: Blockgeräte auf Dateisystem nicht erlaubt"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "kein umount2, versuche umount…\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s wird momentan noch benutzt – im Nur-Lese-Modus wiedereingehängt\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: konnte %s nicht im Nur-Lese-Modus wieder einhängen\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ausgehängt\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: Kann die Liste der Dateisysteme zum Aushängen nicht finden"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9745,55 +9755,65 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t VFS-Typen] [-O optionen]\n"
 "        umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis …\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor %d wird bereits benutzt\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor %d wird bereits benutzt\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Kann \"\" nicht aushängen\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Versuche, %s auszuhängen\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Konnte %s nicht in „mtab“ finden\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ist laut „mtab“ nicht eingehängt"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s scheint mehrfach eingehängt zu sein"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: fstab enthält %s nicht (Nur root kann es aushängen)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount und fstab stimmen nicht überein"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: Nur %s kann %s von %s unmounten"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: Nur „root“ kann dies tun"
 
@@ -9938,16 +9958,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "„exec“ fehlgeschlagen\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "kann %s nicht öffnen"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10836,67 +10846,67 @@ msgstr "zcount"
 msgid "pid"
 msgstr "Pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ungültige ID: %s\n"
 
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s von %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "ungültige ID"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ungültige ID: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ist kein blockorientiertes Gerät"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Konnte „seek()“ nicht auf der Festplatte benutzen"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
diff --git a/po/es.po b/po/es.po
index 3be25e71..a8f0e5b2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.12m\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2004-12-22 01:31+0100\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -940,7 +940,7 @@ msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
 msgid "%s is not a block special device"
 msgstr "%s no es un dispositivo de bloques"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"
@@ -1530,53 +1530,53 @@ msgid ""
 "  %s "
 msgstr "Uso:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: no es un dispositivo de caracteres"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s no es un dispositivo de bloques"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "No se puede bloquear el fichero de bloqueo %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Atención: %s no es un dispositivo de bloques\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: no es un dispositivo de caracteres"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s no es un dispositivo de bloques"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "error al detener el servicio: \"%s\""
@@ -6997,8 +6997,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: error de PAM; anulando: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Contraseña: "
 
@@ -7907,6 +7907,16 @@ msgstr "uso: %s [+formato] [d
 msgid "St. Tib's Day"
 msgstr "Día de San Tibb"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "No se puede abrir %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8438,121 +8448,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ señal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argumento -l incorrecto %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs socket"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Escribir"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "read %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "No se puede abrir %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "No se puede abrir %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Error al leer %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "identificador inválido"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "Número inválido: %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Error al cambiar el modo de %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8702,63 +8712,63 @@ msgstr "Error al cambiar el modo de %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "No se puede cambiar el nombre %s por %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: no se puede obtener información sobre el dispositivo %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", desplazamiento %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", tamaño límite %lld"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", cifrado %s (tipo %d)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", desplazamiento %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", tipo de cifrado %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: no se puede obtener información sobre el dispositivo %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: no se puede abrir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: el usuario \"%s\" no existe.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: no existe permiso para mirar en /dev/loop#"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: no se ha encontrado ningún dispositivo de bucle libre"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8769,55 +8779,55 @@ msgstr ""
 "a\n"
 "       realizar la compilación o `modprobe loop'.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "No queda memoria al aumentar el tamaño del búfer.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "El sector %d ya está asignado\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "mount: %s%s está protegido contra escritura; se monta como sólo lectura"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "No se pudo bloquear en memoria, saliendo.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): ejecución correcta\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ejecución correcta\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: no se puede suprimir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Este montaje se ha compilado sin soporte de bucle. Vuelva a realizar la "
 "compilación.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8838,7 +8848,7 @@ msgstr ""
 "usados\n"
 "  %s [ -e cifrado ] [ -o despl ] {-f|disp_bucle} fichero # configurar\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8854,22 +8864,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: no se puede abrir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: dispositivo ocupado"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9531,42 +9541,42 @@ msgstr "No es el superusuario.\n"
 msgid "%s: swapoff failed"
 msgstr "Error de búsqueda"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sin soporte para -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: no se puede bifurcar (fork): %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de bloques inválido"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: no montado"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: no se puede escribir el superbloque"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9574,53 +9584,53 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: no se ha encontrado"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: debe ser superusuario para utilizar umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: dispositivos de bloques no permitidos en sistema de ficheros"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existe; se está probando con umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ocupado; se ha vuelto a montar como de sólo lectura\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: no se ha podido volver a montar %s como de sólo lectura\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "Se ha ejecutado umount en %s\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: no se puede encontrar lista de sistemas de ficheros para desmontar"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9631,55 +9641,65 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opciones]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "El sector %d ya está asignado\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "El sector %d ya está asignado\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "No se puede desmontar \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Se está intentando ejecutar umount en %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No se puede encontrar %s en mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no está montado (según mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s se ha montado varias veces"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s no está en fstab (y usted no es el usuario root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montaje de %s no concuerda con fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: sólo %s puede desmontar %s desde %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: sólo el usuario root puede efectuar esta acción"
 
@@ -9823,16 +9843,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "La ejecución (exec) ha fallado\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "No se puede abrir %s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10720,65 +10730,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "identificador inválido: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "identificador inválido"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "identificador inválido: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s no es un dispositivo de bloques"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "no se puede obtener el tamaño de %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "no se puede obtener el tamaño de %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "No se puede buscar en la unidad de disco"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "no se puede obtener el tamaño de %s"
diff --git a/po/et.po b/po/et.po
index 50b28c03..b02d9bc5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11r\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2002-05-19 20:04GMT+0300\n"
 "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -914,7 +914,7 @@ msgstr "stat(%s) ei 
 msgid "%s is not a block special device"
 msgstr "%s pole plokkseade"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "ei suuda avada seadet %s"
@@ -1468,53 +1468,53 @@ msgid ""
 "  %s "
 msgstr "kasutamine:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "stat(%s) ei õnnestunud"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s pole sümbolseade"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s pole plokkseade"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "%s pole flopiseade\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Hoiatus: %s pole plokkseade\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "stat(%s) ei õnnestunud"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "stat(%s) ei õnnestunud"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s pole sümbolseade"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s pole plokkseade"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "viga teenuse peatamisel: %s"
@@ -6784,8 +6784,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM viga, katkestan: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Parool: "
 
@@ -7678,6 +7678,16 @@ msgstr "Kasutamine: %s[+formaat] [kuup
 msgid "St. Tib's Day"
 msgstr "Püha Tib'i päev"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "ei suuda avada seadet %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8204,120 +8214,120 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "             %s -l [ signaal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "%s: Tundmatu argument: %s\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "Ploki suurus: %d\n"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 msgid "connect"
 msgstr ""
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "salvesta (W)"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "lugesin %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Ei suutnud avada %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Ei suutnud avada %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "vigane identifikaator"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: lugemise viga failis %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8460,114 +8470,114 @@ msgstr ""
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "stat(%s) ei õnnestunud"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: Kasutajat \"%s\" pole olemas\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s pole flopiseade\n"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8582,7 +8592,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8598,22 +8608,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "Seade: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9224,42 +9234,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr "seek ei õnnestunud"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "fork ei õnnestunud"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "fork ei õnnestunud"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "fork ei õnnestunud"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9267,51 +9277,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9319,56 +9329,66 @@ msgid ""
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor%d on juba kasutusel\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor%d on juba kasutusel\n"
+
+#: mount/umount.c:485
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -9511,16 +9531,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "exec ei õnnestunud\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "ei suuda avada seadet %s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10363,65 +10373,65 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "vigane kiirus: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s paketist %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "vigane identifikaator"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "vigane arv: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s pole plokkseade"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ei suuda kettal seekida"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
diff --git a/po/eu.po b/po/eu.po
index ba61029d..6f0bf1e0 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2005-08-15 18:45+0200\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -886,7 +886,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -1432,53 +1432,53 @@ msgid ""
 "  %s "
 msgstr "Erabilera:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "Ezin da '%s' fitxategia ireki"
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr ""
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "Ezin da disko unitatea ireki"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "Ezin da '%s' fitxategia ireki"
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr ""
@@ -6354,8 +6354,8 @@ 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/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Pasahitza: "
 
@@ -7224,6 +7224,16 @@ msgstr ""
 msgid "St. Tib's Day"
 msgstr ""
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr ""
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7744,119 +7754,119 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "orri txar gehiegi"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "Gailua: %s\n"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 msgid "connect"
 msgstr ""
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Idatzi"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 msgid "read count"
 msgstr ""
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, c-format
 msgid "Bad number: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -7997,115 +8007,115 @@ msgstr ""
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Memoriarik ez buffer-a hazterakoan.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8120,7 +8130,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8136,22 +8146,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "Gailua: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8762,42 +8772,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr "fsync-ek huts egin du"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr ""
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8805,51 +8815,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -8857,55 +8867,65 @@ msgid ""
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:472
+#, c-format
+msgid "device %s is not associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -9046,16 +9066,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "fsync-ek huts egin du"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr ""
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -9898,64 +9908,64 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "Gailua: %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ezin da bilatu disko unitatean"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index a270cf28..7a7840da 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -19,7 +19,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-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2009-03-08 14:17+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -931,7 +931,7 @@ msgstr "laitteen %s tilaa ei voi lukea"
 msgid "%s is not a block special device"
 msgstr "%s ei ole lohkolaite"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "laitetta %s ei voi avata"
@@ -1512,53 +1512,53 @@ msgid ""
 "  %s "
 msgstr "Käyttö:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "laitteen %s tilaa ei voi lukea"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ei ole merkkilaite"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s ei ole lohkolaite"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Lukkotiedostoa %s ei voi lukita: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Varoitus: %s ei ole lohkolaite\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "laitteen %s tilaa ei voi lukea"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "laitteen %s tilaa ei voi lukea"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ei ole merkkilaite"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s ei ole lohkolaite"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "virhe pysäytettäessä palvelua: ”%s”"
@@ -6861,8 +6861,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM-virhe, keskeytetään: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Salasana: "
 
@@ -7762,6 +7762,16 @@ msgstr "käyttö: %s [+muoto] [päivä kuukausi vuosi]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tib's Day"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "laitetta %s ei voi avata"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8294,121 +8304,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ signaali ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: virheellinen -l -argumentti %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs socket"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Kirjoita"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "luettiin %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Laitetta %s ei voi avata: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Laitetta %s ei voi avata: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Virhe luettaessa %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "virheellinen valitsin"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: virheellinen arvo\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8554,63 +8564,63 @@ msgstr "virhe muutettaessa tiedoston %s omistajaa: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "nimeäminen %s -> %s ei onnistu: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", siirtymä %<PRIu64>"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", kokoraja %<PRIu64>"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", salaus %s (tyyppi %<PRIu32>)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", siirtymä %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", salaustyyppi %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: laitetta %s ei voi avata: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: /dev-hakemistoa ei ole olemassa."
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: ei oikeuksia laitteeseen /dev/loop#"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: ei löytynyt yhtään vapaata loop-laitetta"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8620,52 +8630,52 @@ msgstr ""
 "       loop-laitteista?\n"
 "       (Jos näin on, käännä uudelleen tai suorita ”modprobe loop”.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s on kirjoitussuojattu, liitetään vain luku -tilassa"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Muistia ei voitu lukita, poistutaan.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD epäonnistui: %s\n"
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): onnistui\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): onnistui\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: laitetta %s ei voi poistaa: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Tämä mount on käännetty ilman loop-tukea. Käännä uudelleen.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8685,7 +8695,7 @@ msgstr ""
 "  %s -f                                                # etsi vapaa\n"
 "  %s [ -e salaus ] [ -o siirtymä ] loop-laite tiedosto # aseta\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8701,22 +8711,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: laitetta %s ei voi avata: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: laite on varattu"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Loop-tukea ei ollut käännöksen aikana. Käännä uudelleen.\n"
@@ -9400,42 +9410,42 @@ msgstr "Et ole pääkäyttäjä.\n"
 msgid "%s: swapoff failed"
 msgstr "%s epäonnistui.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: käännetty ilman tukea valitsimelle -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: ryhmä-id:tä ei voi asettaa: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: käyttäjä-id:tä ei voi asettaa: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: haarauttaminen ei onnistu: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: virheellinen lohkolaite"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ei ole liitettynä"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superlohkoa ei voi kirjoittaa"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9443,52 +9453,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ei löydy"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: vaaditaan pääkäyttäjän oikeudet"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: lohkolaitteita ei sallita tiedostojärjestelmässä"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ohjelmaa umount2 ei ole, kokeillaan ohjelmaa umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s on varattu – uudelleenliitettiin vain luku -tilassa\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 "umount: kohteen %s uudelleenliittäminen vain luku -tilassa epäonnistui\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s irrotettu\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: irrotettavien tiedostojärjestelmien listaa ei löydy"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9500,55 +9510,65 @@ msgstr ""
 "valitsimet]\n"
 "        umount [-f] [-r] [-n] [-v] erikoistied | solmu...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektori %d on jo varattu\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektori %d on jo varattu\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Kohdetta ”” ei voi irrottaa\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Yritetään irrottaa %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s ei löytynyt tiedostosta mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ei ole liitetty (mtab-tiedoston mukaan)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s vaikuttaa olevan liitettynä useita kertoja"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s ei ole tiedostossa fstab (etkä ole root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s on ristiriidassa tiedoston fstab kanssa"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: vain %s voi irrottaa laitteen %s paikasta %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: vain root voi tehdä tämän"
 
@@ -9693,16 +9713,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "käynnistys epäonnistui\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "laitetta %s ei voi avata"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10577,64 +10587,64 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "virheellinen nopeus: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach – %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "virheellinen valitsin"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "virheellinen id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ei ole lohkolaite"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "laitteen %s kokoa ei voi hakea"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Levyasemalla ei voi siirtyä"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "laitetta %s ei voi avata"
diff --git a/po/fr.po b/po/fr.po
index a72cae21..a84f91ff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2009-04-19 22:13+0100\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -931,7 +931,7 @@ msgstr "impossible d'
 msgid "%s is not a block special device"
 msgstr "%s n'est pas un périphérique spécial de blocs"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
@@ -1527,7 +1527,7 @@ msgstr ""
 "Usage :\n"
 "  %s "
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
@@ -1535,48 +1535,48 @@ msgstr ""
 "Le périph. '%s' est un périph. de contrôle physique (utiliser raw<N> où N "
 "est plus grand que zéro)\n"
 
-#: disk-utils/raw.c:130
+#: disk-utils/raw.c:145
+#, c-format
+msgid "Cannot locate block device '%s' (%s)\n"
+msgstr "Impossible de localiser le périphérique par blocs '%s' (%s)\n"
+
+#: disk-utils/raw.c:151
+#, c-format
+msgid "Device '%s' is not a block dev\n"
+msgstr "'%s' n'est pas un périphérique par blocs\n"
+
+#: disk-utils/raw.c:186
+#, c-format
+msgid "Cannot open master raw device '"
+msgstr "Impossible d'ouvrir le périph. physique maître '"
+
+#: disk-utils/raw.c:205
 #, c-format
 msgid "Cannot locate raw device '%s' (%s)\n"
 msgstr "Impossible de localiser le périphérique physique '%s' (%s)\n"
 
-#: disk-utils/raw.c:136
+#: disk-utils/raw.c:211
 #, c-format
 msgid "Raw device '%s' is not a character dev\n"
 msgstr ""
 "Le périphérique physique '%s' n'est pas un périphérique de caractères\n"
 
-#: disk-utils/raw.c:141
+#: disk-utils/raw.c:216
 #, c-format
 msgid "Device '%s' is not a raw dev\n"
 msgstr "'%s' n'est pas un périphérique physique\n"
 
-#: disk-utils/raw.c:162
-#, c-format
-msgid "Cannot locate block device '%s' (%s)\n"
-msgstr "Impossible de localiser le périphérique par blocs '%s' (%s)\n"
-
-#: disk-utils/raw.c:168
-#, c-format
-msgid "Device '%s' is not a block dev\n"
-msgstr "'%s' n'est pas un périphérique par blocs\n"
-
-#: disk-utils/raw.c:203
-#, c-format
-msgid "Cannot open master raw device '"
-msgstr "Impossible d'ouvrir le périph. physique maître '"
-
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr "Erreur d'interrogation du périphérique physique (%s)\n"
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr "périph. phys. %d :\t associé à n° majeur %d, n° mineur %d\n"
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Erreur de configuration du périph. physique (%s)\n"
@@ -7040,8 +7040,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: échec de login PAM, fin d'exécution : %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Mot de passe: "
 
@@ -7942,6 +7942,16 @@ msgstr "Utilisation : %s [+format] [jour mois ann
 msgid "St. Tib's Day"
 msgstr "Jour de la St. Tib"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr "Usage : %s LABEL=<label>|UUID=<uuid>\n"
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "impossible de résoudre '%s'"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8484,122 +8494,122 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ signal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argument erroné pour -l %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "socket nfs"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "connexion nfs"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Ecrire"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "lire %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 #, fuzzy
 msgid "bad response length"
 msgstr "mauvaise longueur de nom de fichier"
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Impossible d'ouvrir %s : %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Impossible d'ouvrir %s : %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Erreur de lecture %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "option non valide"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s : nombre non valide : %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "erreur de changement de mode de %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8745,63 +8755,63 @@ msgstr "erreur de changement de propri
 msgid "can't rename %s to %s: %s\n"
 msgstr "ne peut renommer %s à %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: ne peut obtenir les infos sur le périphérique %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", décalage %<PRIu64>"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", taille limite %<PRIu64>"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", cryptage %s (type %<PRIu32>)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", décalage %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", encryptage type %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: ne peut obtenir les infos sur le périphérique %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ne peut ouvrir le périphérique %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: le répertoire /dev n'existe pas."
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s : pas de permission pour observer /dev/loop%s<N>"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: ne peut trouver un périphérique de type loop libre"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8811,53 +8821,53 @@ msgstr ""
 "       ne supporte pas le type loop de périphérique? (si oui, recompiler ou "
 "utiliser `modprobe loop')."
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "Mémoire épuisée lors de la lecture de la phrase secrète"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "attention : %s est déjà associé(e) avec %s\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "attention: %s est protégé en écriture, monté en lecture seule.\n"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Ne peut verrouiller en mémoire, fin d'exécution.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "échec de ioctl LOOP_SET_FD : %s\n"
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu) : succès\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): succès\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: ne peut détruire le périphérique %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Cette version de mount a été compilée sans support de boucle. SVP "
 "recompiler.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8881,7 +8891,7 @@ msgstr ""
 "<fichier>\n"
 " %1$s [ options ] {-f|--find|loopdev} <fichier>  configurer\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8913,22 +8923,22 @@ msgstr ""
 " -v | --verbose                   mode verbeux\n"
 "\n"
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Périphérique boucle (loop) : %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "périph. boucle perdu (loop)=%s...nouvel essai\n"
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: périphérique occupé"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9632,42 +9642,42 @@ msgstr "Vous n'
 msgid "%s: swapoff failed"
 msgstr "%s : échec de la fonction \"swapoff\""
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilé sans support pour -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount : impossible de fixer l'id de groupe : %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount : impossible de fixer l'id d'utilisateur : %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: ne peut faire un fork(): %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: périphérique de type bloc invalide"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: n'est pas monté"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ne peut écrire sur le super bloc"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9678,52 +9688,52 @@ msgstr ""
 "       (Dans certains cas, des infos sur les processus l'utilisant\n"
 "        sont récupérables par lsof(8) ou fuser(1))"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: n'a pas été trouvé"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: doit être le super usager pour utiliser umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: périphérique de type bloc non autorisé sur le système de fichiers"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "pas de umount2, tentative avec umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est occupé - remonté en lecture seulement\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ne peut remonter %s en lecture seulement\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s démonté\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ne peut repérer la liste des systèmes de fichiers à démonter"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9734,55 +9744,65 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t type-vfs] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] spécial | noeud...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "attention : %s est déjà associé(e) avec %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "attention : %s est déjà associé(e) avec %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Ne peut démonter \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentative pour démonter %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr "umount : problème à l'analyse de mtab"
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr "umount : impossible de démonter %s -- %s est monté au même endroit."
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Ne peut repérer %s dans mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s n'est pas monté (selon mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: il semble que %s ait été monté plusieurs fois"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s n'est pas dans fstab (et vous n'êtes pas l'usager ROOT)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount est en désaccord avec fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: seul %s peut démonter %s de %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: seul l'usager ROOT peut exécuter la commande"
 
@@ -9961,16 +9981,6 @@ msgstr "mauvaise classe de priorit
 msgid "execvp failed"
 msgstr "échec de \"execvp\""
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr "Usage : %s LABEL=<label>|UUID=<uuid>\n"
-
-#: shlibs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "impossible de résoudre '%s'"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10868,7 +10878,7 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10877,7 +10887,7 @@ msgstr ""
 "\n"
 "Utilisation : %s [ -dhV78neo12 ] [ -s <vitesse> ] <ldisque> <périphérique>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10885,50 +10895,50 @@ msgstr ""
 "\n"
 "Noms <ldisque> connus :\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "vitesse non valide : %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "exécution de \"ldattach\" depuis %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "option non valide"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "discipline (configuration) de ligne non valide : %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s n'est pas une ligne série"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "impossible d'obtenir les attributs du terminal %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "vitesse %d non supportée"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "impossible de spécifier les attributs du terminal %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "impossible de spécifier la discipline (configuration) de ligne"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "échec de transformation en démon"
 
diff --git a/po/hu.po b/po/hu.po
index f7d763ac..7d3f6869 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.14-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2008-05-21 18:25+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -921,7 +921,7 @@ msgstr "a(z) „%s” eszköz nem érhető el"
 msgid "%s is not a block special device"
 msgstr "a(z) %s nem egy speciális blokkos eszköz"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "a(z) %s nem nyitható meg"
@@ -1508,53 +1508,53 @@ msgid ""
 "  %s "
 msgstr "Használat:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "a(z) „%s” eszköz nem érhető el"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: nem egy karaktereszköz"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s nem soros vonal"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Nem lehet zárolni a(z) %s zárolási fájlt: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Figyelmeztetés: a(z) %s nem blokkeszköz\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "a(z) „%s” eszköz nem érhető el"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "a(z) „%s” eszköz nem érhető el"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: nem egy karaktereszköz"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s nem soros vonal"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "hiba a szolgáltatás leállításakor: „%s”"
@@ -6923,8 +6923,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: jelszó-hitelesítési (PAM) hiba, megszakítva: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Jelszó: "
 
@@ -7828,6 +7828,16 @@ msgstr "Használat: %s [+formátum] [nap hónap év]\n"
 msgid "St. Tib's Day"
 msgstr "Szent Tib napja"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "%s nem nyitható meg"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8360,121 +8370,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ jelzés ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: hibás -l kapcsoló: %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "Blokkméret: %d\n"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "n.szám"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Kiírás"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "időtúllépés"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "%s nem nyitható meg: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "%s nem nyitható meg: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "érvénytelen kapcsoló"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: hibás érték\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "hiba a(z) %s módjának módosításakor: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8624,63 +8634,63 @@ msgstr "hiba a(z) %s tulajdonosának módosításakor: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nem nevezhető át %s névre: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: nem kaphatók információk a(z) %s eszközről: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", eltolás: %<PRIu64>"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", méretkorlát: %<PRIu64>"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", %s titkosítás (típus: %<PRIu32>)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", eltolás: %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", titkosítástípus: %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: nem kaphatók információk a(z) %s eszközről: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: nem nyitható meg a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: a /dev könyvtár nem létezik."
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: nincs jogosultsága a /dev/loop# megjelenítéséhez"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: nem található szabad hurokeszköz"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8690,54 +8700,54 @@ msgstr ""
 "       ismeri a hurokeszközt?. (fordítsa újra a rendszermagot vagy\n"
 "       adja ki a „modprobe loop” parancsot.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Elfogyott a memória a puffer növelésekor.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "figyelmeztetés: a(z) %s már társítva van a következőhöz: %s\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: a(z) %2$s%1$s írásvédett, csatolás csak olvashatóként"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Nem lehet zárolni a memóriába, kilépés.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "A LOOP_SET_FD ioctl meghiúsult: %s\n"
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): siker\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): siker\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: nem törölhető a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Ez a „mount” parancs hurokeszköz-támogatás nélkül lett lefordítva. Fordítsa "
 "újra.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8761,7 +8771,7 @@ msgstr ""
 "felsorolása\n"
 " %1$s [ kapcsolók ] {-f|--find|hurokeszköz} fájl   beállítás\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8789,23 +8799,23 @@ msgstr ""
 " -v | --verbose            részletes mód\n"
 "\n"
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: nem nyitható meg a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 "mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n"
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "mount: a(z) %s foglalt"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9512,42 +9522,42 @@ msgstr "Nem rendszergazda.\n"
 msgid "%s: swapoff failed"
 msgstr "%s meghiúsult.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: a program a -f kapcsoló támogatása nélkül lett lefordítva\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: nem állítható be a csoportazonosító: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: nem állítható be a felhasználóazonosító: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: nem indítható program: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s érvénytelen blokkeszköz"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s nincs csatolva"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s szuperblokkja nem írható"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9558,51 +9568,51 @@ msgstr ""
 "        (Egyes esetekben az eszközt használó folyamatokról hasznos\n"
 "         információkat talál az lsof(8) vagy fuser(1))"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s nem található"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s leválasztásához rendszergazdai jog szükséges"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: a blokkeszközök nem engedélyezettek ezen a fájlrendszeren (%s)"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nem található az umount2, kísérlet az umount használatára...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: a(z) %s foglalt - újracsatolva csak olvashatóként\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: nem csatolható újra csak olvashatóként a következő: %s\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s leválasztva\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: nem található a leválasztandó fájlrendszerek listája"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9614,56 +9624,66 @@ msgstr ""
 "kapcsolók]\n"
 "           umount [-f] [-r] [-n] [-v] speciális | csomópont...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "figyelmeztetés: a(z) %s már társítva van a következőhöz: %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "figyelmeztetés: a(z) %s már társítva van a következőhöz: %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Nem választható le: „”\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Kísérlet a következő leválasztására: %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "A(z) %s nem található az mtab fájlban\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: a(z) %s nincs csatolva (az mtab fájl alapján)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: úgy tűnik, hogy a(z) %s többször került csatolásra"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: a(z) %s nincs az fstab fájlban (és Ön nem rendszergazda)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: a(z) %s csatolás nem egyezik az fstab tartalmával"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 "umount: csak a(z) %s felhasználó választhatja le a(z) %s eszközt a(z) %s alól"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: ezt csak a rendszergazda teheti meg"
 
@@ -9808,16 +9828,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "a végrehajtás meghiúsult\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "%s nem nyitható meg"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10707,7 +10717,7 @@ msgstr "z.szám"
 msgid "pid"
 msgstr "f.az"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10716,7 +10726,7 @@ msgstr ""
 "\n"
 "Használat: %s [ -dhV78neo12 ] [ -s <sebesség> ] <llemez> <eszköz>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10724,51 +10734,51 @@ msgstr ""
 "\n"
 "Ismert <llemez> nevek:\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "érvénytelen sebesség: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach innen: %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "érvénytelen kapcsoló"
 
 # fixme: mi ez?
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "érvénytelen sorelv: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s nem soros vonal"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "a(z) %s terminálattribútumai nem kérhetők le"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "a sebesség (%d) nem támogatott"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "a(z) %s terminálattribútumai nem állíthatók be"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "nem állítható be a sorelv"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "nem démonizálható"
 
diff --git a/po/id.po b/po/id.po
index 9c4e89ea..477848f0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2009-04-20 09:00+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -915,7 +915,7 @@ msgstr "tidak dapat memperoleh statistik perangkat %s"
 msgid "%s is not a block special device"
 msgstr "%s bukan sebuah perangkat block spesial"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "tidak dapat membuka %s"
@@ -1496,7 +1496,7 @@ msgstr ""
 "Penggunaan:\n"
 "  %s "
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
@@ -1504,47 +1504,47 @@ msgstr ""
 "Perangkat '%s' adalah perangkat kontrol raw (gunakan raw<N> dimana <N> lebih "
 "besar dari nol)\n"
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "tidak dapat mengalokasikan perangkat raw '%s' (%s)\n"
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "Perangkat raw '%s' bukan sebuah perangkat karakter\n"
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "Perangkat '%s' bukan sebuah perangkat raw\n"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Tidak dapat melokasikan perangkat blok '%s' (%s)\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Perangkat '%s' bukan sebuah perangkat blok\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, c-format
 msgid "Cannot open master raw device '"
 msgstr "Tidak dapat membuka perangkat master raw '"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "tidak dapat mengalokasikan perangkat raw '%s' (%s)\n"
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "Perangkat raw '%s' bukan sebuah perangkat karakter\n"
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "Perangkat '%s' bukan sebuah perangkat raw\n"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr "Error menanyakan perangkat raw (%s)\n"
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr "raw%d:\tterikat ke major %d, minor %d\n"
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Error mengkonfigurasi perangkat raw (%s)\n"
@@ -6921,8 +6921,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM Gagal, membatalkan: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Password: "
 
@@ -7822,6 +7822,16 @@ msgstr "penggunaan: %s [+format] [hari bulan tahun]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tib's Day"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr "Penggunaan: %s LABEL=<nama>|UUID=<uuid>\n"
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "tidak dapat menentukan '%s'"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8362,122 +8372,122 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ signal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argumen %s untuk pilihan -l tidak baik.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs socket"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs terhubung"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Tulis"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "membaca %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 #, fuzzy
 msgid "bad response length"
 msgstr "panjang nama berkas buruk"
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Tidak dapat membuka %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Tidak dapat membuka %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Error dalam membaca %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "pilihan tidak valid"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: angka buruk: %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "error mengubah mode dari %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8626,63 +8636,63 @@ msgstr "error mengubah kepemilikan dari %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "tidak dapat mengganti nama %s menjadi %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: tidak dapat memperoleh info di perangkat %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %<PRIu64>"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", sizelimit %<PRIu64>"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", enkripsi %s (tipe %<PRIu32>)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", offset %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", encryption type %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: tidak dapat memperoleh info di perangkat %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: tidak dapat membuka perangkat %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: /dev direktori tidak ada."
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: tidak ada ijin untuk melihat di /dev/loop%s<N>"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: tidak dapat menemukan perangkat loop yang tidak dipakai"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8692,52 +8702,52 @@ msgstr ""
 "mengetahui\n"
 "    mengenai perangkat loop? (Jika demikian, recompile atau `modprobe loop'.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "Kehabisan memori ketika membaca kata sandi"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "peringatan: %s sudah diasosiasikan dengan %s\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "peringatan: %s: memiliki proteksi untuk ditulis, menggunakan baca-saja.\n"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Tidak dapat mengunci ke memory, keluar.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD gagal: %s\n"
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu, %llu): berhasil\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): berhasil\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: tidak dapat menghapus perangkat %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Mount ini telah dikompile tanpa layanan loop. Tolong di rekompile.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8761,7 +8771,7 @@ msgstr ""
 "<berkas>\n"
 " %1$s [ pilihan ] {-f|--find|loopdev} <berkas> konfigurasi\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8789,22 +8799,22 @@ msgstr ""
 " -v | --verbose           mode verbose\n"
 "\n"
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Perangkat loop adalah %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "tercuri loop=%s ...mencoba lagi\n"
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: perangkat sedang sibuk"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Layanan loop tidak ada pada waktu dikompile. Tolong di rekompile.\n"
@@ -9507,42 +9517,42 @@ msgstr "Bukan superuser."
 msgid "%s: swapoff failed"
 msgstr "%s: gagal swapoff"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: dikompilasi tanpa disupport untuk -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: tidak dapat menset id grup: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: tidak dapat menset id pengguna: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: tidak dapat melakukan fork: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: perangkat block tidak valid"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: tidak dimount"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: tidak dapat menulis superblock"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9554,51 +9564,51 @@ msgstr ""
 "digunakan\n"
 "         oleh perangkat dapat ditemukan oleh lsof(8) atau fuser(1))"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: tidak ditemukan"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: harus superuser untuk melakukan umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: perangkat block tidak diijinkan di fs"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "tidak ada umount2, mencoba umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s sibuk - di mount lagi secara hanya-baca\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: tidak dapat melakukan mount %s secara hanya-baca\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s sudah tidak dimount\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: tidak dapat mencari daftar dari filesystems untuk di unmount"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9609,55 +9619,65 @@ msgstr ""
 "            umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "            umount [-f] [-r] [-n] [-v] special | titik...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "peringatan: %s sudah diasosiasikan dengan %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "peringatan: %s sudah diasosiasikan dengan %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Tidak dapat umount \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Mencoba untuk umount %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr "umount: bingung ketika menganalisa mtab"
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr "umount: tidak dapat umount %s -- %s telah dipasang di titik yang sama."
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Tidak dapat mencari %s dalam mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s tidak di mount (menurut catatan di mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: kelihatannya %s telah di mount beberapa kali"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s tidak ada dalam fstab (dan anda bukan root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount tidak cocok dengan catatan di fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: hanya %s yang dapat unmount %s dari %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: hanya root yang dapat melakukan itu"
 
@@ -9837,16 +9857,6 @@ msgstr "prioritas kelas %d buruk"
 msgid "execvp failed"
 msgstr "gagal eksekusi"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr "Penggunaan: %s LABEL=<nama>|UUID=<uuid>\n"
-
-#: shlibs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "tidak dapat menentukan '%s'"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10739,7 +10749,7 @@ msgstr "zcound"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10748,7 +10758,7 @@ msgstr ""
 "\n"
 "Penggunaan: %s [ -dhV78neo12 ] [ -s <kecepatan> ] <ldisc> <perangkat>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10756,50 +10766,50 @@ msgstr ""
 "\n"
 "Nama <ldisc> dikenal:\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "kecepatan tidak valid: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach dari %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "pilihan tidak valid"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "baris disiplin tidak valid: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s bukan sebuah baris serial"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "tidak dapat memperoleh atribut terminal %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "kecepatan %d tidak didukung"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "tidak dapat menset atribut terminal untuk %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "Tidak dapat menset baris disiplin"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "tidak dapat daemonize"
 
diff --git a/po/it.po b/po/it.po
index 92055e93..f55aebc5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2008-04-18 13:44+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -923,7 +923,7 @@ msgstr "impossibile eseguire stat sul dispositivo %s"
 msgid "%s is not a block special device"
 msgstr "%s non è un dispositivo speciale a blocchi"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "impossibile aprire %s"
@@ -1487,53 +1487,53 @@ msgid ""
 "  %s "
 msgstr "Uso:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "impossibile eseguire stat sul dispositivo %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: non è un dispositivo di caratteri"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s non è un dispositivo speciale a blocchi"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Impossibile fare il lock del file di lock %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Attenzione: %s non è un dispositivo a blocchi\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "impossibile eseguire stat sul dispositivo %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "impossibile eseguire stat sul dispositivo %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: non è un dispositivo di caratteri"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s non è un dispositivo speciale a blocchi"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "errore fermando il servizio \"%s\""
@@ -6897,8 +6897,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "chsh: errore PAM, interruzione in corso: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Password: "
 
@@ -7798,6 +7798,16 @@ msgstr "Uso: %s [+formato] [giorno mese anno]\n"
 msgid "St. Tib's Day"
 msgstr "Giorno di S.Tiberio"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "impossibile aprire %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8329,121 +8339,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ segnale ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argomento -l non valido per %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs socket"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Scrivi"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "lettura di %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Impossibile aprire %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Impossibile aprire %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Errore durante la lettura di %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "id non valido"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: valore non valido\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8588,65 +8598,65 @@ msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "impossibile rinominare %s in %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", cifratura %s (tipo %d)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", offset %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", tipo di cifratura %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: impossibile aprire il device %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: l'utente \"%s\" non esiste.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
 # FIXME
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: impossibile trovare un loop device libero"
 
 # FIXME: loop device
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8656,52 +8666,52 @@ msgstr ""
 "       non è a conoscenza del loop device (se è questo il caso,\n"
 "       occorre ricompilare o eseguire \"modprobe loop\")."
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Il settore %d è già allocato\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s è protetto da scrittura, viene montato in sola lettura"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): riuscito\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): riuscito\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: impossibile eliminare il device %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Questo mount è stato compilato senza supporto per loop. Ricompilare.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8716,7 +8726,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8732,22 +8742,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: impossibile aprire il device %s: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: device occupato"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9373,42 +9383,42 @@ msgstr "Non superutente.\n"
 msgid "%s: swapoff failed"
 msgstr "%s non riuscito.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilato senza supporto per -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: impossibile impostare l'id di gruppo: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: impossibile impostare l'id utente: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: impossibile fare il fork: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo di blocchi non valido"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: non montato"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: impossibile scrivere superblock"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9416,51 +9426,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: non trovato"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bisogna essere superuser per eseguire umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: i dispositivi di blocchi non sono permessi su fs"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nessun umount2, tentativo di umount in corso...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s occupato - rimontato sola lettura\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: impossibile rimontare %s di sola lettura\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "eseguito umount di %s\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: impossibile trovare l'elenco dei filesystem da smontare"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9471,55 +9481,65 @@ msgstr ""
 "     umount -a [-f] [-r] [-n] [-v] [-t tipofs] [-O opzioni]\n"
 "     umount [-f] [-r] [-n] [-v] speciale | nodo...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Il settore %d è già allocato\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Il settore %d è già allocato\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Impossibile smontare \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentativo di eseguire umount di %s in corso\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Impossibile trovare %s in mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s non è montato (secondo mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembra che %s sia stato montato diverse volte"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s non si trova in fstab (e non si è root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount non coerente con fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: solo %s può smontare %s da %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr " umount: solo root può farlo"
 
@@ -9664,16 +9684,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "exec fallita\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "impossibile aprire %s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10556,65 +10566,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id non valido: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s da %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "id non valido"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id non valido: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s non è un dispositivo speciale a blocchi"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "impossibile ottenere la dimensione di %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ricerca sull'unità disco impossibile"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "impossibile aprire %s"
diff --git a/po/ja.po b/po/ja.po
index 8e2e5659..05d938ff 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.14.2-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2009-01-28 16:54+0900\n"
 "Last-Translator: Makoto Kato <makoto.kt@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -922,7 +922,7 @@ msgstr "デバイス %s を stat できません"
 msgid "%s is not a block special device"
 msgstr "%s はブロックスペシャルデバイスではありません"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "%s を open できません"
@@ -1493,53 +1493,53 @@ msgid ""
 "  %s "
 msgstr "使い方:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "デバイス %s を stat できません"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: キャラクタデバイスではありません"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s はブロックスペシャルデバイスではありません"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "ロックファイル %s をロックできません: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "警告: %s はブロックデバイスではありません\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "デバイス %s を stat できません"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "デバイス %s を stat できません"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: キャラクタデバイスではありません"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s はブロックスペシャルデバイスではありません"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "エラーによりサービスを停止します: \"%s\""
@@ -6819,8 +6819,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM 失敗。中断します: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "パスワード: "
 
@@ -7715,6 +7715,16 @@ msgstr "使い方: %s [+書式] [日 月 年]\n"
 msgid "St. Tib's Day"
 msgstr "聖 Tib の日"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "%s を開けません"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8246,121 +8256,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "        %s -l [ シグナル ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: 不正な -l の引数 %s です。\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs ソケット"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs 接続"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "書き込み"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "%c を読込み\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "%s を開けません: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "%s を開けません: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "%s の読込みエラー\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "不正なオプション"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "不正な数: %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "%s のモード変更エラー: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8503,63 +8513,63 @@ msgstr "%s のモード変更エラー: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s の名前を %s に変更できません: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: デバイス %s の情報を取得できません: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %<PRIu64>"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", sizelimit %<PRIu64>"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", 暗号 %s (タイプ %<PRIu32>)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", オフセット %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", 暗号タイプ %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: デバイス %s の情報を取得できません: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: デバイス %s をオープンできません: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: /dev ディレクトリは存在しません。"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: dev/loop# の権限を見ることができません"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: 空いている loop デバイスが見つかりません"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8569,54 +8579,54 @@ msgstr ""
 "いないかもしれません。\n"
 "       (そうであれば、再コンパイルするか `insmod loop.o' して下さい。)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "バッファを拡大するときにメモリが足りなくなりました。\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "警告: %s は既に %s に関連づけされています\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "警告: %s: は書き込み禁止です、読込み専用でマウントします\n"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "メモリに格納できませんでしたので、終了します。\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD 失敗: %s\n"
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): 成功\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): 成功\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: デバイス %s を削除できません: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "この mount は loop のサポートなしでコンパイルされました。\n"
 "再コンパイルしてください。\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8640,7 +8650,7 @@ msgstr ""
 "                                              一覧を表示\n"
 " %1$s [オプション] {-f|--find|loopdev} <file> setup\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8656,22 +8666,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loop: デバイス は %s です\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: デバイスを使用中です"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9353,42 +9363,42 @@ msgstr "スーパーユーザーではありません\n"
 msgid "%s: swapoff failed"
 msgstr "%s は失敗しました。\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "mount: -f オプションのサポート無しでコンパイルされています\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: グループ id をセットできません: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: ユーザー id をセットできません: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: 子プロセスを起動できません: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s は不正なブロックデバイスです"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: マウントされていません"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: スーパーブロックに書き込めません"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9396,51 +9406,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: 見つかりません"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: アンマウントするにはスーパーユーザでなければなりません"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: ブロックデバイスはファイルシステム上で許可されません"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 がありません、umount してみます...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s は使用中です -- 読込み専用として再マウントします\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s を読込み専用で再マウントできませんでした\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s はアンマウントされました\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: アンマウントのためのファイルシステムリストを見つけられません"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9451,56 +9461,66 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t vfsタイプ] [-O オプション]\n"
 "        umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "警告: %s は既に %s に関連づけされています\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "警告: %s は既に %s に関連づけされています\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "\"\" をアンマウントできません\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s をアンマウントします\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab に %s が見つかりません\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s マウントされていません (mtab によると)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s は複数マウントされているようです"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 "umount: %s は fstab にありません (さらに、あなたは root ではありません)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s は fstab と一致しないマウントです"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: %s だけが %s を %s からアンマウントできます"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: root だけがそれを行なえます"
 
@@ -9644,16 +9664,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "実行に失敗\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "%s を開けません"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10535,64 +10545,64 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "不正な id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s from %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "不正なオプション"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "不正な id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s はブロックスペシャルデバイスではありません"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "%s のサイズを取得できません"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "ディスクドライブ上で seek できません"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "%s を open できません"
diff --git a/po/nl.po b/po/nl.po
index f29e869d..01c8abf7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng-2.14.2-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2009-01-31 20:52+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -927,7 +927,7 @@ msgstr "kan apparaat %s niet vinden"
 msgid "%s is not a block special device"
 msgstr "%s is geen blok-apparaat"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "kan %s niet openen"
@@ -1518,53 +1518,53 @@ msgid ""
 "  %s "
 msgstr "Gebruik:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "kan apparaat %s niet vinden"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: is geen byte-apparaat"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s is geen seriële lijn"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "kan vergrendelingsbestand %s niet vergrendelen: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Waarschuwing: %s is geen blok-apparaat\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "kan apparaat %s niet vinden"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "kan apparaat %s niet vinden"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: is geen byte-apparaat"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s is geen seriële lijn"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "fout bij stoppen van service: \"%s\""
@@ -6912,8 +6912,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM-fout -- gestopt: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Wachtwoord: "
 
@@ -7812,6 +7812,16 @@ msgstr "Gebruik:  %s [+opmaak] [dag maand jaar]\n"
 msgid "St. Tib's Day"
 msgstr "Sint Tibs"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "openen van %s is mislukt"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8344,121 +8354,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "          %s -l [ signaal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: ongeldig argument '%s' van '-l'\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "socket: %s.\n"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "verbinding: %s.\n"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "W:schrijven"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "duurde te lang"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Kan %s niet openen: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Kan %s niet openen: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "ongeldige optie"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: ongeldige waarde\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "fout bij wijzigen van modus van %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8607,63 +8617,63 @@ msgstr "fout bij wijzigen van eigenaar van %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan %s niet hernoemen tot %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: kan geen informatie verkrijgen over apparaat %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", beginpunt %<PRIu64>"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", maximale grootte %<PRIu64>"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", codering %s (soort %<PRIu32>)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", beginpunt %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", coderingssoort %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: kan geen informatie verkrijgen over apparaat %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kan apparaat %s niet openen: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: map '/dev' bestaat niet."
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: geen toegangsrechten tot /dev/loop#"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: kan geen vrij lus-apparaat vinden"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8673,55 +8683,55 @@ msgstr ""
 "        lus-apparaat?  (Dan moet u de kernel opnieuw compileren,\n"
 "        of misschien een 'modprobe loop' doen?)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "Onvoldoende geheugen beschikbaar tijdens lezen van wachtwoord"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "waarschuwing: %s is al gerelateerd aan %s\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "waarschuwing: %s is schrijfbeveiligd en wordt als alleen-lezen "
 "aangekoppeld.\n"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kan pagina's niet vastzetten in het geheugen -- gestopt\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl(LOOP_SET_FD) is mislukt: %s\n"
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu) is gelukt\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "lus-apparaat %s is uitgeschakeld\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "kan lus-apparaat %s niet uitschakelen: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Deze versie van 'mount' is gecompileerd zonder lus-ondersteuning.\n"
 "Hercompilatie is nodig.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8744,7 +8754,7 @@ msgstr ""
 "  %1$s -j | --associated <bestand> [-o <nummer>]      gerelateerden tonen\n"
 "  %1$s [opties] {-f|--find|<lus-apparaat>} <bestand>  instellen\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8771,22 +8781,22 @@ msgstr ""
 "       --show                apparaatnaam tonen (bij '-f <bestand>')\n"
 "  -v | --verbose             gedetailleerde uitvoer produceren\n"
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Lus-apparaat is %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "afgepakt lus-apparaat=%s; ... nieuwe poging\n"
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: apparaat %s is bezig"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9495,42 +9505,42 @@ msgstr "U bent niet root.\n"
 msgid "%s: swapoff failed"
 msgstr "%s is mislukt.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: gecompileerd zonder ondersteuning voor '-f'\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: kan groep-ID niet instellen: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: kan gebruiker-ID niet instellen: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan geen nieuw proces starten: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ongeldig blok-apparaat"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: niet aangekoppeld"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan niet naar superblok schrijven"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9541,51 +9551,51 @@ msgstr ""
 "        (Welke processen het apparaat gebruiken kan mogelijk\n"
 "         gevonden worden met behulp van lsof(8) of fuser(1).)"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: niet gevonden"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: u moet root zijn om te kunnen ontkoppelen"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blok-apparaten niet toegestaan op bestandssysteem"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "geen umount2 aanwezig; poging met gewone umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s is bezig -- als alleen-lezen heraangekoppeld\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kan %s niet als alleen-lezen heraankoppelen\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s is ontkoppeld\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan geen lijst vinden met bestandssystemen om te ontkoppelen"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9596,55 +9606,65 @@ msgstr ""
 "          umount -a [-dfnlrv] [-t bestandssysteemsoorten] [-O opties]\n"
 "          umount [-hV]\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "waarschuwing: %s is al gerelateerd aan %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "waarschuwing: %s is al gerelateerd aan %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "kan niet \"\" ontkoppelen\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Poging tot ontkoppelen van %s...\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kan %s niet vinden in mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s is niet aangekoppeld (volgens mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: het lijkt erop dat %s meerdere keren is aangekoppeld"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s staat niet in fstab (en u bent niet root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: aankoppeling op %s komt niet overeen met fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: alleen %s kan %s ontkoppelen van %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: alleen root kan dat doen"
 
@@ -9789,16 +9809,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "uitvoeren is mislukt\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "openen van %s is mislukt"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10686,7 +10696,7 @@ msgstr "zcount"
 msgid "pid"
 msgstr "PID"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10695,7 +10705,7 @@ msgstr ""
 "\n"
 "Gebruik:  %s [-dhV78neo12] [-s <snelheid>] <lijnprotocol> <apparaat>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10703,50 +10713,50 @@ msgstr ""
 "\n"
 "Mogelijke lijnprotocollen zijn:\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "ongeldige snelheid: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach (%s)\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "ongeldige optie"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "ongeldig lijnprotocol: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s is geen seriële lijn"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "kan terminaleigenschappen van %s niet bepalen"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "snelheid %d is niet mogelijk"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "kan terminaleigenschappen van %s niet instellen"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "kan lijnprotocol niet instellen"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "kan er geen achtergrondservice van maken"
 
diff --git a/po/pl.po b/po/pl.po
index 89fa270c..f16da095 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2006-12-22 00:25+0100\n"
 "Last-Translator: Andrzej Krzysztofowicz <ankry@mif.pg.gda.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -903,7 +903,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr "%s nie jest specjalnym urz±dzeniem blokowym"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "nie mo¿na otworzyæ %s"
@@ -1450,53 +1450,53 @@ msgid ""
 "  %s "
 msgstr "U¿ycie:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr ""
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s nie jest specjalnym urz±dzeniem blokowym"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "%s: nie jest to urz±dzenie blokowe\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "%s: nie jest to urz±dzenie blokowe\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "nie mo¿na otworzyæ %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr ""
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s nie jest specjalnym urz±dzeniem blokowym"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr ""
@@ -6359,8 +6359,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: nie uda³o siê otworzyæ: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr ""
 
@@ -7229,6 +7229,16 @@ msgstr ""
 msgid "St. Tib's Day"
 msgstr ""
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "nie mo¿na otworzyæ '%s'"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7749,118 +7759,118 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "%s wymaga argumentu\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "RozmiarBloku: %d\n"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 msgid "connect"
 msgstr ""
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 msgid "write"
 msgstr ""
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 msgid "read count"
 msgstr ""
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "nie mo¿na otworzyæ '%s'"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "nie mo¿na otworzyæ '%s'"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: b³±d odczytu na %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8001,114 +8011,114 @@ msgstr ""
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: b³êdny katalog: '.' nie jest na pocz±tku\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8123,7 +8133,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8139,22 +8149,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "Urz±dzenie: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8762,42 +8772,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr ""
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "nie mo¿na pobraæ rozmiaru %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8805,51 +8815,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -8857,55 +8867,65 @@ msgid ""
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "%s nie jest specjalnym urz±dzeniem blokowym"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -9045,16 +9065,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr ""
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "nie mo¿na otworzyæ '%s'"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -9894,64 +9904,64 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "Urz±dzenie: %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s nie jest specjalnym urz±dzeniem blokowym"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "nie mo¿na pobraæ rozmiaru %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "nie mo¿na pobraæ rozmiaru %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "nie mo¿na pobraæ rozmiaru %s"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "nie mo¿na pobraæ rozmiaru %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 282846c9..80f006f1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11b\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2001-05-24 16:03-03:00\n"
 "Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -927,7 +927,7 @@ msgstr "n
 msgid "%s is not a block special device"
 msgstr "%s não é um dispositivo de blocos especial"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "não foi possível abrir %s"
@@ -1484,53 +1484,53 @@ msgid ""
 "  %s "
 msgstr "Uso:"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "não foi possível verificar status de dispositivo %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s não é um dispositivo de caracteres"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s não é um dispositivo de blocos especial"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Não foi possível bloquear o arquivo de bloqueio %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Aviso: %s não é um dispositivo de blocos\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "não foi possível verificar status de dispositivo %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "não foi possível verificar status de dispositivo %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s não é um dispositivo de caracteres"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s não é um dispositivo de blocos especial"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "erro ao gravar %s: %s"
@@ -6909,8 +6909,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: falha de PAM; abortando: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Senha:"
 
@@ -7807,6 +7807,16 @@ msgstr "Uso: %s [+formato] [dia m
 msgid "St. Tib's Day"
 msgstr "Dia de São Tib"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "não foi possível abrir %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8337,121 +8347,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ sinal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argumento inválido para -l %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs socket"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Gravar"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "read %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Não foi possível abrir %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Não foi possível abrir %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Erro ao ler %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "id inválido: %s\n"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "Número inválido: %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "erro ao alterar o modo de %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8600,63 +8610,63 @@ msgstr "erro ao alterar o modo de %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "não foi possível renomear %s para %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: não foi possível obter informações sobre o dispositivo %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr "Tipo de criptografia não suportado: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, fuzzy, c-format
 msgid ", encryption type %d\n"
 msgstr "Tipo de criptografia não suportado: %s\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: não foi possível obter informações sobre o dispositivo %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: não foi possível abrir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: usuário \"%s\" não existe.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
 msgstr "mount: não foi possível localizar nenhum dispositivo de laço livre"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, fuzzy, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8667,52 +8677,52 @@ msgstr ""
 "       este kernel não conhece o dispositivo de laço\n"
 "       (se for este o caso, recompile ou use `insmod loop.o')."
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Falta memória quando o buffer cresce.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "O setor %d já está alocado\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s é protegido contra gravação; montando somente para leitura"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Não é possível bloquear (lock) na memória, saindo\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%d): sucesso\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): sucesso\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: não foi possível excluir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Este mount foi compilado sem suporte a laços. Recompile-o.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8734,7 +8744,7 @@ msgstr ""
 "  %s [ -e criptografia ] [ -o deslocamento ] dispositivo_laço arquivo # "
 "configuração\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8750,22 +8760,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: não foi possível abrir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: o dispositivo está ocupado"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Não havia suporte a laço disponível quando da compilação. Recompile.\n"
@@ -9413,42 +9423,42 @@ msgstr "N
 msgid "%s: swapoff failed"
 msgstr "busca falhou"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sem suporte a -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: não foi possível configurar velocidade: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: não foi possível configurar velocidade: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: não foi possível realizar fork: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de blocos inválido"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: não montado"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: não foi possível gravar superbloco"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9456,54 +9466,54 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: não encontrado"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: precisa ser superusuário para desmontar"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: dispositivos de blocos não permitidos no sistema de arquivos"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "não existe umount2, tentando umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s está ocupado - remontado somente para leitura\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: não foi possível remontar %s somente para leitura\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmontado\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: não foi possível localizar a lista de sistemas de arquivos a "
 "desmontar"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9514,56 +9524,66 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t tipos_sist_arq_virt]\n"
 "       umount [-f] [-r] [-n] [-v] especial | nó...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "O setor %d já está alocado\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "O setor %d já está alocado\n"
+
+#: mount/umount.c:485
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Não foi possível abrir %s\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentando desmontar %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Não foi possível localizar %s em mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s não está montado (de acordo com mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s está montado múltiplas vezes"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s não está na fstab (e você não é root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: a montagem de %s não está de acordo com a fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: somente %s pode desmontar %s de %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: operação exclusiva de root"
 
@@ -9707,16 +9727,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "exec falhou\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "não foi possível abrir %s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10601,65 +10611,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id inválido: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "id inválido: %s\n"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id inválido: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s não é um dispositivo de blocos especial"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "Não foi possível obter o tamanho de %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "Não foi possível obter o tamanho de %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Não foi possível realizar busca na unidade de disco"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "Não foi possível obter o tamanho de %s"
diff --git a/po/ru.po b/po/ru.po
index 767ba247..9f82fbdb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2006-03-07 12:42+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -923,7 +923,7 @@ msgstr "
 msgid "%s is not a block special device"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÏÓÏÂÙÍ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s"
@@ -1513,53 +1513,53 @@ msgid ""
 "  %s "
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ ÕÓÔÒÏÊÓÔ×Á %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ÎÅÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÏÓÏÂÙÍ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ ÕÓÔÒÏÊÓÔ×Á %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ ÕÓÔÒÏÊÓÔ×Á %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ÎÅÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÏÓÏÂÙÍ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "ÏÛÉÂËÁ ÏÓÔÁÎÏ×ËÉ ÓÅÒ×ÉÓÁ: \"%s\""
@@ -6931,8 +6931,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: ÓÂÏÊ PAM, ×ÙÐÏÌÎÑÅÔÓÑ ÐÒÅÒÙ×ÁÎÉÅ: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "ðÁÒÏÌØ: "
 
@@ -7831,6 +7831,16 @@ msgstr "
 msgid "St. Tib's Day"
 msgstr "äÅÎØ ó×. éÚÁÂÅÌÌÙ"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ%s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8363,121 +8373,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ ÓÉÇÎÁÌ ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ -l %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "ÓÏËÅÔ nfs"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs ÐÏÄËÌÀÞÅÎÉÅ"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "úÁÐÉÓØ"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "ÞÔÅÎÉÅ %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "ÎÅ×ÅÒÎÙÊ id"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "ÏÛÉÂËÁ ÓÍÅÎÙ ÒÅÖÉÍÁ %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8626,63 +8636,63 @@ msgstr "
 msgid "can't rename %s to %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÕÓÔÒÏÊÓÔ×Å %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", ÓÍÅÝÅÎÉÅ %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", ÏÇÒÁÎÉÞÅÎÉÅ ÎÁ ÒÁÚÍÅÒ %lld"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", ÛÉÆÒÏ×ÁÎÉÅ %s (ÔÉÐ %d)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", ÓÍÅÝÅÎÉÅ %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", ÔÉÐ ÛÉÆÒÏ×ÁÎÉÑ %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÕÓÔÒÏÊÓÔ×Å %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÕÓÔÒÏÊÓÔ×Ï %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: ÎÅÔ ÒÁÚÒÅÛÅÎÉÑ ÎÁ ÐÒÏÓÍÏÔÒ /dev/loop#"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÉ ÏÄÎÏÇÏ Ó×ÏÂÏÄÎÏÇÏ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8692,54 +8702,54 @@ msgstr ""
 "    ÜÔÏ ÑÄÒÏ ÎÅ ÚÎÁÅÔ Ï ÕÓÔÒÏÊÓÔ×ÁÈ ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ. (÷ ÜÔÏÍ ÓÌÕÞÁÅ\n"
 "    ÐÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ ÑÄÒÏ ÉÌÉ ×ÙÐÏÌÎÉÔÅ `modprobe loop.o'.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ ÐÒÉ Õ×ÅÌÉÞÅÎÉÉ ÂÕÆÅÒÁ.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "óÅËÔÏÒ %d ÕÖÅ ×ÙÄÅÌÅÎ\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s ÚÁÝÉÝÅÎ ÏÔ ÚÁÐÉÓÉ, ÍÏÎÔÉÒÕÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ × ÐÁÍÑÔÉ, ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): ÕÓÐÅÛÎÏ ÚÁ×ÅÒÛÅÎ\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ÕÓÐÅÛÎÏ ÚÁ×ÅÒÛÅÎ\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÕÓÔÒÏÊÓÔ×Ï %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "üÔÁ ×ÅÒÓÉÑ mount ÂÙÌÁ ÏÔËÏÍÐÉÌÉÒÏ×ÁÎÁ ÂÅÚ ÐÏÄÄÅÒÖËÉ loop. ðÏÖÁÌÕÊÓÔÁ, "
 "×ÙÐÏÌÎÉÔÅ ÐÅÒÅËÏÍÐÉÌÑÃÀ.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8761,7 +8771,7 @@ msgstr ""
 "ÎÅÉÓÐÏÌØÚÕÅÍÙÈ\n"
 "  %s [ -e ÛÉÆÒÏ×ÁÎÉÅ ] [ -o ÓÍÅÝÅÎÉÅ ] loop_ÕÓÔÒÏÊÓÔ×Ï ÆÁÊÌ # ÕÓÔÁÎÏ×ËÁ\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8777,22 +8787,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÕÓÔÒÏÊÓÔ×Ï %s: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: ÕÓÔÒÏÊÓÔ×Ï ÚÁÎÑÔÏ"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9452,42 +9462,42 @@ msgstr "
 msgid "%s: swapoff failed"
 msgstr "ÐÏÉÓË ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: ÏÔËÏÍÐÉÌÉÒÏ×ÁÎ ÂÅÚ ÐÏÄÄÅÒÖËÉ -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÓËÏÒÏÓÔØ: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÓËÏÒÏÓÔØ: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ÎÅ×ÅÒÎÏÅ ÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÕÐÅÒÂÌÏË"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9495,52 +9505,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ÎÅ ÎÁÊÄÅÎ"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 "umount: %s: ÎÅÏÂÈÏÄÉÍÏ ÉÍÅÔØ ÐÒÁ×Á ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: ÂÌÏÞÎÙÅ ÕÓÔÒÏÊÓÔ×Á ÎÁ fs ÚÁÐÒÅÝÅÎÙ"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ÎÅÔ umount2, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ÚÁÎÑÔ - ÐÅÒÅÍÏÎÔÉÒÏ×ÁÎ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÍÏÎÔÉÒÏ×ÁÔØ %s ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ÒÁÚÍÏÎÔÉÒÏ×ÁÎ\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÓÐÉÓÏË ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ ÄÌÑ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9551,55 +9561,65 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t ÔÉÐÙ_ÆÓ] [-O ÏÐÃÉÉ]\n"
 "       umount [-f] [-r] [-n] [-v] ÓÐÅÃÉÁÌØÎÙÊ | ÕÚÅÌ...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "óÅËÔÏÒ %d ÕÖÅ ×ÙÄÅÌÅÎ\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "óÅËÔÏÒ %d ÕÖÅ ×ÙÄÅÌÅÎ\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s × mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ (ÓÏÇÌÁÓÎÏ mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: ÐÏÈÏÖÅ, ÞÔÏ %s ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÎÅÓËÏÌØËÏ ÒÁÚ"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s ÎÅ × fstab (Á ×Ù ÎÅ root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: ÍÏÎÔÉÒÏ×ÁÎÉÅ %s ÐÒÏÔÉ×ÏÒÅÞÉÔ fstab'Õ"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: ÔÏÌØËÏ %s ÍÏÖÅÔ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ %s ÏÔ %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: ÔÏÌØËÏ root ÍÏÖÅÔ ÓÄÅÌÁÔØ ÜÔÏ"
 
@@ -9744,16 +9764,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "×ÙÐÏÌÎÅÎÉÅ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ%s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10637,65 +10647,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ÎÅ×ÅÒÎÙÊ id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s ÉÚ %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "ÎÅ×ÅÒÎÙÊ id"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ÎÅ×ÅÒÎÙÊ id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÏÓÏÂÙÍ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÁ ÄÉÓËÏ×ÏÍ ÎÁËÏÐÉÔÅÌÅ"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ %s"
diff --git a/po/sl.po b/po/sl.po
index 56955bd5..5598fb74 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-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\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"
@@ -931,7 +931,7 @@ msgstr "stanja naprave %s ni mogo
 msgid "%s is not a block special device"
 msgstr "%s ni posebna bloèna naprava"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "ni mogoèe odpreti %s"
@@ -1516,53 +1516,53 @@ msgid ""
 "  %s "
 msgstr "Uporaba:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "stanja naprave %s ni mogoèe dobiti"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ni znakovna naprava"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s ni posebna bloèna naprava"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Omejitvene datoteke %s ni mogoèe zakleniti: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Opozorilo: %s ni blokovna naprava\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "stanja naprave %s ni mogoèe dobiti"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "stanja naprave %s ni mogoèe dobiti"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ni znakovna naprava"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s ni posebna bloèna naprava"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "napaka pri zaustavljanju storitve: \"%s\""
@@ -6871,8 +6871,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM ni uspel, prekinjam: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Geslo: "
 
@@ -7769,6 +7769,16 @@ msgstr "uporaba: %s [+format] [dan mesec leto]\n"
 msgid "St. Tib's Day"
 msgstr "Dan st. Tiba"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "ni mogoèe odpreti %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8300,121 +8310,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "\t%s -l [signal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: slab argument -l: %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs kanal"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs povezava"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Zapi¹i"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "beri %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "%s ni mogoèe odpreti: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "%s ni mogoèe odpreti: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Napaka pri branju %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "neveljaven id"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: slaba vrednost\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Napaka pri spreminjanju naèina %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8558,63 +8568,63 @@ msgstr "Napaka pri spreminjanju na
 msgid "can't rename %s to %s: %s\n"
 msgstr "ni mogoèe preimenovati %s v %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: informacij o napravi %s ni mogoèe dobiti: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", odmik %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", omejitev_velikosti %lld"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", ¹ifriranje %s (tip %d)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", odmik %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", ¹ifrirni tip %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: informacij o napravi %s ni mogoèe dobiti: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ni mogoèe odpreti naprave %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: uporabnik \"%s\" ne obstja.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: za vpogled v /dev/loop# ni dovoljenja"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: iskanje proste loop naprave ni bilo uspe¹no\n"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8624,54 +8634,54 @@ msgstr ""
 "\tte vrste. (Èe je to res, ponovno prevedi jedro ali si pomagaj z `modprobe "
 "loop'.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Pri poveèevanju medpomnilnika je zmanjkalo pomnilnika.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d je ¾e dodeljen\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s je za¹èitena pred pisanjem, priklapljam samo za branje"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "V pomnilnik ni mogoèe zakleniti, konèujem.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): uspeh\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): uspeh\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: naprave %s ni mogoèe zbrisati: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Program mount je bil preveden brez podpore za loop. Poskusite ponovno "
 "prevesti mount.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8691,7 +8701,7 @@ msgstr ""
 "  %s -f\t\t\t\t\t\t# najdi neuporabljene\n"
 "  %s [-e ¹ifriranje] [-o odmik] {-f|loop_naprava} dat. # nastavitev\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8707,22 +8717,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: ni mogoèe odpreti naprave %s: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: naprava je zaposlena"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9380,42 +9390,42 @@ msgstr "Niste sistemski skrbnik.\n"
 msgid "%s: swapoff failed"
 msgstr "iskanje je bilo neuspe¹no"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: prevajanje je potekalo brez podpore za -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: hitrosti ni mogoèe nastaviti: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: hitrosti ni mogoèe nastaviti: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: vejitev ni mogoèa: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: neveljavna bloèna naprava"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ni priklopljena"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superbloka ni mogoèe zapisati"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9423,51 +9433,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: neuspe¹no iskanje"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: samo sistemski skrbnik lahko odklaplja"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: na dat. sist. bloène naprave niso dovoljene"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ni umount2, posku¹am z umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s je zaposlena - ponovno priklapljam samo za branje\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ponovni priklop %s samo za branje ni mogoè\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s je odklopljen\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznama dat. sist. za odklop ni mogoèe najti"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9478,56 +9488,66 @@ msgstr ""
 "\t  umount -a [-f] [-r] [-n] [-v] [-t tip nav. dat. sist.] [-O izbire]\n"
 "\t  umount [-f] [-r] [-n] [-v] posebno | vozli¹èe...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor %d je ¾e dodeljen\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor %d je ¾e dodeljen\n"
+
+#: mount/umount.c:485
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "ni mogoèe odklopiti \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s posku¹am odklopiti\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s ni mogoèe najti v mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ni priklopljen (glede na mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: izgleda kot da je %s veèkrat priklopljen"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s ni v fstab (in vi niste sistemski skrbnik)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: priklop %s je v nasprotju z fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, fuzzy, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "mount: samo sistemski skrbnik lahko odklopi %s na %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: samo sistemski skrbnik naredi to"
 
@@ -9672,16 +9692,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "zagon ni uspel\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "ni mogoèe odpreti %s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10559,65 +10569,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "neveljavni id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s iz %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "neveljaven id"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "neveljavni id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ni posebna bloèna naprava"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "ni mogoèe dobiti velikosti %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "ni mogoèe dobiti velikosti %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Iskanje na disku ni mogoèe"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "ni mogoèe dobiti velikosti %s"
diff --git a/po/sv.po b/po/sv.po
index 0f43e292..3b39b120 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2007-11-14 09:20+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -921,7 +921,7 @@ msgstr "kan inte ta status på enheten %s"
 msgid "%s is not a block special device"
 msgstr "%s är ingen blockspecialenhet"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
@@ -1502,53 +1502,53 @@ msgid ""
 "  %s "
 msgstr "Användning:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "kan inte ta status på enheten %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ingen teckenenhet"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s är ingen blockspecialenhet"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Kan inte låsa låsfilen %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Varning: %s är ingen blockenhet\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "kan inte ta status på enheten %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "kan inte ta status på enheten %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ingen teckenenhet"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s är ingen blockspecialenhet"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "fel vid stoppande av tjänst: \"%s\""
@@ -6919,8 +6919,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "chsh: PAM-fel, avbryter: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Lösenord: "
 
@@ -7830,6 +7830,16 @@ msgstr "användning: %s [+format] [dag månad år]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tibs Dag"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "kan inte öppna %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8363,121 +8373,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ signal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: felaktigt argument %s till -l.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs-uttag"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs-anslut"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Skriv"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "läste %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Fel vid läsning av %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "ogiltigt id"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: felaktigt värde\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "fel vid byte av rättigheter på %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8620,63 +8630,63 @@ msgstr "fel vid byte av rättigheter på %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan inte byta namn på %s till %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: kan inte få tag i information om enheten %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", avstånd %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", storleksgräns %lld"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", kryptering %s (typ %d)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", avstånd %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", krypteringstyp %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: kan inte få tag i information om enheten %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kan inte öppna enheten %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: användaren \"%s\" finns inte.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: inga rättigheter att granska /dev/loop#"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: kunde inte hitta någon ledig slingenhet"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8686,52 +8696,52 @@ msgstr ""
 "       till slingenheten? (Om det är så bör du kompilera om eller\n"
 "       \"modprobe loop\")."
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Slut på minne vid växande av buffert.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s är skrivskyddad, monterar som endast läsbar"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kunde inte låsa i minne, avslutar.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD misslyckades: %s\n"
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): lyckades\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): lyckades\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: kan inte ta bort enheten %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Denna mount kompilerades utan stöd för slingor. Du bör kompilera om.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8751,7 +8761,7 @@ msgstr ""
 "  %s -f                                                # hitta ledig\n"
 "  %s [-e kryptering] [-o avstånd] {-f|slingenhet} fil  # konfiguration\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8784,22 +8794,22 @@ msgstr ""
 " -v | --verbose           informativt läge\n"
 "\n"
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: kan inte öppna enheten %s: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "mount: stulen loop=%s ...försöker igen\n"
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: enheten är upptagen"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9461,42 +9471,42 @@ msgstr "Inte superanvändare.\n"
 msgid "%s: swapoff failed"
 msgstr "%s misslyckades.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: kompilerad utan stöd för -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: kan inte ställa in grupp-id: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: kan inte ställa in användar-id: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan inte grena: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ogiltig blockenhet"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: inte monterad"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan inte skriva superblock"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9504,51 +9514,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s hittades inte"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: måste vara superanvändare för att avmontera"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blockenheter är inte tillåtna på filsystem"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, försöker med umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s är upptagen - monterade om som endast läsbar\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunde inte montera om %s som endast läsbar\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s avmonterad\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan inte hitta lista med filsystem att avmontera"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9559,55 +9569,65 @@ msgstr ""
 "            umount -a [-f] [-r] [-n] [-v] [-t vfs-typer] [-O alternativ]\n"
 "            umount [-f] [-r] [-n] [-v] special | nod...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor %d är redan allokerad\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor %d är redan allokerad\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Kan inte avmontera \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Försöker avmontera %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunde inte hitta %s i mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s är inte monterad (enligt mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det verkar som om %s är monterad flera gånger"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s är inte i fstab (och du är inte root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montering av %s stämmer inte överens med fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: endast %s kan avmontera %s från %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: endast root kan göra det"
 
@@ -9752,16 +9772,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "körning misslyckades\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "kan inte öppna %s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10646,65 +10656,65 @@ msgstr "zräkn"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ogiltigt id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s från %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "ogiltigt id"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ogiltigt id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s är ingen blockspecialenhet"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Kan inte söka på diskenhet"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "kan inte hämta storleken på %s"
diff --git a/po/tr.po b/po/tr.po
index 9cbfbbab..17bafa31 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2006-03-06 15:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -927,7 +927,7 @@ msgstr "%s aygıtının durum bilgisi alınamıyor"
 msgid "%s is not a block special device"
 msgstr "%s bir blok-özel aygıt değil"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "%s açılamıyor"
@@ -1514,53 +1514,53 @@ msgid ""
 "  %s "
 msgstr "Kullanımı:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "%s aygıtının durum bilgisi alınamıyor"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: bir karakter aygıtı değil"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s bir blok-özel aygıt değil"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "%s kilit dosyası kilitlenemiyor: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Uyarı: %s bir blok aygıtı değil\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "%s aygıtının durum bilgisi alınamıyor"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "%s aygıtının durum bilgisi alınamıyor"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: bir karakter aygıtı değil"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s bir blok-özel aygıt değil"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "servis durdurulurken hata: \"%s\""
@@ -6908,8 +6908,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM hatası, çıkılıyor: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Parola: "
 
@@ -7807,6 +7807,16 @@ msgstr "kullanımı: %s [+biçem] [gün ay yıl]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tib Günü"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "%s açılamıyor"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8338,121 +8348,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ sinyal ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: -l argümanı %s hatalı.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs soketi"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs bağlantısı"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Kaydet"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "%c okundu\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "%s açılamıyor: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "%s açılamıyor: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "%s okunurken hata\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "kimlik geçersiz"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "Numara geçersiz: %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "%s için kip değiştirilirken hata: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8598,63 +8608,63 @@ msgstr "%s için kip değiştirilirken hata: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s %s olarak değiştirilemiyor: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: %s aygıtı hakkında bilgi alınamıyor: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", başl %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", boysınırı %lld"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", %s şifreleme türü (%d) bilinmiyor"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", başl %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", şifreleme türü %d bilinmiyor\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: %s aygıtı hakkında bilgi alınamıyor: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: %s aygıtı açılamıyor: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: \"%s\" yok.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: /dev/loop# için izinler yetersiz"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: hiç serbest loop aygıtı yok"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8664,52 +8674,52 @@ msgstr ""
 "       bilgiye sahip değil. (`modprobe loop' deneyin, sonuç alamazsanız\n"
 "       çekirdeği yeniden derleyin.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Tampon büyütülürken bellek yetmedi.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s yazma korumalı, salt-okunur olarak bağlanıyor"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Bellek içinde kilitlenemedi, çıkılıyor.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): başarılı\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): başarılı\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: %s aygıtı silinemiyor: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Bu mount loop desteği olmaksızın derlenmiş. Lütfen yeniden derleyin.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8730,7 +8740,7 @@ msgstr ""
 "kullanılmamışlar\n"
 "  %s [ -e şifreleme ] [ -o konum ] {-f|loop_aygıtı} dosya # ayarlama\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8746,22 +8756,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: %s aygıtı açılamıyor: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: aygıt meşgul"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Derleme sırasında loop desteği verilmemiş. Lütfen yeniden derleyin.\n"
@@ -9416,42 +9426,42 @@ msgstr "root değil.\n"
 msgid "%s: swapoff failed"
 msgstr "erişim başarısız"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: -f için destek içermeksizin derlenmiş\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ast süreç oluşturulamıyor: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: blok aygıtı geçersiz"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: bağlanmadı"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superblok yazılamıyor"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9459,51 +9469,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: yok"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bağı kaldırmak için root gerekli"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: dosya sisteminde blok aygıtlara izin yok"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 yok, umount deneniyor...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s meşgul- salt-okunur olarak yeniden bağlandı\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s salt okunur olarak yeniden bağlanamıyor\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s sistemden ayrıldı\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ayrılacak dosya sistemlerinin listesi bulunamıyor"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9529,55 +9539,65 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz\n"
 "Daha fazla bilgi edinmek için 'man 8 umount' yazınız.\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektör %d zaten kullanımda\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektör %d zaten kullanımda\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "\"\" ayrılamaz\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s sistemden ayrılmaya çalışılıyor\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab içinde %s bulunamadı\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s bağlı değil (mtab içinde yok)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s defalarca bağlanmış görünüyor"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s fstab içinde yok (ve siz root değilsiniz)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s bağı fstab ile çelişiyor"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: sadece %1$s %3$s aygıtını %2$s dizininden ayırabilir"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: bu sadece root tarafından yapılabilir"
 
@@ -9722,16 +9742,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "çalıştırma başarısız\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "%s açılamıyor"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10615,65 +10625,65 @@ msgstr "zsayısı"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "kimlik geçersiz: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%2$s deki %1$s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "kimlik geçersiz"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "kimlik geçersiz: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s bir blok-özel aygıt değil"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Disk sürücü üzerinde arama yapılamıyor"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "%s uzunluğu alınamıyor"
diff --git a/po/uk.po b/po/uk.po
index badc61f9..7d52e166 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2006-04-06 10:45+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -923,7 +923,7 @@ msgstr "не вдається отримати інформацію про %s"
 msgid "%s is not a block special device"
 msgstr "%s не є спеціальним файлом блочного пристрою"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "не вдається відкрити %s"
@@ -1504,53 +1504,53 @@ msgid ""
 "  %s "
 msgstr "Використання:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "не вдається отримати інформацію про %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: не є символьним пристроєм"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s не є спеціальним файлом блочного пристрою"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "не вдається заблокувати файл блокування %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Попередження: %s не є блочним пристроєм\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "не вдається отримати інформацію про %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "не вдається отримати інформацію про %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: не є символьним пристроєм"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s не є спеціальним файлом блочного пристрою"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "помилка зупинення служби: \"%s\""
@@ -6884,8 +6884,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: помилка PAM, перервано: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -7782,6 +7782,16 @@ msgstr "використання: %s [+формат] [день місяць рі
 msgid "St. Tib's Day"
 msgstr "День святого Tib"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "не вдається відкрити %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8315,121 +8325,121 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ сигнал ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: неправильний -l аргумент %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "nfs сокет"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Записати"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "прочитано %c\n"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "не вдається відкрити %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "не вдається відкрити %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Помилка читання %s\n"
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "неправильний ідентифікатор"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: неправильне значення\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "помилка зімни режиму доступу до %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8578,63 +8588,63 @@ msgstr "помилка зімни режиму доступу до %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "не вдається перейменувати %s у %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: не вдається отримати інформацію про пристрій %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", зсув %d"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", обмеження на розмір %lld"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", шифрування %s (тип %d)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", зсув %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", тип шифрування %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: не вдається отримати інформацію про пристрій %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: не вдається відкрити пристрій %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: користувач \"%s\" не існує.\n"
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: немає прав доступу до /dev/loop#"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: не вдається знайти жодний вільний loop-пристрій"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8644,54 +8654,54 @@ msgstr ""
 "       підтримує роботу з loop-пристроями (Якщо це так - перекомпілюйте\n"
 "       його або виконайте `modprobe loop')."
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Недостатньо пам'яті для збільшення буфера.\n"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s захищений від запису, монтується лише для читання"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "не вдається заблокувати у пам'яті, завершення.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): успішно завершено\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): успішно завершено\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: не вдається видалити пристрій %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Програма mount була скомпільована без підтримки loop-пристроїв. "
 "Перекомпілюйте її \n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8711,7 +8721,7 @@ msgstr ""
 "  %s -f                                               # знайти вільний\n"
 "  %s [ -e шифрування ] [ -o зсув ] loop_пристрій файл # встановити\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8727,22 +8737,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: не вдається відкрити пристрій %s: %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: пристрій зайнятий"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9396,42 +9406,42 @@ msgstr "Не адміністратор.\n"
 msgid "%s: swapoff failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: зібрано без підтримки -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: не вдається запустити дочірній процес: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: неправильний блочний пристрій"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: не підключений"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: не вдається записати суперблок"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9439,52 +9449,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: не існує"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 "umount: %s: для використання umount необхідно мати права адміністратора"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: блочні пристрої не дозволено на файловій системі"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "немає umount2, пробується umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s зайнятий - перепідключено у режим лише-для-читання\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: не вдається перепідключити %s у режим лише-для-читання\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s відключено\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: не вдається знайти перелік файлових систем для відключення"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9495,55 +9505,65 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t тип_фс] [-O параметри]\n"
 "       umount [-f] [-r] [-n] [-v] спец_файл | каталог...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Сектор %d вже розподілений\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Сектор %d вже розподілений\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Не вдається відключити \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Спроба відключити %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "не вдається знайти %s у mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s не є підключеним (згідно mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: здається %s підключений декілька разів"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s відсутній у fstab (та ви не адміністратор)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: підключений %s відрізняється від fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: лише %s може відключити %s від %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: це може робити лише адміністратор(root)"
 
@@ -9688,16 +9708,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "помилка запуску\n"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "не вдається відкрити %s"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10580,65 +10590,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "неправильний ідентифікатор: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s з %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "неправильний ідентифікатор"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "неправильний ідентифікатор: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s не є спеціальним файлом блочного пристрою"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Помилка позиціювання на дисковому пристрої"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "не вдається отримати розмір %s"
diff --git a/po/util-linux-ng.pot b/po/util-linux-ng.pot
index b3849528..a8ed8112 100644
--- a/po/util-linux-ng.pot
+++ b/po/util-linux-ng.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -881,7 +881,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -1425,53 +1425,53 @@ msgid ""
 "  %s "
 msgstr ""
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
+#: disk-utils/raw.c:145
 #, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
+msgid "Cannot locate block device '%s' (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:136
+#: disk-utils/raw.c:151
 #, c-format
-msgid "Raw device '%s' is not a character dev\n"
+msgid "Device '%s' is not a block dev\n"
 msgstr ""
 
-#: disk-utils/raw.c:141
+#: disk-utils/raw.c:186
 #, c-format
-msgid "Device '%s' is not a raw dev\n"
+msgid "Cannot open master raw device '"
 msgstr ""
 
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:205
 #, c-format
-msgid "Cannot locate block device '%s' (%s)\n"
+msgid "Cannot locate raw device '%s' (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:211
 #, c-format
-msgid "Device '%s' is not a block dev\n"
+msgid "Raw device '%s' is not a character dev\n"
 msgstr ""
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:216
 #, c-format
-msgid "Cannot open master raw device '"
+msgid "Device '%s' is not a raw dev\n"
 msgstr ""
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr ""
@@ -6328,8 +6328,8 @@ 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/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr ""
 
@@ -7198,6 +7198,16 @@ msgstr ""
 msgid "St. Tib's Day"
 msgstr ""
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr ""
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7717,116 +7727,116 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 msgid "bad arguments"
 msgstr ""
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 msgid "socket"
 msgstr ""
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 msgid "connect"
 msgstr ""
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 msgid "write"
 msgstr ""
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 msgid "read count"
 msgstr ""
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, c-format
 msgid "Bad number: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -7967,114 +7977,114 @@ msgstr ""
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8089,7 +8099,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8105,22 +8115,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr ""
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8728,42 +8738,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr ""
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr ""
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8771,51 +8781,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -8823,55 +8833,65 @@ msgid ""
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:472
+#, c-format
+msgid "device %s is not associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -9010,16 +9030,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr ""
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr ""
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -9859,63 +9869,63 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr ""
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 02fe477d..542e22fc 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\n"
 "PO-Revision-Date: 2009-05-13 20:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -914,7 +914,7 @@ msgstr "không thể lấy trạng thái về thiết bị %s"
 msgid "%s is not a block special device"
 msgstr "%s không phải là thiết bị khối đặc biệt"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được %s"
@@ -1498,7 +1498,7 @@ msgstr ""
 "Sử dụng:\n"
 "  %s "
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
@@ -1506,47 +1506,47 @@ msgstr ""
 "Thiết bị « %s » là thiết bị thô điều khiển (hãy dùng thô<N> mà <N> lớn hơn số "
 "không)\n"
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "Không tìm thấy thiết bị thô « %s » (%s)\n"
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "Thiết bị thô « %s » không phải một thiết bị ký tự\n"
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "Thiết bị « %s » không phải một thiết bị thô\n"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Không tìm thấy thiết bị khối « %s » (%s)\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Thiết bị « %s » không phải một thiết bị khối\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, c-format
 msgid "Cannot open master raw device '"
 msgstr "Không thể mở thiết bị thô chủ '"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "Không tìm thấy thiết bị thô « %s » (%s)\n"
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "Thiết bị thô « %s » không phải một thiết bị ký tự\n"
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "Thiết bị « %s » không phải một thiết bị thô\n"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr "Lỗi hỏi thiết bị thô (%s)\n"
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr "thô%d:\tđóng kết với chính %d, phụ %d\n"
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Lỗi đặt thiết bị thô (%s)\n"
@@ -6890,8 +6890,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM thất bại nên hủy bỏ : %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Mật khẩu: "
 
@@ -7789,6 +7789,16 @@ msgstr "sử dụng: %s [+định_dạng] [ngày tháng năm]\n"
 msgid "St. Tib's Day"
 msgstr "Ngày Thánh Tib"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr "Sử dụng: %s LABEL=<nhãn>|UUID=<uuid>\n"
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "không giải quyết được « %s »"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8353,122 +8363,122 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr "       %s -l [ tín_hiệu ]\n"
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: tham số -l xấu %s.\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 #, fuzzy
 msgid "socket"
 msgstr "ổ cắm: %s.\n"
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 #, fuzzy
 msgid "connect"
 msgstr "kết nối: %s.\n"
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 #, fuzzy
 msgid "write"
 msgstr "Ghi"
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 #, fuzzy
 msgid "read count"
 msgstr "đếm số không tập tin"
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 #, fuzzy
 msgid "bad response length"
 msgstr "tập tin có tên dài sai"
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Không mở được %s: %s\n"
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Không mở được %s: %s\n"
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "tùy chọn sai"
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: số sai: %s\n"
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "lỗi thay đổi chế độ của %s: %s\n"
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -8611,63 +8621,63 @@ msgstr "lỗi thay đổi chủ sở hữu của %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "không đổi tên được %s thành %s: %s\n"
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: không lấy được thông tin trên thiết bị %s: %s\n"
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", bù %<PRIu64>"
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", hạn_cỡ %<PRIu64>"
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", mã_hoá %s (kiểu %<PRIu32>)"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", bù %d"
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", dạng mã hóa %d\n"
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: không lấy được thông tin trên thiết bị %s: %s\n"
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: không mở được thiết bị %s: %s\n"
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: thư mục « /dev » không tồn tại."
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: không có quyền xem /dev/loop%s<N>"
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: không tìm thấy thiết bị vòng lặp nào còn trống"
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8677,53 +8687,53 @@ msgstr ""
 "       về thiết bị vòng lặp? (Nếu vậy, hãy biên dịch lại hoặc thử `modprobe "
 "loop'.)"
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "Không đủ bộ nhớ khi đọc cụm từ mật khẩu"
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "cảnh báo : %s đã liên quan đến %s\n"
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "cảnh báo : %s: được bảo vệ chống ghi nên đặt chỉ-đọc.\n"
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Không khóa được vào bộ nhớ, đang thoát.\n"
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD bị lỗi: %s\n"
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): thành công\n"
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): thành công\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: không xóa được thiết bị %s: %s\n"
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Phiên bản mount này được biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch "
 "lại.\n"
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8749,7 +8759,7 @@ msgstr ""
 "\n"
 "TBVL: thiết bị vòng lặp\n"
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8777,22 +8787,22 @@ msgstr ""
 " -v | --verbose          \t\tchế độ chi tiết\n"
 "\n"
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Thiết bị vòng lặp là %s\n"
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "vòng lặp bị ăn cắp=%s... nên thử lại\n"
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: thiết bị đang bận"
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch lại.\n"
@@ -9495,42 +9505,42 @@ msgstr "Không phải siêu người dùng.s"
 msgid "%s: swapoff failed"
 msgstr "%s swapoff bị lỗi"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: không biên dịch hỗ trợ -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: không đặt được ID nhóm: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: không đặt được ID người dùng: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: không thể phân nhánh %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: thiết bị khối không hợp lệ"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: chưa gắn"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: không thể ghi siêu khối"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9542,51 +9552,51 @@ msgstr ""
 "\thàm lsof(8) hoặc fuser(1) có thể tìm\n"
 "\tthông tin có ích về các tiến trình đang dùng thiết bị."
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: không tìm thấy"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: phải là siêu người dùng (root) để bỏ gắn"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: thiết bị khối không cho phép trên hệ thống tập tin"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "không có umount2, đang thử umount..\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s bận - gắn lại chỉ đọc\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: không thể gắn lại %s chỉ đọc\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s đã bỏ gắn\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: không tìm thấy danh sách hệ thống tập tin để bỏ gắn"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9597,57 +9607,67 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O tùy_chọn]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "cảnh báo : %s đã liên quan đến %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "cảnh báo : %s đã liên quan đến %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Không bỏ gắn được \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Đang thử bỏ gắn %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr "umount: bị lẫn lộn khi phân tích mtab"
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 "umount: không thể tháo gắn kết %s — %s được gắn kết ở trên nó ở cùng một "
 "điểm."
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Không tìm thấy %s trong mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s chưa gắn (theo mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: có vẻ là %s được gắn nhiều lần"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s không có trong fstab (và người dùng không phải là root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: gắn %s không tương ứng fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: chỉ có %s có thể bỏ gắn %s từ %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: chỉ người chủ (root) có quyền thực hiện"
 
@@ -9829,16 +9849,6 @@ msgstr "hạng ưu tiên sai %d"
 msgid "execvp failed"
 msgstr "execvp bị lỗi"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr "Sử dụng: %s LABEL=<nhãn>|UUID=<uuid>\n"
-
-#: shlibs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "không giải quyết được « %s »"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10732,7 +10742,7 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10741,7 +10751,7 @@ msgstr ""
 "\n"
 "Sử dụng: %s [ -dhV78neo12 ] [ -s <tốc_độ> ] <lđĩa> <thiết_bị>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10749,50 +10759,50 @@ msgstr ""
 "\n"
 "Các tên <lđĩa> đã biết đến:\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "tốc độ sai: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach từ %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "tùy chọn sai"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "kỷ luật dòng sai: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s không phải là dòng nối tiếp"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "không thể lấy thuộc tính thiết bị về %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "tốc độ %d không được hỗ trợ"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "không thể đặt các thuộc tính thiết bị cho %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "không thể đặt kỷ luật dòng"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "không thể chạy trong nền"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e1115f4f..7386a425 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-06-28 22:12+0200\n"
+"POT-Creation-Date: 2009-07-02 14:56+0200\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."
@@ -903,7 +903,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -1448,53 +1448,53 @@ msgid ""
 "  %s "
 msgstr "用法:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr ""
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "%s:不是一个块设备\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "%s:不是一个块设备\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, c-format
 msgid "Cannot open master raw device '"
 msgstr ""
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr ""
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr ""
@@ -6351,8 +6351,8 @@ 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/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:753
-#: mount/lomount.c:756
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr ""
 
@@ -7221,6 +7221,16 @@ msgstr ""
 msgid "St. Tib's Day"
 msgstr ""
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "不能读 inodes"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7740,117 +7750,117 @@ msgstr ""
 msgid "       %s -k\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:148
+#: misc-utils/uuidd.c:152
 #, fuzzy
 msgid "bad arguments"
 msgstr "%s 需要一个参数\n"
 
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:159
 msgid "socket"
 msgstr ""
 
-#: misc-utils/uuidd.c:166
+#: misc-utils/uuidd.c:170
 msgid "connect"
 msgstr ""
 
-#: misc-utils/uuidd.c:185
+#: misc-utils/uuidd.c:189
 msgid "write"
 msgstr ""
 
-#: misc-utils/uuidd.c:193
+#: misc-utils/uuidd.c:197
 msgid "read count"
 msgstr ""
 
-#: misc-utils/uuidd.c:199
+#: misc-utils/uuidd.c:203
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:264
+#: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:272
+#: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:305
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:297
+#: misc-utils/uuidd.c:313
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:335
+#: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:343
+#: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:399
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Generated %d UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:411
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:452 misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, c-format
 msgid "Bad number: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:508 misc-utils/uuidd.c:535
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:534
 #, c-format
 msgid "%s and subsequent %d UUID's\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:536
 #, c-format
 msgid "List of UUID's:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:541
+#: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:558
+#: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
@@ -7991,114 +8001,114 @@ msgstr ""
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:366
+#: mount/lomount.c:364
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:390
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:393
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:401
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:417
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:425
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:436
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:452 mount/lomount.c:484 mount/lomount.c:549
-#: mount/lomount.c:598
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 
-#: mount/lomount.c:463 mount/lomount.c:611
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:614
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:617
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:647
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:690
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:706
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:742
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:769
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:826
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:847
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:862
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:897
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8113,7 +8123,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:907
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8129,22 +8139,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1045 mount/lomount.c:1085
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr ""
 
-#: mount/lomount.c:1072
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1082
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1099
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8754,42 +8764,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr "%s 失败.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr ""
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8797,51 +8807,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -8849,55 +8859,65 @@ msgid ""
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "%s:不是一个块设备\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -9039,16 +9059,6 @@ msgstr ""
 msgid "execvp failed"
 msgstr "查找失败"
 
-#: shlibs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: shlibs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "不能读 inodes"
-
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -9891,63 +9901,63 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr ""
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr ""
 
-- 
2.39.5