From 397bd57244345c46cf6a5af2fb148060e2e743cb Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Wed, 3 Jun 2009 20:42:05 -0600 Subject: meta: cleanup rules targets Use trailing / on destinations, to make sure they're directories. Signed-off-by: LaMont Jones --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index c8239cd3..22c74ab7 100755 --- a/debian/rules +++ b/debian/rules @@ -117,8 +117,8 @@ ifneq ($(DISTRO),Debian) fi endif cd debian; if [ -f util-linux/sbin/fdisk ]; then \ - ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin; \ - S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin; fi; \ + ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \ + S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \ fi cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done ifeq ($(DEB_HOST_ARCH_OS),linux) -- cgit v1.2.3 From 7da07ff80e357317001a6a0d4bb6732360705e99 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 10 Jun 2009 00:00:09 +0200 Subject: mount: use "none" fstype for MS_PROPAGATION mounts Reported-by: Al Viro Signed-off-by: Karel Zak --- mount/mount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mount/mount.c b/mount/mount.c index cc5b88ae..e002ebbb 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -895,7 +895,7 @@ guess_fstype_and_mount(const char *spec, const char *node, const char **types, if (*types && strcasecmp (*types, "auto") == 0) *types = NULL; - if (flags & (MS_BIND | MS_MOVE)) + if (flags & (MS_BIND | MS_MOVE | MS_PROPAGATION)) *types = "none"; if (!*types && !(flags & MS_REMOUNT)) { -- cgit v1.2.3 From b2442afc5b28389aa21f50ca8e828261bb9325a8 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 10 Jun 2009 09:37:43 +0200 Subject: mount: move MS_{PROPAGATION,BIND,MOVE} detection The previous commit does not properly fix the problem with "none" fstype and MS_{PROPAGATION,BIND,MOVE} flags. The real fstype has to be replaced with "none" before we try to use /sbin/mount. helper. Old version: # grep test /proc/self/mountinfo 16 18 0:19 / /mnt/test rw,relatime - tmpfs tmpfs rw # ./mount -v -v -v --make-private /mnt/test mount: fstab path: "/etc/fstab" mount: mtab path: "/etc/mtab" mount: lock path: "/etc/mtab~" mount: temp path: "/etc/mtab.tmp" mount: UID: 0 mount: eUID: 0 mount: spec: "tmpfs" mount: node: "/mnt/test" mount: types: "tmpfs" mount: opts: "rw" mount: external mount: argv[0] = "/sbin/mount.tmpfs" mount: external mount: argv[1] = "tmpfs" mount: external mount: argv[2] = "/mnt/test" mount: external mount: argv[3] = "-v" mount: external mount: argv[4] = "-o" mount: external mount: argv[5] = "rw" tmpfs on /mnt/test type tmpfs (rw) # grep test /proc/self/mountinfo 16 18 0:19 / /mnt/test rw,relatime - tmpfs tmpfs rw 17 16 0:20 / /mnt/test rw,relatime - tmpfs tmpfs rw Fixed version: # grep test /proc/self/mountinfo 16 18 0:19 / /mnt/test rw,relatime - tmpfs tmpfs rw # ./mount -v -v -v --make-private /mnt/test mount: fstab path: "/etc/fstab" mount: mtab path: "/etc/mtab" mount: lock path: "/etc/mtab~" mount: temp path: "/etc/mtab.tmp" mount: UID: 0 mount: eUID: 0 mount: spec: "tmpfs" mount: node: "/mnt/test" mount: types: "tmpfs" mount: opts: "rw" mount: mount(2) syscall: source: "tmpfs", target: "/mnt/test", filesystemtype: "none", mountflags: 262144, data: (null) # grep test /proc/self/mountinfo 16 18 0:19 / /mnt/test rw,relatime - tmpfs tmpfs rw Signed-off-by: Karel Zak --- mount/mount.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mount/mount.c b/mount/mount.c index e002ebbb..c636e9dc 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -895,9 +895,6 @@ guess_fstype_and_mount(const char *spec, const char *node, const char **types, if (*types && strcasecmp (*types, "auto") == 0) *types = NULL; - if (flags & (MS_BIND | MS_MOVE | MS_PROPAGATION)) - *types = "none"; - if (!*types && !(flags & MS_REMOUNT)) { *types = guess_fstype_by_devname(spec); if (*types) { @@ -1302,6 +1299,9 @@ try_mount_one (const char *spec0, const char *node0, const char *types0, if (loop) opt_loopdev = loopdev; + if (flags & (MS_BIND | MS_MOVE | MS_PROPAGATION)) + types = "none"; + /* * Call mount.TYPE for types that require a separate mount program. * For the moment these types are ncpfs and smbfs. Maybe also vxfs. -- cgit v1.2.3 From facf57fd0764b5663c6ce206f0dd99d3b7854d45 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 10 Jun 2009 14:31:08 +0200 Subject: po: merge changes Signed-off-by: Karel Zak --- po/ca.po | 40 ++++++++++++++++++++-------------------- po/cs.po | 40 ++++++++++++++++++++-------------------- po/da.po | 40 ++++++++++++++++++++-------------------- po/de.po | 40 ++++++++++++++++++++-------------------- po/es.po | 40 ++++++++++++++++++++-------------------- po/et.po | 40 ++++++++++++++++++++-------------------- po/eu.po | 40 ++++++++++++++++++++-------------------- po/fi.po | 40 ++++++++++++++++++++-------------------- po/fr.po | 40 ++++++++++++++++++++-------------------- po/hu.po | 40 ++++++++++++++++++++-------------------- po/id.po | 40 ++++++++++++++++++++-------------------- po/it.po | 40 ++++++++++++++++++++-------------------- po/ja.po | 40 ++++++++++++++++++++-------------------- po/nl.po | 40 ++++++++++++++++++++-------------------- po/pl.po | 40 ++++++++++++++++++++-------------------- po/pt_BR.po | 40 ++++++++++++++++++++-------------------- po/ru.po | 40 ++++++++++++++++++++-------------------- po/sl.po | 40 ++++++++++++++++++++-------------------- po/sv.po | 40 ++++++++++++++++++++-------------------- po/tr.po | 40 ++++++++++++++++++++-------------------- po/uk.po | 40 ++++++++++++++++++++-------------------- po/util-linux-ng.pot | 40 ++++++++++++++++++++-------------------- po/vi.po | 40 ++++++++++++++++++++-------------------- po/zh_CN.po | 40 ++++++++++++++++++++-------------------- 24 files changed, 480 insertions(+), 480 deletions(-) diff --git a/po/ca.po b/po/ca.po index 4bf3418f..00b8982c 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2005-09-17 13:40+0200\n" "Last-Translator: Josep Puigdemont \n" "Language-Team: Catalan \n" @@ -8756,7 +8756,7 @@ msgstr "mount: segons mtab, %s està muntat a %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: no s'ha pogut obrir %s per a escriptura: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: s'ha produït un error en escriure %s: %s" @@ -8806,88 +8806,88 @@ msgstr " i sembla que això és espai d'intercanvi\n" msgid " I will try type %s\n" msgstr " Provaré amb el tipus %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s sembla espai d'intercanvi - no s'ha muntat" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "no s'ha estat possible muntar" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: només l'usuari root pot muntar %s a %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: el dispositiu loop està especificat dues vegades" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: el tipus està especificat dues vegades" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: s'està ometent la configuració d'un dispositiu loop\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: segons mtab, %s ja està muntat a %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: s'usarà el dispositiu loop %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: no ha estat possible configurar el dispositiu loop\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: s'ha configurat el dispositiu loop amb èxit\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: no s'ha trobat %s; s'està creant...\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: no s'ha pogut obrir %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: l'argument a -p o --pass-fd ha de ser un nombre" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: no s'ha pogut obrir %s per establir-ne la velocitat" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount : no s'ha pogut establir la velocitat de: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, fuzzy, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: segons mtab, %s ja està muntat a %s" diff --git a/po/cs.po b/po/cs.po index 752026f6..7c75ec46 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2009-04-20 13:39+0200\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -8650,7 +8650,7 @@ msgstr "mount: podle mtab je %s připojeno na %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: %s nelze otevřít pro zápis: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: chyba při zápisu %s: %s" @@ -8700,88 +8700,88 @@ msgstr " a vypadá to, že se jedná o odkládací prostor\n" msgid " I will try type %s\n" msgstr " Vyzkouším typ %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s vypadá jako odkládací prostor - nepřipojeno" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "připojení se nezdařilo" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: pouze superuživatel může připojit %s na %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: zařízení loop bylo zadáno dvakrát" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: typ byl zadán dvakrát" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: přeskakuji nastavení loop zařízení\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: podle mtab je %s již připojeno na %s jako loop" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: chystám se použít zařízení loop %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "mount: ukradený loop=%s … zkouším znovu\n" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "umount: ukradený loop=%s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: nepodařilo se nastavit zařízení loop\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: zařízení loop bylo korektně nastaveno\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: %s nebylo nalezeno - vytvářím jej..\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: %s nelze otevřít: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: argument přepínačů -p a --pass-fd musí být číslo" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: %s nelze otevřít za účelem nastavení rychlosti" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: rychlost nelze nastavit: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: podle mtab je %s již připojeno do %s\n" diff --git a/po/da.po b/po/da.po index f9f5a485..3121cca1 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2005-08-15 21:00+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -8582,7 +8582,7 @@ msgstr "mount: if msgid "mount: can't open %s for writing: %s" msgstr "mount: kunne ikke bne %s for skrivning: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: fejl ved skrivning til %s: %s" @@ -8632,88 +8632,88 @@ msgstr " og det ser ud til, at dette er swapomr msgid " I will try type %s\n" msgstr " Jeg vil forsge type %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s ligner et swap-omrde - ikke monteret" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "montering mislykkedes" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: kun root kan montere %s som %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: loop-enheden angivet to gange" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: type angivet to gange" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: dropper opstning af loop-enhed\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: iflge mtab er %s allerede monteret som %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: skal til at benytte loop-enheden %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: klargring af loop-enhed mislykkedes\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: klargringen af loop-enhed lykkedes\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: ingen %s fundet - opretter den..\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: kunne ikke bne %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: argumentet til -p eller --pass-fd skal vre et tal" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: kunne ikke bne %s for at stte hastigheden" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: kunne ikke stte hastigheden: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, fuzzy, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: iflge mtab er %s allerede monteret som %s" diff --git a/po/de.po b/po/de.po index dc1d1560..38701acc 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2008-01-09 17:38+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: German \n" @@ -8859,7 +8859,7 @@ msgstr "mount: Laut mtab ist %s auf %s eingehängt" msgid "mount: can't open %s for writing: %s" msgstr "mount: Konnte %s nicht zum Schreiben öffnen: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: Fehler beim Schreiben von %s: %s" @@ -8916,88 +8916,88 @@ msgstr " und es sieht so aus, als sei dies Swap-Bereich\n" msgid " I will try type %s\n" msgstr " Werde den Typ %s versuchen\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s sieht wie ein Swap-Bereich aus – nicht eingehängt" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "mount ist fehlgeschlagen" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: nur „root“ kann %s auf %s einhängen" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: das „loop“-Gerät wurde zweimal angegeben" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: der Typ wurde doppelt angegeben" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: überspringe Aufsetzen des „loop“-Geräts\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: Laut mtab ist %s schon auf %s eingehängt" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: werde das „loop“-Gerät %s verwenden\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "mount: loop=%s gestohlen …versuche es erneut\n" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "mount: loop=%s gestohlen" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: Aufsetzen des „loop“-Geräts fehlgeschlagen\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: „loop“-Gerät erfolgreich aufgesetzt\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: %s nicht gefunden – Erzeuge sie…\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: Konnte %s nicht öffnen: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: Argument für -p oder --pass-fd muss eine Zahl sein" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: Kann %s nicht zum Setzen der Geschwindigkeit öffnen" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: Laut mtab ist %s schon auf %s eingehängt\n" diff --git a/po/es.po b/po/es.po index eaaff06b..ebe9324a 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2004-12-22 01:31+0100\n" "Last-Translator: Santiago Vila Doncel \n" "Language-Team: Spanish \n" @@ -8766,7 +8766,7 @@ msgstr "mount: seg msgid "mount: can't open %s for writing: %s" msgstr "mount: no se puede abrir %s para escritura: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: error al escribir %s: %s" @@ -8816,88 +8816,88 @@ msgstr " y parece que sea un espacio de intercambio\n" msgid " I will try type %s\n" msgstr " Se probar con el tipo %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s parece espacio de intercambio - no montado" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "montaje errneo" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: slo el usuario root puede montar %s en %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: dispositivo de bucle especificado dos veces" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: tipo especificado dos veces" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: omitiendo la configuracin de un dispositivo de bucle\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: segn mtab, %s ya est montado en %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: se va a utilizar el dispositivo de bucle %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: error al configurar dispositivo de bucle\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: configuracin correcta de dispositivo de bucle\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: no se ha encontrado %s; se est creando...\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: no se puede abrir %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: el argumento para -p o --pass-fd debe ser un nmero" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: no se puede abrir %s para establecer la velocidad" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: no se puede establecer la velocidad: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, fuzzy, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: segn mtab, %s ya est montado en %s" diff --git a/po/et.po b/po/et.po index 38617197..adc098da 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2002-05-19 20:04GMT+0300\n" "Last-Translator: Meelis Roos \n" "Language-Team: Estonian \n" @@ -8509,7 +8509,7 @@ msgstr "" msgid "mount: can't open %s for writing: %s" msgstr "" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "" @@ -8559,88 +8559,88 @@ msgstr "" msgid " I will try type %s\n" msgstr "" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "" diff --git a/po/eu.po b/po/eu.po index 00b52324..a26fe4b2 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2005-08-15 18:45+0200\n" "Last-Translator: Mikel Olasagasti \n" "Language-Team: Basque \n" @@ -8048,7 +8048,7 @@ msgstr "" msgid "mount: can't open %s for writing: %s" msgstr "" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "" @@ -8098,88 +8098,88 @@ msgstr "" msgid " I will try type %s\n" msgstr "" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 643d7c5d..96c8a289 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2009-03-08 14:17+0200\n" "Last-Translator: Lauri Nurmi \n" "Language-Team: Finnish \n" @@ -8610,7 +8610,7 @@ msgstr "mount: mtab-tiedoston mukaan %s on liitetty pisteeseen %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: tiedostoa %s ei voi avata kirjoittamista varten: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: virhe kirjoitettaessa %s: %s" @@ -8660,89 +8660,89 @@ msgstr " ja tämä näyttää olevan sivutustilaa\n" msgid " I will try type %s\n" msgstr " Kokeillaan tyyppiä %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s vaikuttaa olevan sivutustilaa – ei liitetä" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "liittäminen epäonnistui" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: vain root voi liittää %s pisteeseen %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: loop-laite annettu kahdesti" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: tyyppi annettu kahdesti" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: ohitetaan loop-laitteen asettaminen\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "" "mount: mtab-tiedoston mukaan %s on jo liitetty pisteeseen %s loop-laitteena" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: aiotaan käyttää loop-laitetta %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: loop-laitteen asettaminen epäonnistui\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: loop-laite asetettiin onnistuneesti\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: ei löytynyt %s – luodaan se..\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: tiedostoa %s ei voi avata: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: argumentin valitsimelle -p tai --pass-fd on oltava luku" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: tiedostoa %s ei voi avata nopeuden asetusta varten" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: nopeutta ei voi asettaa: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: mtabin mukaan %s on jo liitetty pisteeseen %s\n" diff --git a/po/fr.po b/po/fr.po index a4032cc1..1dff9252 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2009-04-19 22:13+0100\n" "Last-Translator: Nicolas Provost \n" "Language-Team: French \n" @@ -8822,7 +8822,7 @@ msgstr "mount: selon mtab %s est mont msgid "mount: can't open %s for writing: %s" msgstr "mount: ne peut ouvrir %s en criture: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: erreur d'criture %s: %s" @@ -8873,89 +8873,89 @@ msgstr " et il semble que c'est un espace de swap\n" msgid " I will try type %s\n" msgstr " Je vais essayer le type %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s ressemble un esapce de swap - n'a pas t mont" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "chec de mount" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: seul l'usager ROOT peut monter %s sur %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: priphrique de type loop spcifi deux fois" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: type spcifi deux fois" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: escamotage du setup du priphrique de type loop\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount : selon mtab %s est dj mont sur %s en tant que \"loop\"" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: on se prpare utiliser le priphrique de type loop %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" "mount : priph. rcupr par un autre processus=%s... nouvelle tentative\n" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "mount : priph. repris par un autre processus=%s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: chec d'initialisation du priphrique de type loop\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: russite d'initialisation du priphrique de type loop\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: %s n'a pas t repr - on le cre..\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: ne peut ouvrir %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: argument -p ou --pass-fd doit tre un nombre" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: ne peut ouvrir %s pour ajuster la vitesse" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: ne peut initialiser la vitesse: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount : selon mtab %s est dj mont sur %s\n" diff --git a/po/hu.po b/po/hu.po index 4c66cd4e..89e04f3d 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2008-05-21 18:25+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -8701,7 +8701,7 @@ msgstr "mount: az mtab alapján a(z) %s a következő alá van csatolva: %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: a(z) %s nem nyitható meg írásra: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: hiba a(z) %s írásakor: %s" @@ -8752,91 +8752,91 @@ msgstr " és úgy tűnik, ez egy lapozóterület\n" msgid " I will try type %s\n" msgstr " Kísérlet a(z) %s típussal\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s lapozóterületnek tűnik - nem került csatolásra" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "a csatolás meghiúsult" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: csak a rendszergazda csatolhatja a(z) %s eszközt a(z) %s helyre" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: a hurokeszközt kétszer adta meg" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: a típust kétszer adta meg" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: a hurokeszköz beállításának kihagyása\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "" "mount: az mtab alapján a(z) %s már csatolva van hurokeszközként a " "következőn: %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: a(z) %s hurokeszköz kerül felhasználásra\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" "mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "mount: a(z) %s hurokeszközt egy másik folyamat ellopta" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: a hurokeszköz beállítása meghiúsult\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: a hurokeszköz beállítása sikerült\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: nem található a(z) %s - létrehozás...\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: a(z) %s nem nyitható meg: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: a -p vagy --pass-fd argumentumának számnak kell lennie" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: a(z) %s nem nyitható meg a sebesség beállításához" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: nem állítható be a sebesség: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: az mtab alapján a(z) %s már csatolva van a következőn: %s\n" diff --git a/po/id.po b/po/id.po index fa1f70d5..8d064928 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2009-04-20 09:00+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -8697,7 +8697,7 @@ msgstr "mount: menurut mtab, %s telah di mount di %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: tidak dapat membuka %s untuk menulis: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: error dalam menulis %s: %s" @@ -8748,88 +8748,88 @@ msgstr " dan ini sepertinya merupakan sebuah swapspace\n" msgid " I will try type %s\n" msgstr " Saya akan mencoba tipe %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s kelihatannya seperti swapspace - tidak di mount" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "mount gagal" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: hanya root yang dapat melakukan mount %s di %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: perangkat loop dispesifikasikan dua kali" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: tipe dispesifikasikan dua kali" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: melewatkan setup dari perangkat loop\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: menurut mtab, %s telah dimount di %s sebagai loop" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: akan menggunakan perangkat loop %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "mount: tercuri loop=%s ...mencoba lagi\n" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "umount: tercuri loop=%s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: gagal menset-up perangkat loop\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: setup perangkat loop telah berhasil\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: %s tidak ditemukan - membuatnya..\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: tidak dapat membuka %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: argument untuk -p atau --pass-fd harus berupa sebuah nomor" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: tidak dapat membuka %s untuk menset kecepatan" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount tidak dapat menset kecepatan: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: menurut mtab, %s telah dimount di %s\n" diff --git a/po/it.po b/po/it.po index 468739f5..19e64fcc 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2008-04-18 13:44+0100\n" "Last-Translator: Marco Colombo \n" "Language-Team: Italian \n" @@ -8642,7 +8642,7 @@ msgstr "mount: secondo mtab, %s è montato su %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: impossibile aprire %s in scrittura: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: errore durante la scrittura di %s: %s" @@ -8692,88 +8692,88 @@ msgstr " e sembra che questo sia swapspace\n" msgid " I will try type %s\n" msgstr " Proverò il tipo %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s assomigla a swapspace - non montato" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "mount non riuscito" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: solamente root può montare %s su %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: loop device specificato due volte" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: tipo specificato due volte" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: si ignora l'impostazione di un loop device\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: secondo mtab, %s è già montato su %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: si intende utilizzare il loop device %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: mancata impostazione del loop device\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: impostazione del loop device riuscita\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: nessun %s trovato - creazione in corso...\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: impossibile aprire %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: l'argomento di -p o --pass-fd deve essere un numero" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: impossibile aprire %s per impostare la velocità" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: impossibile impostare la velocità: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: secondo mtab, %s è già montato su %s\n" diff --git a/po/ja.po b/po/ja.po index 92dc277a..7daac5d7 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2009-01-28 16:54+0900\n" "Last-Translator: Makoto Kato \n" "Language-Team: Japanese \n" @@ -8568,7 +8568,7 @@ msgstr "mount: mtab によると、%s は %s にマウントされています" msgid "mount: can't open %s for writing: %s" msgstr "mount: %s を書き込み用にオープンできません: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: %s の書き込みエラー: %s" @@ -8618,88 +8618,88 @@ msgstr " そして、それはスワップ空間の様です。\n" msgid " I will try type %s\n" msgstr " タイプ %s を試してみます\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s はスワップ空間のようですね -- マウントしません" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "マウントに失敗しました" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: root だけが %s を %s にマウントできます" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: loop デバイスが 2 回指定されました" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: タイプが 2 回指定されました" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: loop デバイスの設定をスキップします\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: mtab によると、%s は loop として %s にマウント済です" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: loop デバイス %s を使います\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "mount: stolen loop=%s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: loop デバイスの設定に失敗しました\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: loop デバイスの設定に成功しました\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: %s が見つかりません -- 作成します..\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: %s がオープンできません: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: -p または --pass-fd 引数は数字でなければなりません" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: %s を速度設定用にオープンできません" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: 速度の設定ができません: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: mtab によると、%s は %s にマウント済です\n" diff --git a/po/nl.po b/po/nl.po index 0caefc85..14544f32 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2009-01-31 20:52+0100\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" @@ -8682,7 +8682,7 @@ msgstr "mount: volgens mtab is %s aangekoppeld op %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: kan %s niet openen om te schrijven: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: fout bij schrijven van %s: %s" @@ -8732,89 +8732,89 @@ msgstr " het lijkt erop dat dit wisselgeheugen is\n" msgid " I will try type %s\n" msgstr " soort %s wordt geprobeerd\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s ziet er uit als wisselgeheugen -- niet aangekoppeld" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "aankoppelen is mislukt" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: alleen root kan %s aankoppelen op %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: lus-apparaat is twee keer aangegeven" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: soort is twee keer aangegeven" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: instellen van lus-apparaat wordt overgeslagen\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: volgens mtab is %s al als lus-apparaat aangekoppeld op %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: lus-apparaat %s zal worden gebruikt\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" "mount: lus-apparaat %s is door ander proces afgepakt; ... nieuwe poging\n" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "mount: lus-apparaat %s is door ander proces afgepakt" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: instellen van lus-apparaat is mislukt\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: lus-apparaat is succesvol ingesteld\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: geen %s gevonden -- wordt nu aangemaakt...\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: kan %s niet openen: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: argument van '-p' of '--pass-fd' moet een getal zijn" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: kan %s niet openen om snelheid in te stellen" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: kan snelheid niet instellen: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: volgens mtab is %s al aangekoppeld op %s\n" diff --git a/po/pl.po b/po/pl.po index 7c04f106..39776539 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2006-12-22 00:25+0100\n" "Last-Translator: Andrzej Krzysztofowicz \n" "Language-Team: Polish \n" @@ -8052,7 +8052,7 @@ msgstr "" msgid "mount: can't open %s for writing: %s" msgstr "" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "" @@ -8102,88 +8102,88 @@ msgstr "" msgid " I will try type %s\n" msgstr "" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2432fe85..01f6b457 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2001-05-24 16:03-03:00\n" "Last-Translator: Rodrigo Stulzer Lopes \n" "Language-Team: Brazilian Portuguese \n" @@ -8660,7 +8660,7 @@ msgstr "mount: de acordo com mtab, %s est msgid "mount: can't open %s for writing: %s" msgstr "mount: no foi possvel abrir %s para gravao: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: erro ao gravar %s: %s" @@ -8710,88 +8710,88 @@ msgstr " e parece ser um espa msgid " I will try type %s\n" msgstr " experimentarei o tipo %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s parece espao de permuta - no montado" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "mount falhou" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: somente o root pode montar %s em %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: dispositivo de lao especificado duas vezes" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: tipo especificado duas vezes" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: ignorando a configurao de um dispositivo de lao\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: de acordo com mtab, %s j est montado em %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: ser usado o dispositivo de lao %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: falha ao configurar dispositivo de lao\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: configurao de dispositivo de lao realizada com sucesso\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: nenhum %s encontrado - criando-o...\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: no foi possvel abrir %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, fuzzy, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: no foi possvel abrir %s para configurao da velocidade" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: no foi possvel configurar velocidade: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, fuzzy, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: de acordo com mtab, %s j est montado em %s" diff --git a/po/ru.po b/po/ru.po index c294e370..e88ca145 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2006-03-07 12:42+0200\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -8687,7 +8687,7 @@ msgstr "mount: msgid "mount: can't open %s for writing: %s" msgstr "mount: %s : %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: %s: %s" @@ -8737,88 +8737,88 @@ msgstr " msgid " I will try type %s\n" msgstr " %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s - " -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "mount " -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: root %s %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: " -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: " -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: \n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: mtab, %s %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: \n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: \n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: %s - ...\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: -p --pass-fd " -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: %s " -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: : %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, fuzzy, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: mtab, %s %s" diff --git a/po/sl.po b/po/sl.po index 0fb32d1f..c007337e 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2006-03-05 12:29+0200\n" "Last-Translator: Simon Mihevc \n" "Language-Team: Slovenian \n" @@ -8618,7 +8618,7 @@ msgstr "mount: po evidenci mtab je %s priklopljeno na %s<" msgid "mount: can't open %s for writing: %s" msgstr "mount: enote %s ni mo odpreti za pisanje: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: napaka pri pisanju na %s: %s" @@ -8668,88 +8668,88 @@ msgstr "\tin izgleda kot da je izmenjalni prostor\n" msgid " I will try type %s\n" msgstr "\tUporabljen bo tip %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s je podoben izmenjalnemu prostoru, zato ne bo priklopljen" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "priklop ni uspel" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: loop naprava je podana dvakrat" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: tip je podan dvakrat" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: nastavitev loop naprave bo preskoena\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: po evidenci mtab je %s e priklopljeno na %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: loop naprava %s bo uporabljena\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: nastavitev loop naprave ni uspela\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: nastavitev loop naprave je uspela\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: %s bo ustvarjen, ker ga nisem nael\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: %s ni mogoe odpreti: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: argument pri -p ali --pass-fd mora biti tevilka" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: %s ni mogoe odpreti za nastavitev hitrosti" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: hitrosti ni mogoe nastaviti: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, fuzzy, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: po evidenci mtab je %s e priklopljeno na %s" diff --git a/po/sv.po b/po/sv.po index 95fec771..f4ec7bc2 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2007-11-14 09:20+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -8695,7 +8695,7 @@ msgstr "mount: enligt mtab är %s monterat på %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: kan inte öppna %s för skrivning: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: fel vid skrivning av %s: %s" @@ -8745,88 +8745,88 @@ msgstr " och det verkar som om detta är växlingsutrymme\n" msgid " I will try type %s\n" msgstr " Jag kommer att försöka med typen %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s ser ut som växlingsutrymme - monteras inte" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "montering misslyckades" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: endast root kan montera %s på %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: slingenheten angiven två gånger" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: typen angiven två gånger" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: hoppar över konfigurationen av en slingenhet\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: enligt mtab är %s redan monterat på %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: kommer att använda slingenheten %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "mount: stulen loop=%s ...försöker igen\n" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "mount: stulen loop=%s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: misslyckades konfigurera slingenheten\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: lyckades konfigurera slingenheten\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: ingen %s hittades - skapar den...\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: kan inte öppna %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: argument till -p eller --pass-fd måste vara ett tal" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: kan inte öppna %s för inställning av hastighet" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: kan inte ställa in hastighet: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: enligt mtab är %s redan monterat på %s\n" diff --git a/po/tr.po b/po/tr.po index fc278c96..db920ffe 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2006-03-06 15:45+0200\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -8655,7 +8655,7 @@ msgstr "mount: mtab'a göre, %s %s üzerinde bağlı" msgid "mount: can't open %s for writing: %s" msgstr "mount: %s yazmak için açılamıyor: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: %s yazılırken hata: %s" @@ -8705,88 +8705,88 @@ msgstr " ve bu takas alanı gibi görünüyor\n" msgid " I will try type %s\n" msgstr " %s türü denenecek\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s takas alanı gibi görünüyor - bağlanmadı" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "mount başarısız" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: %s %s üzerinde sadece root tarafından bağlanabilir" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: loop aygıtı iki kere belirtilmiş" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: türü iki defa belirtilmiş" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: loop aygıtı ayarları atlanıyor\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: mtab'a göre, %s zaten %s üzerinde bağlı" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: %s loop aygıtının kullanımına gidiliyor\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: loop aygıtı ayarları yapılamadı\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: loop aygıtı ayarları tamamlandı\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: %s yok - oluşturuluyor...\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: %s açılamıyor: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: -p ve --pass-fd seçeneklerinin argümanı bir sayı olmalıdır" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: hızı ayarlamak için %s açılamıyor" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: hız ayarlanamıyor: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, fuzzy, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: mtab'a göre, %s zaten %s üzerinde bağlı" diff --git a/po/uk.po b/po/uk.po index d2281fb6..85fdb25e 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2006-04-06 10:45+0200\n" "Last-Translator: Maxim V. Dziumanenko \n" "Language-Team: Ukrainian \n" @@ -8636,7 +8636,7 @@ msgstr "mount: згідно mtab, %s підключений у %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: не вдається відкрити %s для запису: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: помилка запису %s: %s" @@ -8686,88 +8686,88 @@ msgstr " та він схожий розділ підкачки\n" msgid " I will try type %s\n" msgstr " буде випробувано тип %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s схожий на розділ підкачки - не підключатиметься" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "помилка підключення" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: лише адміністратор(root) може підключати %s у %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: loop-пристрій вказано двічі" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: тип вказано двічі" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: пропускається встановлення loop-пристрою\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, fuzzy, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: згідно mtab, %s вже підключений у %s" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: буде використовуватись loop-пристрій %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, fuzzy, c-format msgid "mount: stolen loop=%s" msgstr "umount: %s: %s" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: помилка встановлення loop-пристрою\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: встановлення loop-пристрою успішно завершено\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: не знайдено %s - створюється..\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: не вдається відкрити %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: аргумент для -p або --pass-fd повинен бути числом" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: помилка відкривання %s для встановлення швидкості" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: помилка встановлення швидкості: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, fuzzy, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: згідно mtab, %s вже підключений у %s" diff --git a/po/util-linux-ng.pot b/po/util-linux-ng.pot index d78864b0..07e0a8ba 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -8020,7 +8020,7 @@ msgstr "" msgid "mount: can't open %s for writing: %s" msgstr "" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "" @@ -8070,88 +8070,88 @@ msgstr "" msgid " I will try type %s\n" msgstr "" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "" diff --git a/po/vi.po b/po/vi.po index 0d8d45b4..f48e1061 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2009-05-13 20:37+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -8685,7 +8685,7 @@ msgstr "mount: theo như mtab thì %s đã gắn vào %s" msgid "mount: can't open %s for writing: %s" msgstr "mount: không mở được %s để ghi nhớ: %s" -#: mount/mount.c:572 mount/mount.c:1193 +#: mount/mount.c:572 mount/mount.c:1190 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: lỗi ghi nhớ %s: %s" @@ -8735,88 +8735,88 @@ msgstr " và đây có vẻ là vùng trao đổi\n" msgid " I will try type %s\n" msgstr " Sẽ thử loại %s\n" -#: mount/mount.c:905 +#: mount/mount.c:902 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s có vẻ là vùng trao đổi - không gắn" -#: mount/mount.c:996 +#: mount/mount.c:993 msgid "mount failed" msgstr "mount (gắn) không thành công" -#: mount/mount.c:998 +#: mount/mount.c:995 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: chỉ người chủ có quyền gắn %s vào %s" -#: mount/mount.c:1068 +#: mount/mount.c:1065 msgid "mount: loop device specified twice" msgstr "mount: chỉ ra hai lần thiết bị vòng lặp" -#: mount/mount.c:1073 +#: mount/mount.c:1070 msgid "mount: type specified twice" msgstr "mount: chỉ ra hai lần kiểu hệ thống tập tin" -#: mount/mount.c:1085 +#: mount/mount.c:1082 #, c-format msgid "mount: skipping the setup of a loop device\n" msgstr "mount: bỏ qua việc cấu hình thiết bị vòng lặp\n" -#: mount/mount.c:1097 +#: mount/mount.c:1094 #, c-format msgid "mount: according to mtab %s is already mounted on %s as loop" msgstr "mount: theo như mtab thì %s đã gắn vào %s làm vòng lặp" -#: mount/mount.c:1107 +#: mount/mount.c:1104 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: sẽ sử dụng thiết bị vòng lặp %s\n" -#: mount/mount.c:1116 +#: mount/mount.c:1113 #, c-format msgid "mount: stolen loop=%s ...trying again\n" msgstr "mount: stolen loop=%s (vòng lặp bị ăn cắp) nên thử lại\n" -#: mount/mount.c:1121 +#: mount/mount.c:1118 #, c-format msgid "mount: stolen loop=%s" msgstr "mount: stolen loop=%s (vòng lặp bị ăn cắp)" -#: mount/mount.c:1126 +#: mount/mount.c:1123 #, c-format msgid "mount: failed setting up loop device\n" msgstr "mount: thiết lập thiết bị vòng lặp không thành công\n" -#: mount/mount.c:1137 +#: mount/mount.c:1134 #, c-format msgid "mount: setup loop device successfully\n" msgstr "mount: thiết lập thiết bị vòng lặp thành công\n" -#: mount/mount.c:1171 +#: mount/mount.c:1168 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: không tìm thấy %s - đang tạo..\n" -#: mount/mount.c:1188 +#: mount/mount.c:1185 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: không mở được %s: %s" -#: mount/mount.c:1209 +#: mount/mount.c:1206 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: tham số cho -p hoặc --pass-fd phải là một số" -#: mount/mount.c:1222 +#: mount/mount.c:1219 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: không mở được %s để đặt tốc độ" -#: mount/mount.c:1225 +#: mount/mount.c:1222 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: không đặt được tốc độ: %s" -#: mount/mount.c:1282 +#: mount/mount.c:1279 #, c-format msgid "mount: according to mtab, %s is already mounted on %s\n" msgstr "mount: theo như mtab thì %s đã gắn vào %s\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6f924e44..8c24af6c 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 \n" -"POT-Creation-Date: 2009-05-27 21:39+0200\n" +"POT-Creation-Date: 2009-06-10 14:23+0200\n" "PO-Revision-Date: 2008-08-23 23:20+0800\n" "Last-Translator: Ray Wang \n" "Language-Team: Chinese (simplified) Date: Wed, 10 Jun 2009 14:32:58 +0200 Subject: docs: update v2.15.1 ReleaseNotes Signed-off-by: Karel Zak --- docs/v2.15.1-ReleaseNotes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/v2.15.1-ReleaseNotes b/docs/v2.15.1-ReleaseNotes index b879d302..98de1797 100644 --- a/docs/v2.15.1-ReleaseNotes +++ b/docs/v2.15.1-ReleaseNotes @@ -34,6 +34,8 @@ lscpu: - fix cpuid code on x86/PIC [Mike Frysinger] mount: - fix undefined reference to `security_get_initial_context' [Karel Zak] + - move MS_{PROPAGATION,BIND,MOVE} detection [Karel Zak] + - use "none" fstype for MS_PROPAGATION mounts [Karel Zak] po: - merge changes [Karel Zak] - update vi.po (from translationproject.org) [Clytie Siddall] -- cgit v1.2.3 From e2de50f8b4da55675dc1444c101f402e798a8593 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 10 Jun 2009 14:34:52 +0200 Subject: build-sys: release++ (v2.15.1) Signed-off-by: Karel Zak --- NEWS | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index baebb7c2..76ef3391 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +util-linux-ng 2.15.1: Jun 10 2009 +* see docs/v2.15.1-ReleaseNotes or complete changelog at + ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-ChangeLog + util-linux-ng 2.15.1-rc1: May 27 2009 * see docs/v2.15.1-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-rc1-ChangeLog diff --git a/configure.ac b/configure.ac index 97cda57b..a6bc86c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(util-linux-ng, 2.15.1-rc1, kzak@redhat.com) +AC_INIT(util-linux-ng, 2.15.1, kzak@redhat.com) AC_PREREQ(2.60) -- cgit v1.2.3 From 4bde2211c13ffe11e0ac96be3ef9676f9fd22fa5 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Wed, 18 Feb 2009 14:56:02 +0000 Subject: hwclock: only call --systz from the udev rule Use the new --systz option in the udev rule for /dev/rtc0, stepping the clock if the hardware clock wasn't in localtime and updating the kernel timezone. Since udev can directly import /etc/default/rcS to get the UTC and BADYEAR settings, we don't need a wrapper shell script for this saving a bit of time. --- debian/hwclock.rules | 9 +++++++-- debian/hwclock.udev | 29 ----------------------------- debian/rules | 3 +-- 3 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 debian/hwclock.udev diff --git a/debian/hwclock.rules b/debian/hwclock.rules index 92b5e114..fc22468c 100644 --- a/debian/hwclock.rules +++ b/debian/hwclock.rules @@ -1,3 +1,8 @@ -# This file causes the hardware clock to be set when /dev/rtc is available. +# Reset the System Clock to UTC if the hardware clock from which it was +# copied by the kernel was in localtime. -KERNEL=="rtc", ACTION=="add", RUN+="set_hwclock" +KERNEL=="rtc0", IMPORT{file}="/etc/default/rcS" +KERNEL=="rtc0", ENV{UTC}!="yes", ENV{BADYEAR}!="yes", \ + RUN+="/sbin/hwclock --rtc=$root/$name --systz --localtime --noadjfile" +KERNEL=="rtc0", ENV{UTC}!="yes", ENV{BADYEAR}=="yes", \ + RUN+="/sbin/hwclock --rtc=$root/$name --systz --localtime --noadjfile --badyear" diff --git a/debian/hwclock.udev b/debian/hwclock.udev deleted file mode 100644 index d768f900..00000000 --- a/debian/hwclock.udev +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# udev helper for hwclock -# -# This is based on the hwclock.sh init script, but somewhat simplified. - -[ ! -x /sbin/hwclock ] && exit 0 -. /etc/default/rcS - -[ "$GMT" = "-u" ] && UTC="yes" -case "$UTC" in - no|"") GMT="--localtime" - UTC="" - ;; - yes) GMT="--utc" - UTC="--utc" - ;; - *) exit 1 ;; -esac - -case "$BADYEAR" in - no|"") BADYEAR="" ;; - yes) BADYEAR="--badyear" ;; - *) exit 1 ;; -esac - -# Copies Hardware Clock time to System Clock using the correct -# timezone for hardware clocks in local time, and sets kernel -# timezone. DO NOT REMOVE. -/sbin/hwclock --hctosys $GMT $HWCLOCKPARS $BADYEAR diff --git a/debian/rules b/debian/rules index 22c74ab7..5c3d3d29 100755 --- a/debian/rules +++ b/debian/rules @@ -112,8 +112,7 @@ endif fi ifneq ($(DISTRO),Debian) if [ -f debian/util-linux/sbin/hwclock ] ; then \ - install -m 755 debian/hwclock.udev debian/util-linux/lib/udev/set_hwclock && \ - install -m 644 debian/hwclock.rules debian/util-linux/etc/udev/rules.d/85-hwclock.rules; \ + install -m 644 debian/hwclock.rules debian/util-linux/lib/udev/rules.d/85-hwclock.rules; \ fi endif cd debian; if [ -f util-linux/sbin/fdisk ]; then \ -- cgit v1.2.3 From bb34cffdd4033f7226da6487f5db5c6c71b96b40 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Tue, 14 Jul 2009 17:39:56 +0100 Subject: hwclock: make start a no-op when udev is running Since we set the system clock from a udev rule, we don't need to do it from an init script and we certainly don't need to do it twice! --- debian/hwclock.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/hwclock.sh b/debian/hwclock.sh index 4ceb95e8..80b17bc4 100644 --- a/debian/hwclock.sh +++ b/debian/hwclock.sh @@ -67,6 +67,10 @@ hwclocksh() case "$1" in start) + if [ -d /dev/.udev ]; then + return 0 + fi + if [ -w /etc ] && [ ! -f /etc/adjtime ] && [ ! -e /etc/adjtime ]; then echo "0.0 0 0.0" > /etc/adjtime fi -- cgit v1.2.3 From 0419e06bbce052deb50f6fb2c769df9beeda6aa2 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Tue, 14 Jul 2009 17:52:52 +0100 Subject: rules: Install udev rules into /lib/udev/rules.d Unconditionally install the udev rules, moving them on upgrade from /etc to /lib if necessary --- debian/README.Debian.hwclock | 7 +++++-- debian/rules | 5 ----- debian/util-linux.dirs | 3 +-- debian/util-linux.preinst | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 debian/util-linux.preinst diff --git a/debian/README.Debian.hwclock b/debian/README.Debian.hwclock index d3ac5cea..c8b840cb 100644 --- a/debian/README.Debian.hwclock +++ b/debian/README.Debian.hwclock @@ -1,7 +1,10 @@ hwclock and Debian: -A Debian installation will, by default, call hwclock --hctosys during system -startup and hwclock --systohc during system shutdown. +When udev is running, hwclock -systz will be called when the RTC clock +device is created. When udev is not running, hwclock --hctosys will be +called during system startup. + +In both cases, hwclock --systohc will be called during system shutdown. To set the date/time of the system, just use the standard UNIX date facilities (such as date) or any of the advanced timekeeping utilities (ntp, ntpdate, diff --git a/debian/rules b/debian/rules index 5c3d3d29..58910736 100755 --- a/debian/rules +++ b/debian/rules @@ -36,9 +36,6 @@ CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang ifeq ($(DEB_HOST_ARCH_OS),linux) CONFOPTS += --with-selinux endif -ifneq ($(DISTRO),Debian) -CONFOPTS += --with-fsprobe=volume_id -endif build: build-stamp build-stamp: @@ -110,11 +107,9 @@ endif -e '/Default-Start:/a# Default-Stop:' -e '/Default-Stop:/d' \ debian/util-linux/etc/init.d/hwclockfirst.sh; \ fi -ifneq ($(DISTRO),Debian) if [ -f debian/util-linux/sbin/hwclock ] ; then \ install -m 644 debian/hwclock.rules debian/util-linux/lib/udev/rules.d/85-hwclock.rules; \ fi -endif cd debian; if [ -f util-linux/sbin/fdisk ]; then \ ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \ S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \ diff --git a/debian/util-linux.dirs b/debian/util-linux.dirs index db07a87b..16ef4dd1 100644 --- a/debian/util-linux.dirs +++ b/debian/util-linux.dirs @@ -2,8 +2,6 @@ bin/ sbin/ etc/ etc/init.d/ -etc/udev/ -etc/udev/rules.d/ usr/ usr/bin/ usr/sbin/ @@ -22,3 +20,4 @@ usr/share/lintian/ usr/share/lintian/overrides/ lib/ lib/udev/ +lib/udev/rules.d/ diff --git a/debian/util-linux.preinst b/debian/util-linux.preinst new file mode 100644 index 00000000..a6a6527e --- /dev/null +++ b/debian/util-linux.preinst @@ -0,0 +1,15 @@ +#! /bin/sh + +set -e + +if [ "$1" = install ] || [ "$1" = upgrade ]; then + if [ -e "/etc/udev/rules.d/85-hwclock.rules" ]; then + if [ "`md5sum \"/etc/udev/rules.d/85-hwclock.rules\" | sed -e \"s/ .*//\"`" = \ + "`dpkg-query -W -f='${Conffiles}' util-linux | sed -n -e \"\\\\' /etc/udev/rules.d/85-hwclock.rules's/.* //p\"`" ] + then + rm -f "/etc/udev/rules.d/85-hwclock.rules" + fi + fi +fi + +#DEBHELPER# -- cgit v1.2.3 From 144ade1fd4e1d6bc5b0391545a0a36db09c1d165 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Tue, 14 Jul 2009 18:07:19 +0100 Subject: changelog: release --- debian/changelog | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2057418e..f6b1ef1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,75 @@ +util-linux (2.15.1-1) unstable; urgency=low + + [Aurelien Jarno] + + * chrt: don't assume SCHED_BATCH and SCHED_IDLE exist + * remaining kFreeBSD hackery for building. Closes: #527384 + * metafile changes for kFreeBSD buildability hackery. Closes: #527384 + + [Mike Frysinger] + + * lscpu: fix cpuid code on x86/PIC + * losetup: handle symlinks in /dev/loop/ + + [LaMont Jones] + + * Add keybuk as uploader. + * meta: cleanup rules targets + + [Scott James Remnant] + + * hwclock: only call --systz from the udev rule + * hwclock: make start a no-op when udev is running + * rules: Install udev rules into /lib/udev/rules.d + + [Chris Webb] + + * fdisk: (and cfdisk) fix to be consistent about maximum heads + + [Rajeev V. Pillai] + + * cal: Highlight today even when month or year specified + + [Tom Prince] + + * cal: uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY. + + [Karel Zak] + + * build-sys: fix "make -C" bug + * build-sys: fix blkid.h include for old e2fsprogs + * blkid: make libuuid optional + * blkid: fix "hangs forever with partition type mdraid" + * blkid: blkid_do_safeprobe() has to be tolerant to RAIDs + * blkid: cleanup debug messages and return codes in blkid_do_probe() + * mount: fix undefined reference to `security_get_initial_context'. gentoo: + #270168 + * libblkid: update man page + * libblkid: fix reiserfs name + * build-sys: add UTIL_{SET,RESTORE}_FLAGS + * build-sys: fix blkid detection in configure.ac + * tests: add mdraid libblkid test + * tests: fix reiserfs test + * tests: don't run some mount tests for non-root users + * tests: remove broken Xen dumps for lscpu + * tests: move lscpu /proc and /sys dumps to tarballs + * tests: fix script that creates lscpu dumps + * docs: update AUTHORS file + * docs: add v2.15.1 ReleaseNotes + * docs: add missing commands/projects to AUTHORS file + * build-sys: release++ (v2.15.1-rc1) + * mount: use "none" fstype for MS_PROPAGATION mounts + * mount: move MS_{PROPAGATION,BIND,MOVE} detection + * docs: update v2.15.1 ReleaseNotes + * build-sys: release++ (v2.15.1) + * po: merge changes + + [localization folks] + + * po: update vi.po (from translationproject.org) (Clytie Siddall) + + -- Scott James Remnant Tue, 14 Jul 2009 18:00:01 +0100 + util-linux (2.15.1~rc1-1) unstable; urgency=low [Aurelien Jarno] -- cgit v1.2.3