--- eject-2.0.13deb.orig/po/eject.pot +++ eject-2.0.13deb/po/eject.pot @@ -1,25 +1,22 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-06-07 12:23+0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-10-08 16:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Transfer-Encoding: 8bit\n" -#: ../eject.c:110 ../eject.c:893 -#, c-format -msgid "%s: device is `%s'\n" -msgstr "" - -#: ../eject.c:112 +#: ../eject.c:136 #, c-format msgid "" "Eject version %s by Jeff Tranter (tranter@pobox.com)\n" @@ -40,19 +37,21 @@ " -f\t-- eject floppy\n" " -q\t-- eject tape\n" " -p\t-- use /proc/mounts instead of /etc/mtab\n" +" -m\t-- do not unmount device even if it is mounted\n" msgstr "" -#: ../eject.c:133 +#: ../eject.c:165 +#, c-format msgid "" "Long options:\n" -" -h --help -v --verbose\t -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi\t -f --floppy\n" -" -q --tape -n --noop\t -V --version\n" -" -p --proc\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" msgstr "" -#: ../eject.c:141 +#: ../eject.c:183 #, c-format msgid "" "Parameter can be a device file or a mount point.\n" @@ -60,280 +59,316 @@ "By default tries -r, -s, -f, and -q in order until success.\n" msgstr "" -#: ../eject.c:193 +#: ../eject.c:236 #, c-format msgid "%s: invalid argument to --auto/-a option\n" msgstr "" -#: ../eject.c:205 +#: ../eject.c:248 #, c-format msgid "%s: invalid argument to --changerslot/-c option\n" msgstr "" -#: ../eject.c:217 +#: ../eject.c:260 #, c-format msgid "%s: invalid argument to --cdspeed/-x option\n" msgstr "" -#: ../eject.c:254 +#: ../eject.c:300 #, c-format msgid "eject version %s by Jeff Tranter (tranter@pobox.com)\n" msgstr "" -#: ../eject.c:264 +#: ../eject.c:310 #, c-format msgid "%s: too many arguments\n" msgstr "" -#: ../eject.c:366 +#: ../eject.c:365 +#, c-format +msgid "%s: could not allocate memory\n" +msgstr "" + +#: ../eject.c:370 +#, c-format +msgid "%s: FindDevice called too often\n" +msgstr "" + +#: ../eject.c:441 #, c-format msgid "%s: CD-ROM auto-eject command failed: %s\n" msgstr "" -#: ../eject.c:383 +#: ../eject.c:458 #, c-format msgid "%s: CD-ROM select disc command failed: %s\n" msgstr "" -#: ../eject.c:389 +#: ../eject.c:464 #, c-format msgid "%s: CD-ROM load from slot command failed: %s\n" msgstr "" -#: ../eject.c:393 +#: ../eject.c:468 #, c-format msgid "%s: IDE/ATAPI CD-ROM changer not supported by this kernel\n" msgstr "" -#: ../eject.c:408 +#: ../eject.c:487 #, c-format msgid "%s: CD-ROM tray close command failed: %s\n" msgstr "" -#: ../eject.c:412 +#: ../eject.c:491 #, c-format msgid "%s: CD-ROM tray close command not supported by this kernel\n" msgstr "" -#: ../eject.c:429 +#: ../eject.c:508 #, c-format msgid "%s: CD-ROM select speed command failed: %s\n" msgstr "" -#: ../eject.c:433 +#: ../eject.c:512 #, c-format msgid "%s: CD-ROM select speed command not supported by this kernel\n" msgstr "" -#: ../eject.c:543 +#: ../eject.c:633 #, c-format -msgid "%s: unable to exec /bin/umount of `%s': %s\n" +msgid "%s: unable to exec umount of `%s': %s\n" msgstr "" -#: ../eject.c:548 +#: ../eject.c:638 #, c-format msgid "%s: unable to fork: %s\n" msgstr "" -#: ../eject.c:553 +#: ../eject.c:643 #, c-format msgid "%s: unmount of `%s' did not exit normally\n" msgstr "" -#: ../eject.c:557 +#: ../eject.c:647 #, c-format msgid "%s: unmount of `%s' failed\n" msgstr "" -#: ../eject.c:570 +#: ../eject.c:660 #, c-format msgid "%s: unable to open `%s'\n" msgstr "" -#: ../eject.c:615 ../eject.c:691 +#: ../eject.c:706 ../eject.c:791 #, c-format msgid "unable to open %s: %s\n" msgstr "" -#: ../eject.c:655 +#: ../eject.c:751 #, c-format msgid "%s: unable to open /etc/fstab: %s\n" msgstr "" -#: ../eject.c:701 ../eject.c:928 +#: ../eject.c:801 ../eject.c:1055 #, c-format msgid "%s: unmounting `%s'\n" msgstr "" -#: ../eject.c:768 +#: ../eject.c:874 #, c-format msgid "%s: `%s' is a multipartition device\n" msgstr "" -#: ../eject.c:773 +#: ../eject.c:879 #, c-format msgid "%s: `%s' is not a multipartition device\n" msgstr "" -#: ../eject.c:786 +#: ../eject.c:892 #, c-format msgid "%s: setting CD-ROM speed to auto\n" msgstr "" -#: ../eject.c:788 +#: ../eject.c:894 #, c-format msgid "%s: setting CD-ROM speed to %dX\n" msgstr "" -#: ../eject.c:824 +#: ../eject.c:932 #, c-format msgid "%s: default device: `%s'\n" msgstr "" -#: ../eject.c:832 +#: ../eject.c:940 #, c-format msgid "%s: using default device `%s'\n" msgstr "" -#: ../eject.c:841 +#: ../eject.c:949 #, c-format msgid "%s: device name is `%s'\n" msgstr "" -#: ../eject.c:846 +#: ../eject.c:955 #, c-format msgid "%s: unable to find or open device for: `%s'\n" msgstr "" -#: ../eject.c:850 +#: ../eject.c:960 #, c-format msgid "%s: expanded name is `%s'\n" msgstr "" -#: ../eject.c:855 +#: ../eject.c:969 #, c-format msgid "%s: `%s' is a link to `%s'\n" msgstr "" -#: ../eject.c:864 +#: ../eject.c:980 #, c-format msgid "%s: maximum symbolic link depth exceeded: `%s'\n" msgstr "" -#: ../eject.c:872 +#: ../eject.c:988 #, c-format msgid "%s: `%s' is mounted at `%s'\n" msgstr "" -#: ../eject.c:874 +#: ../eject.c:991 #, c-format msgid "%s: `%s' is not mounted\n" msgstr "" -#: ../eject.c:885 +#: ../eject.c:1003 #, c-format msgid "%s: `%s' can be mounted at `%s'\n" msgstr "" -#: ../eject.c:887 +#: ../eject.c:1005 #, c-format msgid "%s: `%s' is not a mount point\n" msgstr "" -#: ../eject.c:895 +#: ../eject.c:1012 +#, c-format +msgid "%s: tried to use `%s' as device name but it is no block device\n" +msgstr "" + +#: ../eject.c:1020 +#, c-format +msgid "%s: device is `%s'\n" +msgstr "" + +#: ../eject.c:1022 #, c-format msgid "%s: exiting due to -n/--noop option\n" msgstr "" -#: ../eject.c:903 +#: ../eject.c:1030 #, c-format msgid "%s: enabling auto-eject mode for `%s'\n" msgstr "" -#: ../eject.c:905 +#: ../eject.c:1032 #, c-format msgid "%s: disabling auto-eject mode for `%s'\n" msgstr "" -#: ../eject.c:915 +#: ../eject.c:1042 #, c-format msgid "%s: closing tray\n" msgstr "" -#: ../eject.c:941 +#: ../eject.c:1068 #, c-format msgid "%s: selecting CD-ROM disc #%d\n" msgstr "" -#: ../eject.c:959 +#: ../eject.c:1086 #, c-format msgid "%s: trying to eject `%s' using CD-ROM eject command\n" msgstr "" -#: ../eject.c:963 +#: ../eject.c:1090 #, c-format msgid "%s: CD-ROM eject command succeeded\n" msgstr "" -#: ../eject.c:965 +#: ../eject.c:1092 #, c-format msgid "%s: CD-ROM eject command failed\n" msgstr "" -#: ../eject.c:971 +#: ../eject.c:1099 #, c-format msgid "%s: trying to eject `%s' using SCSI commands\n" msgstr "" -#: ../eject.c:975 +#: ../eject.c:1103 #, c-format msgid "%s: SCSI eject succeeded\n" msgstr "" -#: ../eject.c:977 +#: ../eject.c:1105 #, c-format msgid "%s: SCSI eject failed\n" msgstr "" -#: ../eject.c:983 +#: ../eject.c:1113 #, c-format msgid "%s: trying to eject `%s' using floppy eject command\n" msgstr "" -#: ../eject.c:987 +#: ../eject.c:1117 #, c-format msgid "%s: floppy eject command succeeded\n" msgstr "" -#: ../eject.c:989 +#: ../eject.c:1119 #, c-format msgid "%s: floppy eject command failed\n" msgstr "" -#: ../eject.c:995 +#: ../eject.c:1127 #, c-format msgid "%s: trying to eject `%s' using tape offline command\n" msgstr "" -#: ../eject.c:999 +#: ../eject.c:1131 #, c-format msgid "%s: tape offline command succeeded\n" msgstr "" -#: ../eject.c:1001 +#: ../eject.c:1133 #, c-format msgid "%s: tape offline command failed\n" msgstr "" -#: ../eject.c:1006 +#: ../eject.c:1139 #, c-format msgid "%s: unable to eject, last error: %s\n" msgstr "" -#: ../volname.c:57 +#: ../volname.c:58 +#, c-format msgid "usage: volname []\n" msgstr "" -#: ../volname.c:63 ../volname.c:69 ../volname.c:75 +#: ../volname.c:64 ../volname.c:70 ../volname.c:76 msgid "volname" msgstr "" + +#: ../eject.c:148 +msgid "" +"Long options:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc -m --no-unmount\n" +msgstr "" + +#: ../eject.c:581 +#, c-format +msgid "%s: unable to exec /bin/umount of `%s': %s\n" +msgstr "" --- eject-2.0.13deb.orig/po/Makefile +++ eject-2.0.13deb/po/Makefile @@ -3,12 +3,38 @@ INSTALL = install MODIR = $(PREFIX)/share/locale POTFILES = ../*.c ../*.h -POFILES= *.po +# ZH translation does not work +POFILES=de.po fr.po ja.po es.po sv.po D_NLS= zh_TW.Big5 all: -install: $(POFILES) +fix-po-files: + mv fr_FR.po fr.po + mv de_DE.po de.po + mv es_ES.po es.po + mv sv_SE.po sv.po + mv ja_JP.eucJP.po ja.po + mv zh_TW.Big5.po zh_TW.po + +restitute-po-files: + mv fr.po fr_FR.po + mv de.po de_DE.po + mv es.po es_ES.po + mv sv.po sv_SE.po + mv ja.po ja_JP.eucJP.po + mv zh_TW.po zh_TW.Big5.po + +mo: + files='$(POFILES)'; \ + for file in $$files;do \ + echo compiling $$LOCALENAME ; \ + msgfmt $$file -o `echo $$file |sed 's/\.po$$/.mo/g'`; \ + done + +install: + $(MAKE) fix-po-files + $(MAKE) mo files='$(POFILES)'; \ for file in $$files;do \ LOCALENAME=`echo $$file |sed 's/\.po$$//g'`; \ @@ -17,31 +43,22 @@ if [ ! -d $$MOPATH ] ;then \ mkdir -p $$MOPATH; \ fi; \ - msgfmt $$file -o $$MOPATH/$(PKGNAME).mo; \ + cp $$LOCALENAME.mo $$MOPATH/$(PKGNAME).mo; \ done + $(MAKE) restitute-po-files pot: - xgettext --keyword=_ --keyword=N_ $(POTFILES) -o $(PKGNAME).pot ;\ - if [ -f $(PKGNAME).pot ];then \ - if [ ! -f $(D_NLS).po ];then \ - cp $(PKGNAME).pot $(D_NLS).po ;\ - else \ - msgmerge $(D_NLS).po $(PKGNAME).pot -o $(D_NLS).po.tmp$$ ;\ - mv -fv $(D_NLS).po.tmp$$ $(D_NLS).po ;\ - fi ;\ - fi - -merge: *.po $(PKGNAME).pot - echo $< - for i in $< ;do \ + xgettext --keyword=_ --keyword=N_ $(POTFILES) -o $(PKGNAME).pot + +merge: + for i in *.po;do \ NN=`echo $$i |sed "s/\.po$$//g"` ;\ echo $$i $$NN ;\ - msgmerge $$i $(PKGNAME).pot -o $$i.tmp.$$;\ - mv $$i.tmp.$$ $$i -vf;\ + msgmerge $$i $(PKGNAME).pot -o $$i.tmp.$$ && mv -vf $$i.tmp.$$ $$i;\ done clean: - rm -fv $(PKGNAME).mo.* + rm -fv *.mo distclean: clean --- eject-2.0.13deb.orig/po/de_DE.po +++ eject-2.0.13deb/po/de_DE.po @@ -1,25 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) 2001 Free Software Foundation, Inc. -# FIRST AUTHOR Jeff Tranter , 2001. +# Jeff Tranter , 2001. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-06-07 12:23+0800\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Project-Id-Version: eject 2.0.13deb-17\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-10-08 16:59+0200\n" +"PO-Revision-Date: 2004-05-07 01:35+0200\n" "Last-Translator: nordi \n" "Language-Team:\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" -#: ../eject.c:110 ../eject.c:893 -#, c-format -msgid "%s: device is `%s'\n" -msgstr "%s: Gerät ist `%s'\n" - -#: ../eject.c:112 +#: ../eject.c:136 #, c-format msgid "" "Eject version %s by Jeff Tranter (tranter@pobox.com)\n" @@ -40,6 +35,7 @@ " -f\t-- eject floppy\n" " -q\t-- eject tape\n" " -p\t-- use /proc/mounts instead of /etc/mtab\n" +" -m\t-- do not unmount device even if it is mounted\n" msgstr "" "Eject version %s von Jeff Tranter (tranter@pobox.com)\n" "Usage:\n" @@ -50,7 +46,8 @@ " eject [-vn] -a on|off|1|0 []\t-- auto-eject an-/ausschalten\n" " eject [-vn] -c []\t-- wechselt CD im CD-Wechsler\n" " eject [-vn] -t []\t\t-- Laufwerk schließen\n" -" eject [-vn] -x []\t-- maximale CD-ROM Geschwindigkeit setzen\n" +" eject [-vn] -x []\t-- maximale CD-ROM Geschwindigkeit " +"setzen\n" "Options:\n" " -v\t-- zeige Details an\n" " -n\t-- Laufwerk nicht öffnen, nur gefundenes Gerät anzeigen\n" @@ -59,24 +56,26 @@ " -f\t-- Floppy auswerfen\n" " -q\t-- Band auswerfen\n" " -p\t-- benutze/proc/mounts statt /etc/mtab\n" +" -m\t-- Gerät nicht unmounten, selbst wenn es gemounted ist\n" -#: ../eject.c:133 +#: ../eject.c:165 +#, c-format msgid "" "Long options:\n" -" -h --help -v --verbose\t -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi\t -f --floppy\n" -" -q --tape -n --noop\t -V --version\n" -" -p --proc\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" msgstr "" "Lange Optionen:\n" -" -h --help -v --verbose\t -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi\t -f --floppy\n" -" -q --tape -n --noop\t -V --version\n" -" -p --proc\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" -#: ../eject.c:141 +#: ../eject.c:183 #, c-format msgid "" "Parameter can be a device file or a mount point.\n" @@ -85,282 +84,326 @@ msgstr "" "Parameter kann eine Gerätedatei oder ein Mount Punkt sein.\n" "Wenn ausgelassen wird `%s' gewählt.\n" -"Versucht standardmäßig -r, -s, -f, et -q in dieser Reihenfolge bis es funktioniert.\n" +"Versucht standardmäßig -r, -s, -f und -q in dieser Reihenfolge bis es " +"funktioniert.\n" -#: ../eject.c:193 +#: ../eject.c:236 #, c-format msgid "%s: invalid argument to --auto/-a option\n" msgstr "%s: ungültiges Argument für die --auto/-a Option\n" -#: ../eject.c:205 +#: ../eject.c:248 #, c-format msgid "%s: invalid argument to --changerslot/-c option\n" msgstr "%s: ungültiges Argument für die --changerslot/-c Option\n" -#: ../eject.c:217 +#: ../eject.c:260 #, c-format msgid "%s: invalid argument to --cdspeed/-x option\n" msgstr "%s: ungültiges Argument für die --cdspeed/-x Option\n" -#: ../eject.c:254 +#: ../eject.c:300 #, c-format msgid "eject version %s by Jeff Tranter (tranter@pobox.com)\n" msgstr "eject Version %s von Jeff Tranter (tranter@pobox.com)\n" -#: ../eject.c:264 +#: ../eject.c:310 #, c-format msgid "%s: too many arguments\n" msgstr "%s: zu viele Optionen angegeben\n" -#: ../eject.c:366 +#: ../eject.c:365 +#, c-format +msgid "%s: could not allocate memory\n" +msgstr "%s: Konnte keinen Speicher allozieren\n" + +#: ../eject.c:370 +#, c-format +msgid "%s: FindDevice called too often\n" +msgstr "" + +#: ../eject.c:441 #, c-format msgid "%s: CD-ROM auto-eject command failed: %s\n" msgstr "%s: CD-ROM auto-eject fehlgeschlagen: %s\n" -#: ../eject.c:383 +#: ../eject.c:458 #, c-format msgid "%s: CD-ROM select disc command failed: %s\n" msgstr "%s: CD-ROM select disc fehlgeschlagen: %s\n" -#: ../eject.c:389 +#: ../eject.c:464 #, c-format msgid "%s: CD-ROM load from slot command failed: %s\n" msgstr "%s: CD-ROM load from slot fehlgeschlagen: %s\n" -#: ../eject.c:393 +#: ../eject.c:468 #, c-format msgid "%s: IDE/ATAPI CD-ROM changer not supported by this kernel\n" msgstr "%s: IDE/ATAPI CD-ROM Wechsler von diesem Kernel nicht unterstützt\n" -#: ../eject.c:408 +#: ../eject.c:487 #, c-format msgid "%s: CD-ROM tray close command failed: %s\n" msgstr "%s: CD-ROM Schließen fehlgeschlagen: %s\n" -#: ../eject.c:412 +#: ../eject.c:491 #, c-format msgid "%s: CD-ROM tray close command not supported by this kernel\n" msgstr "%s: CD-ROM Schließen von diesem Kernel nicht unterstützt\n" -#: ../eject.c:429 +#: ../eject.c:508 #, c-format msgid "%s: CD-ROM select speed command failed: %s\n" msgstr "%s: CD-ROM selecter vitesse pas s'accomplir: %s\n" -#: ../eject.c:433 +#: ../eject.c:512 #, c-format msgid "%s: CD-ROM select speed command not supported by this kernel\n" -msgstr "%s: CD-ROM Geschwindigkeit setzen von diesem Kernel nicht unterstützt\n" +msgstr "" +"%s: CD-ROM Geschwindigkeit setzen von diesem Kernel nicht unterstützt\n" -#: ../eject.c:543 +#: ../eject.c:633 #, c-format -msgid "%s: unable to exec /bin/umount of `%s': %s\n" -msgstr "%s: kann /bin/umount für `%s' nicht ausführen: %s\n" +msgid "%s: unable to exec umount of `%s': %s\n" +msgstr "%s: kann umount für `%s' nicht ausführen: %s\n" -#: ../eject.c:548 +#: ../eject.c:638 #, c-format msgid "%s: unable to fork: %s\n" msgstr "%s: kann nicht forken: %s\n" -#: ../eject.c:553 +#: ../eject.c:643 #, c-format msgid "%s: unmount of `%s' did not exit normally\n" msgstr "%s: Unmounten von `%s' nicht normal beendet\n" -#: ../eject.c:557 +#: ../eject.c:647 #, c-format msgid "%s: unmount of `%s' failed\n" msgstr "%s: Unmounten von `%s' fehlgeschlagen\n" -#: ../eject.c:570 +#: ../eject.c:660 #, c-format msgid "%s: unable to open `%s'\n" msgstr "%s: kann `%s' nicht öffnen\n" -#: ../eject.c:615 ../eject.c:691 +#: ../eject.c:706 ../eject.c:791 #, c-format msgid "unable to open %s: %s\n" msgstr "kann %s nicht öffnen: %s\n" -#: ../eject.c:655 +#: ../eject.c:751 #, c-format msgid "%s: unable to open /etc/fstab: %s\n" msgstr "%s: kann /etc/fstab nicht öffnen: %s\n" -#: ../eject.c:701 ../eject.c:928 +#: ../eject.c:801 ../eject.c:1055 #, c-format msgid "%s: unmounting `%s'\n" msgstr "%s: Unmounte `%s'\n" -#: ../eject.c:768 +#: ../eject.c:874 #, c-format msgid "%s: `%s' is a multipartition device\n" msgstr "%s: `%s' ist ein Gerät mit mehreren Partitionen\n" -#: ../eject.c:773 +#: ../eject.c:879 #, c-format msgid "%s: `%s' is not a multipartition device\n" msgstr "%s: `%s' ist kein Gerät mit mehreren Partitionen\n" -#: ../eject.c:786 +#: ../eject.c:892 #, c-format msgid "%s: setting CD-ROM speed to auto\n" msgstr "%s: setze CD-ROM Geschwindigkeit auf auto\n" -#: ../eject.c:788 +#: ../eject.c:894 #, c-format msgid "%s: setting CD-ROM speed to %dX\n" msgstr "%s: setze CD-ROM Geschwindigkeit auf %dX\n" -#: ../eject.c:824 +#: ../eject.c:932 #, c-format msgid "%s: default device: `%s'\n" msgstr "%s: Standardgerät: `%s'\n" -#: ../eject.c:832 +#: ../eject.c:940 #, c-format msgid "%s: using default device `%s'\n" msgstr "%s: benutze Standardgerät `%s'\n" -#: ../eject.c:841 +#: ../eject.c:949 #, c-format msgid "%s: device name is `%s'\n" msgstr "%s: Gerätename ist `%s'\n" -#: ../eject.c:846 +#: ../eject.c:955 #, c-format msgid "%s: unable to find or open device for: `%s'\n" msgstr "%s: kann Gerät `%s' nicht finden/öffnen\n" -#: ../eject.c:850 +#: ../eject.c:960 #, c-format msgid "%s: expanded name is `%s'\n" msgstr "%s: erweiterter Name ist `%s'\n" -#: ../eject.c:855 +#: ../eject.c:969 #, c-format msgid "%s: `%s' is a link to `%s'\n" msgstr "%s: `%s' ist ein Link auf `%s'\n" -#: ../eject.c:864 +#: ../eject.c:980 #, c-format msgid "%s: maximum symbolic link depth exceeded: `%s'\n" msgstr "%s: maximale symbolische Link Tiefe überschritten: `%s'\n" -#: ../eject.c:872 +#: ../eject.c:988 #, c-format msgid "%s: `%s' is mounted at `%s'\n" msgstr "%s: `%s' ist nach `%s' gemountet\n" -#: ../eject.c:874 +#: ../eject.c:991 #, c-format msgid "%s: `%s' is not mounted\n" msgstr "%s: `%s' ist nicht gemountet\n" -#: ../eject.c:885 +#: ../eject.c:1003 #, c-format msgid "%s: `%s' can be mounted at `%s'\n" msgstr "%s: `%s' kann nach`%s' gemountet werden\n" -#: ../eject.c:887 +#: ../eject.c:1005 #, c-format msgid "%s: `%s' is not a mount point\n" msgstr "%s: `%s' ist kein mount point\n" -#: ../eject.c:895 +#: ../eject.c:1012 +#, c-format +msgid "%s: tried to use `%s' as device name but it is no block device\n" +msgstr "" + +#: ../eject.c:1020 +#, c-format +msgid "%s: device is `%s'\n" +msgstr "%s: Gerät ist `%s'\n" + +#: ../eject.c:1022 #, c-format msgid "%s: exiting due to -n/--noop option\n" msgstr "%s: beende wegen -n/--noop Option\n" -#: ../eject.c:903 +#: ../eject.c:1030 #, c-format msgid "%s: enabling auto-eject mode for `%s'\n" msgstr "%s: aktiviere Auto-Auswurf für `%s'\n" -#: ../eject.c:905 +#: ../eject.c:1032 #, c-format msgid "%s: disabling auto-eject mode for `%s'\n" msgstr "%s: deaktiviere Auto-Auswurf für `%s'\n" -#: ../eject.c:915 +#: ../eject.c:1042 #, c-format msgid "%s: closing tray\n" msgstr "%s: schließe jetzt\n" -#: ../eject.c:941 +#: ../eject.c:1068 #, c-format msgid "%s: selecting CD-ROM disc #%d\n" msgstr "%s: wähle CD #%d\n" -#: ../eject.c:959 +#: ../eject.c:1086 #, c-format msgid "%s: trying to eject `%s' using CD-ROM eject command\n" msgstr "%s: Versuche `%s' mit dem CD eject Befehl auszuwerfen\n" -#: ../eject.c:963 +#: ../eject.c:1090 #, c-format msgid "%s: CD-ROM eject command succeeded\n" msgstr "%s: CD eject war erfolgreich\n" -#: ../eject.c:965 +#: ../eject.c:1092 #, c-format msgid "%s: CD-ROM eject command failed\n" msgstr "%s: CD eject war nicht erfolgreich\n" -#: ../eject.c:971 +#: ../eject.c:1099 #, c-format msgid "%s: trying to eject `%s' using SCSI commands\n" msgstr "%s: versuche `%s' mit SCSI Befehlen auszuwerfen\n" -#: ../eject.c:975 +#: ../eject.c:1103 #, c-format msgid "%s: SCSI eject succeeded\n" msgstr "%s: SCSI eject war erfolgreich\n" -#: ../eject.c:977 +#: ../eject.c:1105 #, c-format msgid "%s: SCSI eject failed\n" msgstr "%s: SCSI eject war nicht erfolgreich\n" -#: ../eject.c:983 +#: ../eject.c:1113 #, c-format msgid "%s: trying to eject `%s' using floppy eject command\n" msgstr "%s: versuche `%s' mit Floppy Befehlen auszuwerfen\n" -#: ../eject.c:987 +#: ../eject.c:1117 #, c-format msgid "%s: floppy eject command succeeded\n" msgstr "%s: Floppy eject war erfolgreich\n" -#: ../eject.c:989 +#: ../eject.c:1119 #, c-format msgid "%s: floppy eject command failed\n" msgstr "%s: Floppy eject war nicht erfolgreich\n" -#: ../eject.c:995 +#: ../eject.c:1127 #, c-format msgid "%s: trying to eject `%s' using tape offline command\n" msgstr "%s: versuche `%s' mit dem Band offline Befehl auszuwerfen\n" -#: ../eject.c:999 +#: ../eject.c:1131 #, c-format msgid "%s: tape offline command succeeded\n" msgstr "%s: Band offline war erfolgreich\n" -#: ../eject.c:1001 +#: ../eject.c:1133 #, c-format msgid "%s: tape offline command failed\n" msgstr "%s: Band offline war nicht erfolgreich\n" -#: ../eject.c:1006 +#: ../eject.c:1139 #, c-format msgid "%s: unable to eject, last error: %s\n" msgstr "%s: Kann nicht auswerfen! Letzter Fehler: %s\n" -#: ../volname.c:57 +#: ../volname.c:58 +#, c-format msgid "usage: volname []\n" msgstr "Benutzung: volname []\n" -#: ../volname.c:63 ../volname.c:69 ../volname.c:75 +#: ../volname.c:64 ../volname.c:70 ../volname.c:76 msgid "volname" msgstr "Volname" + +#: ../eject.c:148 +msgid "" +"Long options:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc -m --no-unmount\n" +msgstr "" +"Lange Optionen:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc -m --no-unmount\n" + +#: ../eject.c:581 +#, c-format +msgid "%s: unable to exec /bin/umount of `%s': %s\n" +msgstr "%s: kann /bin/umount für `%s' nicht ausführen: %s\n" --- eject-2.0.13deb.orig/po/fr_FR.po +++ eject-2.0.13deb/po/fr_FR.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-06-07 12:23+0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-10-08 16:59+0200\n" "PO-Revision-Date: 2002-01-04 18:57GMT\n" "Last-Translator: mathic \n" "Language-Team: Français\n" @@ -14,13 +15,8 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.5\n" -#: ../eject.c:110 ../eject.c:893 -#, c-format -msgid "%s: device is `%s'\n" -msgstr "%s: le périphérique est `%s'\n" - -#: ../eject.c:112 -#, c-format +#: ../eject.c:136 +#, fuzzy, c-format msgid "" "Eject version %s by Jeff Tranter (tranter@pobox.com)\n" "Usage:\n" @@ -40,6 +36,7 @@ " -f\t-- eject floppy\n" " -q\t-- eject tape\n" " -p\t-- use /proc/mounts instead of /etc/mtab\n" +" -m\t-- do not unmount device even if it is mounted\n" msgstr "" "Eject version %s par Jeff Tranter (tranter@pobox.com)\n" "Usage:\n" @@ -50,7 +47,8 @@ " eject [-vn] -a on|off|1|0 []\t-- contrôler l'auto-éjection\n" " eject [-vn] -c []\t-- changer disques de CD-ROM changer\n" " eject [-vn] -t []\t\t-- fermer le plateau\n" -" eject [-vn] -x []\t-- mettre le CD-ROM à la vitesse maximum\n" +" eject [-vn] -x []\t-- mettre le CD-ROM à la vitesse " +"maximum\n" "Options:\n" " -v\t-- afficher verbeux\n" " -n\t-- n'éjecte pas, afficher device seulement\n" @@ -60,308 +58,357 @@ " -q\t-- éjecter la cassette (tape)\n" " -p\t-- utiliser /proc/mounts au lieu de /etc/mtab\n" -#: ../eject.c:133 +#: ../eject.c:165 +#, c-format msgid "" "Long options:\n" -" -h --help -v --verbose\t -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi\t -f --floppy\n" -" -q --tape -n --noop\t -V --version\n" -" -p --proc\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" msgstr "" "Options long:\n" -" -h --help -v --verbose\t -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi\t -f --floppy\n" -" -q --tape -n --noop\t -V --version\n" -" -p --proc\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" -#: ../eject.c:141 +#: ../eject.c:183 #, c-format msgid "" "Parameter can be a device file or a mount point.\n" "If omitted, name defaults to `%s'.\n" "By default tries -r, -s, -f, and -q in order until success.\n" msgstr "" -"Paramètre ce peut-être un fichier de périphérique ou un point de montage.\n" +"Paramètre ce peut-être un fichier de périphérique ou un point de " +"montage.\n" "Si omettre, nom defaut de `%s'.\n" "Par défaut utiliser -r, -s, -f, et -q en ordre jusqu'au succes.\n" -#: ../eject.c:193 +#: ../eject.c:236 #, c-format msgid "%s: invalid argument to --auto/-a option\n" msgstr "%s: argument invalide pour l'option --auto/-a\n" -#: ../eject.c:205 +#: ../eject.c:248 #, c-format msgid "%s: invalid argument to --changerslot/-c option\n" msgstr "%s: argument invalide pour l'option --changerslot/-c\n" -#: ../eject.c:217 +#: ../eject.c:260 #, c-format msgid "%s: invalid argument to --cdspeed/-x option\n" msgstr "%s: argument invalide pour l'option --cdspeed/-x\n" -#: ../eject.c:254 +#: ../eject.c:300 #, c-format msgid "eject version %s by Jeff Tranter (tranter@pobox.com)\n" msgstr "eject version %s par Jeff Tranter (tranter@pobox.com)\n" -#: ../eject.c:264 +#: ../eject.c:310 #, c-format msgid "%s: too many arguments\n" msgstr "%s: trop d'options\n" -#: ../eject.c:366 +#: ../eject.c:365 +#, c-format +msgid "%s: could not allocate memory\n" +msgstr "" + +#: ../eject.c:370 +#, c-format +msgid "%s: FindDevice called too often\n" +msgstr "" + +#: ../eject.c:441 #, c-format msgid "%s: CD-ROM auto-eject command failed: %s\n" msgstr "%s: l'auto-ejection du CD-ROM ne peut pas s'accomplir: %s\n" -#: ../eject.c:383 +#: ../eject.c:458 #, c-format msgid "%s: CD-ROM select disc command failed: %s\n" msgstr "%s: la sélection du lecteur de CD-ROM ne peut pas s'accomplir: %s\n" -#: ../eject.c:389 +#: ../eject.c:464 #, c-format msgid "%s: CD-ROM load from slot command failed: %s\n" msgstr "%s: le chargement du CD-ROM ne peut pas s'accomplir: %s\n" -#: ../eject.c:393 +#: ../eject.c:468 #, c-format msgid "%s: IDE/ATAPI CD-ROM changer not supported by this kernel\n" msgstr "%s: le changeur IDE/ATAPI CD-ROM n'est pas supporté par ce noyau\n" -#: ../eject.c:408 +#: ../eject.c:487 #, c-format msgid "%s: CD-ROM tray close command failed: %s\n" msgstr "%s: le plateau du CD-ROM ne peut pas se fermer: %s\n" -#: ../eject.c:412 +#: ../eject.c:491 #, c-format msgid "%s: CD-ROM tray close command not supported by this kernel\n" -msgstr "%s: la commande de fermeture du plateau du CD-ROM n'est pas supportée par ce noyau\n" +msgstr "" +"%s: la commande de fermeture du plateau du CD-ROM n'est pas supportée par ce " +"noyau\n" -#: ../eject.c:429 +#: ../eject.c:508 #, c-format msgid "%s: CD-ROM select speed command failed: %s\n" msgstr "%s: la sélection de la vitesse du CD-ROM ne peut pas s'accomplir: %s\n" -#: ../eject.c:433 +#: ../eject.c:512 #, c-format msgid "%s: CD-ROM select speed command not supported by this kernel\n" -msgstr "%s: la commande de sélection du CD-ROM n'est pas supportée par ce noyau\n" +msgstr "" +"%s: la commande de sélection du CD-ROM n'est pas supportée par ce noyau\n" -#: ../eject.c:543 +#: ../eject.c:633 #, c-format -msgid "%s: unable to exec /bin/umount of `%s': %s\n" -msgstr "%s: incapable de faire exec /bin/umount de `%s': %s\n" +msgid "%s: unable to exec umount of `%s': %s\n" +msgstr "%s: incapable de faire exec umount de `%s': %s\n" -#: ../eject.c:548 +#: ../eject.c:638 #, c-format msgid "%s: unable to fork: %s\n" msgstr "%s: incapable to faire fork: %s\n" -#: ../eject.c:553 +#: ../eject.c:643 #, c-format msgid "%s: unmount of `%s' did not exit normally\n" msgstr "%s: le démontage de `%s' n'a pas pu sortir normalement\n" -#: ../eject.c:557 +#: ../eject.c:647 #, c-format msgid "%s: unmount of `%s' failed\n" msgstr "%s: le démontage de `%s' a échoué\n" -#: ../eject.c:570 +#: ../eject.c:660 #, c-format msgid "%s: unable to open `%s'\n" msgstr "%s: impossible d'ouvrir le fichier `%s'\n" -#: ../eject.c:615 ../eject.c:691 +#: ../eject.c:706 ../eject.c:791 #, c-format msgid "unable to open %s: %s\n" msgstr "impossible d'ouvrir le fichier %s: %s\n" -#: ../eject.c:655 +#: ../eject.c:751 #, c-format msgid "%s: unable to open /etc/fstab: %s\n" msgstr "%s: impossible d'ouvrir le fichier /etc/fstab: %s\n" -#: ../eject.c:701 ../eject.c:928 +#: ../eject.c:801 ../eject.c:1055 #, c-format msgid "%s: unmounting `%s'\n" msgstr "%s: démontage de `%s'\n" -#: ../eject.c:768 +#: ../eject.c:874 #, c-format msgid "%s: `%s' is a multipartition device\n" msgstr "%s: `%s' est un périphérique à plusieurs partitions\n" -#: ../eject.c:773 +#: ../eject.c:879 #, c-format msgid "%s: `%s' is not a multipartition device\n" msgstr "%s: `%s' n'est pas un périphérique partitionné\n" -#: ../eject.c:786 +#: ../eject.c:892 #, c-format msgid "%s: setting CD-ROM speed to auto\n" msgstr "%s: mettre la vitesse du CD-ROM en position automatique\n" -#: ../eject.c:788 +#: ../eject.c:894 #, c-format msgid "%s: setting CD-ROM speed to %dX\n" msgstr "%s: mettre la vitesse du CD-ROM à %dX\n" -#: ../eject.c:824 +#: ../eject.c:932 #, c-format msgid "%s: default device: `%s'\n" msgstr "%s: périphérique par défaut: `%s'\n" -#: ../eject.c:832 +#: ../eject.c:940 #, c-format msgid "%s: using default device `%s'\n" msgstr "%s: utiliser le périphérique par défaut `%s'\n" -#: ../eject.c:841 +#: ../eject.c:949 #, c-format msgid "%s: device name is `%s'\n" msgstr "%s: le nom du périphérique est `%s'\n" -#: ../eject.c:846 +#: ../eject.c:955 #, c-format msgid "%s: unable to find or open device for: `%s'\n" msgstr "%s: impossible de trouver ou d'ouvrir le périphérique pour: `%s'\n" -#: ../eject.c:850 +#: ../eject.c:960 #, c-format msgid "%s: expanded name is `%s'\n" msgstr "%s: le nom étendu est `%s'\n" -#: ../eject.c:855 +#: ../eject.c:969 #, c-format msgid "%s: `%s' is a link to `%s'\n" msgstr "%s: `%s' est un lien de `%s'\n" -#: ../eject.c:864 +#: ../eject.c:980 #, c-format msgid "%s: maximum symbolic link depth exceeded: `%s'\n" msgstr "%s: hauteur de lien symbolique maximum dépassé: `%s'\n" -#: ../eject.c:872 +#: ../eject.c:988 #, c-format msgid "%s: `%s' is mounted at `%s'\n" msgstr "%s: `%s' est monté à `%s'\n" -#: ../eject.c:874 +#: ../eject.c:991 #, c-format msgid "%s: `%s' is not mounted\n" msgstr "%s: `%s' n'est pas monté\n" -#: ../eject.c:885 +#: ../eject.c:1003 #, c-format msgid "%s: `%s' can be mounted at `%s'\n" msgstr "%s: `%s' ne peut pas être montré à `%s'\n" -#: ../eject.c:887 +#: ../eject.c:1005 #, c-format msgid "%s: `%s' is not a mount point\n" msgstr "%s: `%s' n'est pas un point de montage\n" -#: ../eject.c:895 +#: ../eject.c:1012 +#, c-format +msgid "%s: tried to use `%s' as device name but it is no block device\n" +msgstr "" + +#: ../eject.c:1020 +#, c-format +msgid "%s: device is `%s'\n" +msgstr "%s: le périphérique est `%s'\n" + +#: ../eject.c:1022 #, c-format msgid "%s: exiting due to -n/--noop option\n" msgstr "%s: sorti à cause de l'option -n/--noop\n" -#: ../eject.c:903 +#: ../eject.c:1030 #, c-format msgid "%s: enabling auto-eject mode for `%s'\n" msgstr "%s: activation du mode d'auto-éjection pour `%s'\n" -#: ../eject.c:905 +#: ../eject.c:1032 #, c-format msgid "%s: disabling auto-eject mode for `%s'\n" msgstr "%s: désactivation du mode d'auto-éjection pour `%s'\n" -#: ../eject.c:915 +#: ../eject.c:1042 #, c-format msgid "%s: closing tray\n" msgstr "%s: ferme le plateau\n" -#: ../eject.c:941 +#: ../eject.c:1068 #, c-format msgid "%s: selecting CD-ROM disc #%d\n" msgstr "%s: selection du disque CD-ROM #%d\n" -#: ../eject.c:959 +#: ../eject.c:1086 #, c-format msgid "%s: trying to eject `%s' using CD-ROM eject command\n" msgstr "%s: tentative d'éjection `%s' avec la commande d'éjection du CD-ROM\n" -#: ../eject.c:963 +#: ../eject.c:1090 #, c-format msgid "%s: CD-ROM eject command succeeded\n" msgstr "%s: la commande d'éjection du CD-ROM a réussi\n" -#: ../eject.c:965 +#: ../eject.c:1092 #, c-format msgid "%s: CD-ROM eject command failed\n" msgstr "%s: la commande d'éjection du CD-ROM n'a pas réussi\n" -#: ../eject.c:971 +#: ../eject.c:1099 #, c-format msgid "%s: trying to eject `%s' using SCSI commands\n" msgstr "%s: tentative d'éjection `%s' avec la commande SCSI\n" -#: ../eject.c:975 +#: ../eject.c:1103 #, c-format msgid "%s: SCSI eject succeeded\n" msgstr "%s: la commande d'éjection SCSI a réussi\n" -#: ../eject.c:977 +#: ../eject.c:1105 #, c-format msgid "%s: SCSI eject failed\n" msgstr "%s: la commande SCSI d'éjection n'a pas réussi\n" -#: ../eject.c:983 +#: ../eject.c:1113 #, c-format msgid "%s: trying to eject `%s' using floppy eject command\n" msgstr "%s: tentative d'éjection `%s' avec la commande de la disquette\n" -#: ../eject.c:987 +#: ../eject.c:1117 #, c-format msgid "%s: floppy eject command succeeded\n" msgstr "%s: la commande de la disquette à réussi\n" -#: ../eject.c:989 +#: ../eject.c:1119 #, c-format msgid "%s: floppy eject command failed\n" msgstr "%s: la commande de la disquette n'a pas réussi\n" -#: ../eject.c:995 +#: ../eject.c:1127 #, c-format msgid "%s: trying to eject `%s' using tape offline command\n" -msgstr "%s: la tentative d'éjection `%s' avec la commande de la cassette (tape) hors ligne\n" +msgstr "" +"%s: la tentative d'éjection `%s' avec la commande de la cassette (tape) hors " +"ligne\n" -#: ../eject.c:999 +#: ../eject.c:1131 #, c-format msgid "%s: tape offline command succeeded\n" msgstr "%s: la commande de la cassette (tape) hors ligne a réussi\n" -#: ../eject.c:1001 +#: ../eject.c:1133 #, c-format msgid "%s: tape offline command failed\n" msgstr "%s: la command de la cassette (tape) hors lignen'a pas réussi\n" -#: ../eject.c:1006 +#: ../eject.c:1139 #, c-format msgid "%s: unable to eject, last error: %s\n" msgstr "%s: incapable d'éjecter, dernière erreur: %s\n" -#: ../volname.c:57 +#: ../volname.c:58 +#, c-format msgid "usage: volname []\n" msgstr "usage: volname []\n" -#: ../volname.c:63 ../volname.c:69 ../volname.c:75 +#: ../volname.c:64 ../volname.c:70 ../volname.c:76 msgid "volname" msgstr "volname" +#: ../eject.c:148 +#, fuzzy +msgid "" +"Long options:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc -m --no-unmount\n" +msgstr "" +"Options long:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc\n" + +#: ../eject.c:581 +#, c-format +msgid "%s: unable to exec /bin/umount of `%s': %s\n" +msgstr "%s: incapable de faire exec /bin/umount de `%s': %s\n" --- eject-2.0.13deb.orig/po/zh_TW.Big5.po +++ eject-2.0.13deb/po/zh_TW.Big5.po @@ -6,20 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-06-07 12:23+0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-10-08 16:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kun-Chung Hsieh \n" "Language-Team: taiwan \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=Big5\n" "Content-Transfer-Encoding: ENCODING\n" -#: ../eject.c:110 ../eject.c:893 +#: ../eject.c:136 #, c-format -msgid "%s: device is `%s'\n" -msgstr "%s: ³]³Æ¬O '%s'\n" - -#: ../eject.c:112 msgid "" "Eject version %s by Jeff Tranter (tranter@pobox.com)\n" "Usage:\n" @@ -39,43 +36,27 @@ " -f\t-- eject floppy\n" " -q\t-- eject tape\n" " -p\t-- use /proc/mounts instead of /etc/mtab\n" +" -m\t-- do not unmount device even if it is mounted\n" msgstr "" -"Eject ª©¥» %s by Jeff Tranter (tranter@pobox.com)\n" -"¥Îªk:\n" -" eject -h\t\t\t\t-- Åã¥Ü¥Îªk«áµ²§ô\n" -" eject -V\t\t\t\t-- Åã¥Üª©¥»«áµ²§ô\n" -" eject [-vnrsfq] []\t\t-- ¸õ¥X³]³Æ\n" -" eject [-vn] -d\t\t\t-- Åã¥Ü¤º©w³]³Æ¦WºÙ\n" -" eject [-vn] -a on|off|1|0 []\t-- ¦Û°Ê¸õ¥X¥\\¯à¶}Ãö\n" -" eject [-vn] -c []\t-- ¤Á´«¥úºÐÂd¤ºªº¥úºÐ¤ù\n" -" eject [-vn] -t []\t\t-- Ãö³¬©ì½L\n" -" eject [-vn] -x []\t-- ³]©w¥úºÐ¾÷³Ì§Ö³t«×\n" -"¿ï¶µ:\n" -" -v\t-- ¥þµ{Åã¥Üª¬ºA\n" -" -n\t-- ¤£­n¸õ¥X¡A¥uÅã¥Ü³]³Æ¦³§ä¨ì§Y¥i\n" -" -r\t-- ¸õ¥X CD-ROM\n" -" -s\t-- ¸õ¥X SCSI ³]³Æ\n" -" -f\t-- ¸õ¥X³nºÐ¤ù\n" -" -q\t-- ¸õ¥XºÏ±a\n" -" -p\t-- ¨Ï¥Î /proc/mounts ¨Ó¨ú¥N /etc/mtab\n" -#: ../eject.c:133 +#: ../eject.c:165 +#, c-format msgid "" "Long options:\n" -" -h --help -v --verbose\t -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi\t -f --floppy\n" -" -q --tape -n --noop\t -V --version\n" -" -p --proc\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" msgstr "" "ªø¿ï¶µ:\n" -" -h --help -v --verbose\t -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi\t -f --floppy\n" -" -q --tape -n --noop\t -V --version\n" -" -p --proc\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" -#: ../eject.c:141 +#: ../eject.c:183 #, c-format msgid "" "Parameter can be a device file or a mount point.\n" @@ -84,282 +65,325 @@ msgstr "" "°Ñ¼Æ ¥i¥H¬O³]³ÆÀɦW©ÎªÌ±¾¸üÂI¡C\n" "¤£¥[°Ñ¼Æ®É¡A¤º©w¬° `%s'¡C\n" -"µ{¦¡¹w³]·|¨Ì§Ç´ú¸Õ -r, -s, -f, ©M -q ª½¨ì¦¨¥\\¡C\n" +"µ{¦¡¹w³]·|¨Ì§Ç´ú¸Õ -r, -s, -f, ©M -q ª½¨ì¦¨¥\¡C\n" -#: ../eject.c:193 +#: ../eject.c:236 #, c-format msgid "%s: invalid argument to --auto/-a option\n" msgstr "" -#: ../eject.c:205 +#: ../eject.c:248 #, c-format msgid "%s: invalid argument to --changerslot/-c option\n" msgstr "" -#: ../eject.c:217 +#: ../eject.c:260 #, c-format msgid "%s: invalid argument to --cdspeed/-x option\n" msgstr "" -#: ../eject.c:254 +#: ../eject.c:300 #, c-format msgid "eject version %s by Jeff Tranter (tranter@pobox.com)\n" msgstr "eject ª©¥» %s ¥Ñ Jeff Tranter ³]­p \n" -#: ../eject.c:264 +#: ../eject.c:310 #, c-format msgid "%s: too many arguments\n" msgstr "%s: ¤Ó¦h°Ñ¼Æ¤F\n" -#: ../eject.c:366 +#: ../eject.c:365 +#, c-format +msgid "%s: could not allocate memory\n" +msgstr "" + +#: ../eject.c:370 +#, c-format +msgid "%s: FindDevice called too often\n" +msgstr "" + +#: ../eject.c:441 #, c-format msgid "%s: CD-ROM auto-eject command failed: %s\n" msgstr "%s: ¥úºÐ¦Û°Ê¸õ¥X©R¥O¥¢±Ñ: %s\n" -#: ../eject.c:383 +#: ../eject.c:458 #, c-format msgid "%s: CD-ROM select disc command failed: %s\n" msgstr "%s: ¿ï¾Ü¥úºÐªº©R¥O¥¢±Ñ: %s\n" -#: ../eject.c:389 +#: ../eject.c:464 #, c-format msgid "%s: CD-ROM load from slot command failed: %s\n" msgstr "" -#: ../eject.c:393 +#: ../eject.c:468 #, c-format msgid "%s: IDE/ATAPI CD-ROM changer not supported by this kernel\n" msgstr "%s: IDE/ATAPI ¤¶­±ªº¥úºÐÂd¨Ã¤£³Q¥»ª©ªº®Ö¤ß¤ÞÀº (kernel) ©Ò¤ä´©\n" -#: ../eject.c:408 +#: ../eject.c:487 #, c-format msgid "%s: CD-ROM tray close command failed: %s\n" msgstr "%s: ¥úºÐ¾÷©ì½LÃö³¬ªº©R¥O¥¢±Ñ: %s\n" -#: ../eject.c:412 +#: ../eject.c:491 #, c-format msgid "%s: CD-ROM tray close command not supported by this kernel\n" msgstr "%s: ¥úºÐ¾÷©ì½LÃö³¬ªº©R¥O¨Ã¤£³Q¥»ª©ªº®Ö¤ß¤ÞÀº (kernel) ©Ò¤ä´©\n" -#: ../eject.c:429 +#: ../eject.c:508 #, c-format msgid "%s: CD-ROM select speed command failed: %s\n" msgstr "%s: ¥úºÐ¾÷³t«×¿ï¾Üªº©R¥O¥¢±Ñ: %s\n" -#: ../eject.c:433 +#: ../eject.c:512 #, c-format msgid "%s: CD-ROM select speed command not supported by this kernel\n" msgstr "%s: ¥úºÐ¾÷³t«×¿ï¾Üªº©R¥O¨Ã¤£³Q¥»ª©ªº®Ö¤ß¤ÞÀº (kernel) ©Ò¤ä´©\n" -#: ../eject.c:543 +#: ../eject.c:633 #, c-format -msgid "%s: unable to exec /bin/umount of `%s': %s\n" -msgstr "%s: µLªk°õ¦æ /bin/umount '%s': %s\n" +msgid "%s: unable to exec umount of `%s': %s\n" +msgstr "%s: µLªk°õ¦æ umount '%s': %s\n" -#: ../eject.c:548 +#: ../eject.c:638 #, c-format msgid "%s: unable to fork: %s\n" msgstr "%s: µLªk fork: %s\n" -#: ../eject.c:553 +#: ../eject.c:643 #, c-format msgid "%s: unmount of `%s' did not exit normally\n" msgstr "%s: ¨ø¸ü '%s' µo¥Í¤£¥¿±`µ²§ô\n" -#: ../eject.c:557 +#: ../eject.c:647 #, c-format msgid "%s: unmount of `%s' failed\n" msgstr "%s: ¨ø¸ü '%s' ¥¢±Ñ\n" -#: ../eject.c:570 +#: ../eject.c:660 #, c-format msgid "%s: unable to open `%s'\n" msgstr "%s: µLªk¶}±Ò '%s'\n" -#: ../eject.c:615 ../eject.c:691 +#: ../eject.c:706 ../eject.c:791 #, c-format msgid "unable to open %s: %s\n" msgstr "µLªk¶}±Ò %s: %s\n" -#: ../eject.c:655 +#: ../eject.c:751 #, c-format msgid "%s: unable to open /etc/fstab: %s\n" msgstr "%s: µLªk¶}±Ò /etc/fstab ÀÉ: %s\n" -#: ../eject.c:701 ../eject.c:928 +#: ../eject.c:801 ../eject.c:1055 #, c-format msgid "%s: unmounting `%s'\n" msgstr "%s: ¨ø¸ü '%s'\n" -#: ../eject.c:768 +#: ../eject.c:874 #, c-format msgid "%s: `%s' is a multipartition device\n" msgstr "" -#: ../eject.c:773 +#: ../eject.c:879 #, c-format msgid "%s: `%s' is not a multipartition device\n" msgstr "" -#: ../eject.c:786 +#: ../eject.c:892 #, c-format msgid "%s: setting CD-ROM speed to auto\n" msgstr "%s: ³]©w¥úºÐ¾÷³t«×¬°¦Û°Ê\n" -#: ../eject.c:788 +#: ../eject.c:894 #, c-format msgid "%s: setting CD-ROM speed to %dX\n" msgstr "%s: ³]©w¥úºÐ¾÷³t«×¨ì %dX\n" -#: ../eject.c:824 +#: ../eject.c:932 #, c-format msgid "%s: default device: `%s'\n" msgstr "%s: ¤º©w³]³Æ¬°: '%s'\n" -#: ../eject.c:832 +#: ../eject.c:940 #, c-format msgid "%s: using default device `%s'\n" msgstr "%s: ¨Ï¥Î¤º©w³]³Æ '%s'\n" -#: ../eject.c:841 +#: ../eject.c:949 #, c-format msgid "%s: device name is `%s'\n" msgstr "%s: ³]³Æ¦WºÙ¬° '%s'\n" -#: ../eject.c:846 +#: ../eject.c:955 #, c-format msgid "%s: unable to find or open device for: `%s'\n" msgstr "%s: §ä¤£¨ì/µLªk¶}±Ò³]³Æ: '%s'\n" -#: ../eject.c:850 +#: ../eject.c:960 #, c-format msgid "%s: expanded name is `%s'\n" msgstr "%s: ÂX®i¦WºÙ¬° '%s'\n" -#: ../eject.c:855 +#: ../eject.c:969 #, c-format msgid "%s: `%s' is a link to `%s'\n" msgstr "%s: '%s' ³QÁäµ²¨ì '%s'\n" -#: ../eject.c:864 +#: ../eject.c:980 #, c-format msgid "%s: maximum symbolic link depth exceeded: `%s'\n" msgstr "%s: ¶W¹L²Å¦¡Áäµ²ªº³Ì¤j²`«×­È '%s'\n" -#: ../eject.c:872 +#: ../eject.c:988 #, c-format msgid "%s: `%s' is mounted at `%s'\n" msgstr "%s: '%s' ³Q±¾¸ü¨ì '%s'\n" -#: ../eject.c:874 +#: ../eject.c:991 #, c-format msgid "%s: `%s' is not mounted\n" msgstr "%s: '%s' ¨Ã¥¼¸ü¤W\n" -#: ../eject.c:885 +#: ../eject.c:1003 #, c-format msgid "%s: `%s' can be mounted at `%s'\n" msgstr "%s: '%s' ¥i±¾¦b '%s' ¤W\n" -#: ../eject.c:887 +#: ../eject.c:1005 #, c-format msgid "%s: `%s' is not a mount point\n" msgstr "%s: '%s' ¨Ã¤£¬O±¾¸üÂI\n" -#: ../eject.c:895 +#: ../eject.c:1012 +#, c-format +msgid "%s: tried to use `%s' as device name but it is no block device\n" +msgstr "" + +#: ../eject.c:1020 +#, c-format +msgid "%s: device is `%s'\n" +msgstr "%s: ³]³Æ¬O '%s'\n" + +#: ../eject.c:1022 #, c-format msgid "%s: exiting due to -n/--noop option\n" msgstr "" -#: ../eject.c:903 +#: ../eject.c:1030 #, c-format msgid "%s: enabling auto-eject mode for `%s'\n" msgstr "%s: ¶}±Ò '%s' ¦Û°Ê¸õ¥X¼Ò¦¡\n" -#: ../eject.c:905 +#: ../eject.c:1032 #, c-format msgid "%s: disabling auto-eject mode for `%s'\n" msgstr "%s: Ãö³¬ '%s' ¦Û°Ê¸õ¥X¼Ò¦¡\n" -#: ../eject.c:915 +#: ../eject.c:1042 #, c-format msgid "%s: closing tray\n" msgstr "%s: Ãö³¬©ì½L\n" -#: ../eject.c:941 +#: ../eject.c:1068 #, c-format msgid "%s: selecting CD-ROM disc #%d\n" msgstr "%s: ¿ï¾Ü¥úºÐ¤ù½s¸¹ #%d\n" -#: ../eject.c:959 +#: ../eject.c:1086 #, c-format msgid "%s: trying to eject `%s' using CD-ROM eject command\n" msgstr "%s: À|¸Õ¨Ï¥Î CD-ROM ¸õ¥X«ü¥O±N '%s' ¸õ¥X\n" -#: ../eject.c:963 +#: ../eject.c:1090 #, c-format msgid "%s: CD-ROM eject command succeeded\n" msgstr "%s: ¥úºÐ¤ù¸õ¥X«ü¥O¦¨¥\\\n" -#: ../eject.c:965 +#: ../eject.c:1092 #, c-format msgid "%s: CD-ROM eject command failed\n" msgstr "%s: ¥úºÐ¤ù¸õ¥X«ü¥O¥¢±Ñ\n" -#: ../eject.c:971 +#: ../eject.c:1099 #, c-format msgid "%s: trying to eject `%s' using SCSI commands\n" msgstr "%s: À|¸Õ¨Ï¥Î SCSI ¸õ¥X«ü¥O±N '%s' ¸õ¥X\n" -#: ../eject.c:975 +#: ../eject.c:1103 #, c-format msgid "%s: SCSI eject succeeded\n" msgstr "%s: SCSI ¸õ¥X¦¨¥\\\n" -#: ../eject.c:977 +#: ../eject.c:1105 #, c-format msgid "%s: SCSI eject failed\n" msgstr "%s: SCSI ¸õ¥X¥¢±Ñ\n" -#: ../eject.c:983 +#: ../eject.c:1113 #, c-format msgid "%s: trying to eject `%s' using floppy eject command\n" msgstr "%s: À|¸Õ¨Ï¥Î³nºÐ¸õ¥X«ü¥O±N '%s' ¸õ¥X\n" -#: ../eject.c:987 +#: ../eject.c:1117 #, c-format msgid "%s: floppy eject command succeeded\n" msgstr "%s: ³nºÐ¸õ¥X©R¥O¦¨¥\\\n" -#: ../eject.c:989 +#: ../eject.c:1119 #, c-format msgid "%s: floppy eject command failed\n" msgstr "%s: ³nºÐ¸õ¥X©R¥O¿ù»~\n" -#: ../eject.c:995 +#: ../eject.c:1127 #, c-format msgid "%s: trying to eject `%s' using tape offline command\n" msgstr "" -#: ../eject.c:999 +#: ../eject.c:1131 #, c-format msgid "%s: tape offline command succeeded\n" msgstr "" -#: ../eject.c:1001 +#: ../eject.c:1133 #, c-format msgid "%s: tape offline command failed\n" msgstr "" -#: ../eject.c:1006 +#: ../eject.c:1139 #, c-format msgid "%s: unable to eject, last error: %s\n" msgstr "%s: µLªk¸õ¥X¡A¿ù»~½X¬°: %s\n" -#: ../volname.c:57 +#: ../volname.c:58 +#, c-format msgid "usage: volname []\n" msgstr "¥Îªk: volname [<³]³ÆÀɦW>]\n" -#: ../volname.c:63 ../volname.c:69 ../volname.c:75 +#: ../volname.c:64 ../volname.c:70 ../volname.c:76 msgid "volname" msgstr "" + +#: ../eject.c:148 +#, fuzzy +msgid "" +"Long options:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc -m --no-unmount\n" +msgstr "" +"ªø¿ï¶µ:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc\n" + +#: ../eject.c:581 +#, c-format +msgid "%s: unable to exec /bin/umount of `%s': %s\n" +msgstr "%s: µLªk°õ¦æ /bin/umount '%s': %s\n" --- eject-2.0.13deb.orig/po/ja_JP.eucJP.po +++ eject-2.0.13deb/po/ja_JP.eucJP.po @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: eject 2.0.10\n" -"POT-Creation-Date: 2001-08-01 16:29+0900\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-10-08 16:59+0200\n" "PO-Revision-Date: 2001-08-01 16:32+0900\n" "Last-Translator: TAKEDA Hirofumi \n" "Language-Team: Japanese \n" @@ -14,8 +15,8 @@ "Content-Type: text/plain; charset=euc-jp\n" "Content-Transfer-Encoding: 8bit\n" -#: ../eject.c:112 -#, c-format +#: ../eject.c:136 +#, fuzzy, c-format msgid "" "Eject version %s by Jeff Tranter (tranter@pobox.com)\n" "Usage:\n" @@ -35,6 +36,7 @@ " -f\t-- eject floppy\n" " -q\t-- eject tape\n" " -p\t-- use /proc/mounts instead of /etc/mtab\n" +" -m\t-- do not unmount device even if it is mounted\n" msgstr "" "Eject ¥Ð¡¼¥¸¥ç¥ó %s by Jeff Tranter (tranter@pobox.com)\n" "»È¤¤Êý:\n" @@ -43,7 +45,8 @@ " eject [-vnrsfq] [<̾Á°>]\t\t-- ¥Ç¥Ð¥¤¥¹¤Î¥¤¥¸¥§¥¯¥È\n" " eject [-vn] -d\t\t\t-- ¥Ç¥Õ¥©¥ë¥È¤Î¥Ç¥Ð¥¤¥¹¤òɽ¼¨\n" " eject [-vn] -a on|off|1|0 [<̾Á°>]\t-- ¼«Æ°¥¤¥¸¥§¥¯¥Èµ¡Ç½¤ò¥ª¥ó/¥ª¥Õ\n" -" eject [-vn] -c <¥¹¥í¥Ã¥È> [<̾Á°>]\t-- CD-ROM ¥Á¥§¥ó¥¸¥ã¤Î¥Ç¥£¥¹¥¯¤òÀÚ¤êÂؤ¨\n" +" eject [-vn] -c <¥¹¥í¥Ã¥È> [<̾Á°>]\t-- CD-ROM ¥Á¥§¥ó¥¸¥ã¤Î¥Ç¥£¥¹¥¯¤òÀÚ¤êÂØ" +"¤¨\n" " eject [-vn] -t [<̾Á°>]\t\t-- ¥È¥ì¡¼¤òÊĤ¸¤ë\n" " eject [-vn] -x <®ÅÙ> [<̾Á°>]\t-- CD-ROM ¤ÎºÇÂç®ÅÙ¤òÀßÄê\n" "¥ª¥×¥·¥ç¥ó:\n" @@ -55,312 +58,356 @@ " -q\t-- ¥Æ¡¼¥×¤Î¥¤¥¸¥§¥¯¥È\n" " -p\t-- /etc/mtab ¤ÎÂå¤ï¤ê¤Ë /proc/mounts ¤ò»È¤¦\n" -#: ../eject.c:133 +#: ../eject.c:165 +#, c-format msgid "" "Long options:\n" -" -h --help -v --verbose\t -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi\t -f --floppy\n" -" -q --tape -n --noop\t -V --version\n" -" -p --proc\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" msgstr "" "¾ÜºÙɽµ­¤Ë¤è¤ë¥ª¥×¥·¥ç¥ó:\n" -" -h --help -v --verbose\t -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi\t -f --floppy\n" -" -q --tape -n --noop\t -V --version\n" -" -p --proc\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" -#: ../eject.c:141 +#: ../eject.c:183 #, c-format msgid "" "Parameter can be a device file or a mount point.\n" "If omitted, name defaults to `%s'.\n" "By default tries -r, -s, -f, and -q in order until success.\n" msgstr "" -"¥Ñ¥é¥á¥¿¤Î <̾Á°> ¤Ë¤Ï¥Ç¥Ð¥¤¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤¬»ØÄê¤Ç¤­¤Þ¤¹¡£\n" +"¥Ñ¥é¥á¥¿¤Î <̾Á°> ¤Ë¤Ï¥Ç¥Ð¥¤¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤¬»ØÄê¤Ç¤­¤Þ" +"¤¹¡£\n" "¾Êά¤µ¤ì¤¿¾ì¹ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ë¤Ï `%s' ¤¬»È¤ï¤ì¤Þ¤¹¡£\n" "¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ï -r, -s, -f, -q ¤Î½ç¤ËÀ®¸ù¤¹¤ë¤Þ¤Ç¼Â¹Ô¤·¤Þ¤¹¡£\n" -#: ../eject.c:193 +#: ../eject.c:236 #, c-format msgid "%s: invalid argument to --auto/-a option\n" msgstr "%s: --auto/-a ¥ª¥×¥·¥ç¥ó¤ËÂФ·¤ÆÉÔÅö¤Ê°ú¿ô\n" -#: ../eject.c:205 +#: ../eject.c:248 #, c-format msgid "%s: invalid argument to --changerslot/-c option\n" msgstr "%s: --changerslot/-c ¥ª¥×¥·¥ç¥ó¤ËÂФ·¤ÆÉÔÅö¤Ê°ú¿ô\n" -#: ../eject.c:217 +#: ../eject.c:260 #, c-format msgid "%s: invalid argument to --cdspeed/-x option\n" msgstr "%s: --cdspeed/-x ¥ª¥×¥·¥ç¥ó¤ËÂФ·¤ÆÉÔÅö¤Ê°ú¿ô\n" -#: ../eject.c:254 +#: ../eject.c:300 #, c-format msgid "eject version %s by Jeff Tranter (tranter@pobox.com)\n" msgstr "eject ¥Ð¡¼¥¸¥ç¥ó %s by Jeff Tranter (tranter@pobox.com)\n" -#: ../eject.c:264 +#: ../eject.c:310 #, c-format msgid "%s: too many arguments\n" msgstr "%s: °ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹\n" -#: ../eject.c:366 +#: ../eject.c:365 +#, c-format +msgid "%s: could not allocate memory\n" +msgstr "" + +#: ../eject.c:370 +#, c-format +msgid "%s: FindDevice called too often\n" +msgstr "" + +#: ../eject.c:441 #, c-format msgid "%s: CD-ROM auto-eject command failed: %s\n" msgstr "%s: CD-ROM ¼«Æ°¥¤¥¸¥§¥¯¥È¥³¥Þ¥ó¥É¼ºÇÔ: %s\n" -#: ../eject.c:383 +#: ../eject.c:458 #, c-format msgid "%s: CD-ROM select disc command failed: %s\n" msgstr "%s: CD-ROM ¥Ç¥£¥¹¥¯ÁªÂò¥³¥Þ¥ó¥É¼ºÇÔ: %s\n" -#: ../eject.c:389 +#: ../eject.c:464 #, c-format msgid "%s: CD-ROM load from slot command failed: %s\n" msgstr "%s: ¥¹¥í¥Ã¥È¤«¤é¤Î CD-ROM ¥í¡¼¥É¥³¥Þ¥ó¥É¼ºÇÔ: %s\n" -#: ../eject.c:393 +#: ../eject.c:468 #, c-format msgid "%s: IDE/ATAPI CD-ROM changer not supported by this kernel\n" msgstr "%s: IDE/ATAPI CD-ROM ¥Á¥§¥ó¥¸¥ã¤Ï¥«¡¼¥Í¥ë¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: ../eject.c:408 +#: ../eject.c:487 #, c-format msgid "%s: CD-ROM tray close command failed: %s\n" msgstr "%s: CD-ROM ¥È¥ì¡¼¥¯¥í¡¼¥º¥³¥Þ¥ó¥É¼ºÇÔ: %s\n" -#: ../eject.c:412 +#: ../eject.c:491 #, c-format msgid "%s: CD-ROM tray close command not supported by this kernel\n" msgstr "%s: CD-ROM ¥È¥ì¡¼¥¯¥í¡¼¥º¥³¥Þ¥ó¥É¤Ï¥«¡¼¥Í¥ë¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: ../eject.c:429 +#: ../eject.c:508 #, c-format msgid "%s: CD-ROM select speed command failed: %s\n" msgstr "%s: CD-ROM ®ÅÙÁªÂò¥³¥Þ¥ó¥É¼ºÇÔ: %s\n" -#: ../eject.c:433 +#: ../eject.c:512 #, c-format msgid "%s: CD-ROM select speed command not supported by this kernel\n" msgstr "%s: CD-ROM ®ÅÙÁªÂò¥³¥Þ¥ó¥É¤Ï¥«¡¼¥Í¥ë¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: ../eject.c:543 +#: ../eject.c:633 #, c-format -msgid "%s: unable to exec /bin/umount of `%s': %s\n" -msgstr "%s: `%s' ¤Ë¤Ä¤¤¤Æ /bin/umount ¤¬¼Â¹Ô¤Ç¤­¤Þ¤»¤ó: %s\n" +msgid "%s: unable to exec umount of `%s': %s\n" +msgstr "%s: `%s' ¤Ë¤Ä¤¤¤Æ umount ¤¬¼Â¹Ô¤Ç¤­¤Þ¤»¤ó: %s\n" -#: ../eject.c:548 +#: ../eject.c:638 #, c-format msgid "%s: unable to fork: %s\n" msgstr "%s: ¥Õ¥©¡¼¥¯¤Ç¤­¤Þ¤»¤ó: %s\n" -#: ../eject.c:553 +#: ../eject.c:643 #, c-format msgid "%s: unmount of `%s' did not exit normally\n" msgstr "%s: `%s' ¤Î¥¢¥ó¥Þ¥¦¥ó¥È¤¬°Û¾ï½ªÎ»¤·¤Þ¤·¤¿\n" -#: ../eject.c:557 +#: ../eject.c:647 #, c-format msgid "%s: unmount of `%s' failed\n" msgstr "%s: `%s' ¤Î¥¢¥ó¥Þ¥¦¥ó¥È¤Ë¼ºÇÔ\n" -#: ../eject.c:570 +#: ../eject.c:660 #, c-format msgid "%s: unable to open `%s'\n" msgstr "%s: `%s' ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: ../eject.c:615 ../eject.c:691 +#: ../eject.c:706 ../eject.c:791 #, c-format msgid "unable to open %s: %s\n" msgstr "%s ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n" -#: ../eject.c:655 +#: ../eject.c:751 #, c-format msgid "%s: unable to open /etc/fstab: %s\n" msgstr "%s: /etc/fstab ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n" -#: ../eject.c:701 ../eject.c:928 +#: ../eject.c:801 ../eject.c:1055 #, c-format msgid "%s: unmounting `%s'\n" msgstr "%s: `%s' ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹\n" -#: ../eject.c:768 +#: ../eject.c:874 #, c-format msgid "%s: `%s' is a multipartition device\n" msgstr "%s: `%s' ¤Ï¥Þ¥ë¥Á¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Ç¥Ð¥¤¥¹¤Ç¤¹\n" -#: ../eject.c:773 +#: ../eject.c:879 #, c-format msgid "%s: `%s' is not a multipartition device\n" msgstr "%s: `%s' ¤Ï¥Þ¥ë¥Á¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: ../eject.c:786 +#: ../eject.c:892 #, c-format msgid "%s: setting CD-ROM speed to auto\n" msgstr "%s: CD-ROM ®ÅÙ¤ò¼«Æ°¤ËÀßÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: ../eject.c:788 +#: ../eject.c:894 #, c-format msgid "%s: setting CD-ROM speed to %dX\n" msgstr "%s: CD-ROM ®ÅÙ¤ò %dÇÜ®¤ËÀßÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: ../eject.c:824 +#: ../eject.c:932 #, c-format msgid "%s: default device: `%s'\n" msgstr "%s: ¥Ç¥Õ¥©¥ë¥È¤Î¥Ç¥Ð¥¤¥¹: `%s'\n" -#: ../eject.c:832 +#: ../eject.c:940 #, c-format msgid "%s: using default device `%s'\n" msgstr "%s: `%s' ¤ò¥Ç¥Õ¥©¥ë¥È¤Î¥Ç¥Ð¥¤¥¹¤Ë¤·¤Æ¤¤¤Þ¤¹\n" -#: ../eject.c:841 +#: ../eject.c:949 #, c-format msgid "%s: device name is `%s'\n" msgstr "%s: ¥Ç¥Ð¥¤¥¹Ì¾¤Ï `%s' ¤Ç¤¹\n" -#: ../eject.c:846 +#: ../eject.c:955 #, c-format msgid "%s: unable to find or open device for: `%s'\n" msgstr "%s: ¥Ç¥Ð¥¤¥¹¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: `%s'\n" -#: ../eject.c:850 +#: ../eject.c:960 #, c-format msgid "%s: expanded name is `%s'\n" msgstr "%s: Ÿ³«¤·¤¿Ì¾Á°¤Ï `%s' ¤Ç¤¹\n" -#: ../eject.c:855 +#: ../eject.c:969 #, c-format msgid "%s: `%s' is a link to `%s'\n" msgstr "%s: `%s' ¤Ï `%s' ¤Ø¤Î¥ê¥ó¥¯¤Ç¤¹\n" -#: ../eject.c:864 +#: ../eject.c:980 #, c-format msgid "%s: maximum symbolic link depth exceeded: `%s'\n" msgstr "%s: ºÇÂ祷¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¿ô¤ò±Û¤¨¤Þ¤·¤¿: `%s'\n" -#: ../eject.c:872 +#: ../eject.c:988 #, c-format msgid "%s: `%s' is mounted at `%s'\n" msgstr "%s: `%s' ¤Ï `%s' ¤Ë¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: ../eject.c:874 +#: ../eject.c:991 #, c-format msgid "%s: `%s' is not mounted\n" msgstr "%s: `%s' ¤Ï¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: ../eject.c:885 +#: ../eject.c:1003 #, c-format msgid "%s: `%s' can be mounted at `%s'\n" msgstr "%s: `%s' ¤Ï `%s' ¤Ë¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹\n" -#: ../eject.c:887 +#: ../eject.c:1005 #, c-format msgid "%s: `%s' is not a mount point\n" msgstr "%s: `%s' ¤Ï¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: ../eject.c:893 +#: ../eject.c:1012 +#, c-format +msgid "%s: tried to use `%s' as device name but it is no block device\n" +msgstr "" + +#: ../eject.c:1020 #, c-format msgid "%s: device is `%s'\n" msgstr "%s: ¥Ç¥Ð¥¤¥¹¤Ï `%s' ¤Ç¤¹\n" -#: ../eject.c:895 +#: ../eject.c:1022 #, c-format msgid "%s: exiting due to -n/--noop option\n" msgstr "%s: -n/--noop ¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê½ªÎ»¤·¤Þ¤¹\n" -#: ../eject.c:903 +#: ../eject.c:1030 #, c-format msgid "%s: enabling auto-eject mode for `%s'\n" msgstr "%s: `%s' ¤Ï¼«Æ°¥¤¥¸¥§¥¯¥È¥â¡¼¥É¤¬Í­¸ú¤Ç¤¹\n" -#: ../eject.c:905 +#: ../eject.c:1032 #, c-format msgid "%s: disabling auto-eject mode for `%s'\n" msgstr "%s: `%s' ¤Ï¼«Æ°¥¤¥¸¥§¥¯¥È¥â¡¼¥É¤¬Ìµ¸ú¤Ç¤¹\n" -#: ../eject.c:915 +#: ../eject.c:1042 #, c-format msgid "%s: closing tray\n" msgstr "%s: ¥È¥ì¡¼¤òÊĤ¸¤Æ¤¤¤Þ¤¹\n" -#: ../eject.c:941 +#: ../eject.c:1068 #, c-format msgid "%s: selecting CD-ROM disc #%d\n" msgstr "%s: CD-ROM ¥Ç¥£¥¹¥¯ #%d ¤òÁªÂòÃæ\n" -#: ../eject.c:959 +#: ../eject.c:1086 #, c-format msgid "%s: trying to eject `%s' using CD-ROM eject command\n" -msgstr "%s: CD-ROM ¥¤¥¸¥§¥¯¥È¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ `%s' ¤ò¥¤¥¸¥§¥¯¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n" +msgstr "" +"%s: CD-ROM ¥¤¥¸¥§¥¯¥È¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ `%s' ¤ò¥¤¥¸¥§¥¯¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n" -#: ../eject.c:963 +#: ../eject.c:1090 #, c-format msgid "%s: CD-ROM eject command succeeded\n" msgstr "%s: CD-ROM ¥¤¥¸¥§¥¯¥È¥³¥Þ¥ó¥É¤¬À®¸ù¤·¤Þ¤·¤¿\n" -#: ../eject.c:965 +#: ../eject.c:1092 #, c-format msgid "%s: CD-ROM eject command failed\n" msgstr "%s: CD-ROM ¥¤¥¸¥§¥¯¥È¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: ../eject.c:971 +#: ../eject.c:1099 #, c-format msgid "%s: trying to eject `%s' using SCSI commands\n" msgstr "%s: SCSI ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ `%s' ¤ò¥¤¥¸¥§¥¯¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n" -#: ../eject.c:975 +#: ../eject.c:1103 #, c-format msgid "%s: SCSI eject succeeded\n" msgstr "%s: SCSI ¥¤¥¸¥§¥¯¥ÈÀ®¸ù\n" -#: ../eject.c:977 +#: ../eject.c:1105 #, c-format msgid "%s: SCSI eject failed\n" msgstr "%s: SCSI ¥¤¥¸¥§¥¯¥È¼ºÇÔ\n" -#: ../eject.c:983 +#: ../eject.c:1113 #, c-format msgid "%s: trying to eject `%s' using floppy eject command\n" -msgstr "%s: ¥Õ¥í¥Ã¥Ô¡¼¥¤¥¸¥§¥¯¥È¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ `%s' ¤ò¥¤¥¸¥§¥¯¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n" +msgstr "" +"%s: ¥Õ¥í¥Ã¥Ô¡¼¥¤¥¸¥§¥¯¥È¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ `%s' ¤ò¥¤¥¸¥§¥¯¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ" +"¤¹\n" -#: ../eject.c:987 +#: ../eject.c:1117 #, c-format msgid "%s: floppy eject command succeeded\n" msgstr "%s: ¥Õ¥í¥Ã¥Ô¡¼¥¤¥¸¥§¥¯¥È¥³¥Þ¥ó¥ÉÀ®¸ù\n" -#: ../eject.c:989 +#: ../eject.c:1119 #, c-format msgid "%s: floppy eject command failed\n" msgstr "%s: ¥Õ¥í¥Ã¥Ô¡¼¥¤¥¸¥§¥¯¥È¥³¥Þ¥ó¥É¼ºÇÔ\n" -#: ../eject.c:995 +#: ../eject.c:1127 #, c-format msgid "%s: trying to eject `%s' using tape offline command\n" -msgstr "%s: ¥Æ¡¼¥×¥ª¥Õ¥é¥¤¥ó¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ `%s' ¤ò¥¤¥¸¥§¥¯¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n" +msgstr "" +"%s: ¥Æ¡¼¥×¥ª¥Õ¥é¥¤¥ó¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ `%s' ¤ò¥¤¥¸¥§¥¯¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n" -#: ../eject.c:999 +#: ../eject.c:1131 #, c-format msgid "%s: tape offline command succeeded\n" msgstr "%s: ¥Æ¡¼¥×¥ª¥Õ¥é¥¤¥ó¥³¥Þ¥ó¥ÉÀ®¸ù\n" -#: ../eject.c:1001 +#: ../eject.c:1133 #, c-format msgid "%s: tape offline command failed\n" msgstr "%s: ¥Æ¡¼¥×¥ª¥Õ¥é¥¤¥ó¥³¥Þ¥ó¥É¼ºÇÔ\n" -#: ../eject.c:1006 +#: ../eject.c:1139 #, c-format msgid "%s: unable to eject, last error: %s\n" msgstr "%s: ¥¤¥¸¥§¥¯¥È¤Ç¤­¤Þ¤»¤ó, ľ¶á¤Î¥¨¥é¡¼: %s\n" -#: ../volname.c:57 +#: ../volname.c:58 +#, c-format msgid "usage: volname []\n" msgstr "»È¤¤Êý: ¥Ü¥ê¥å¡¼¥à̾ [<¥Ç¥Ð¥¤¥¹¥Õ¥¡¥¤¥ë>]\n" -#: ../ "" +#: ../volname.c:64 ../volname.c:70 ../volname.c:76 msgid "volname" msgstr "¥Ü¥ê¥å¡¼¥à̾" + +#: ../eject.c:148 +#, fuzzy +msgid "" +"Long options:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc -m --no-unmount\n" +msgstr "" +"¾ÜºÙɽµ­¤Ë¤è¤ë¥ª¥×¥·¥ç¥ó:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc\n" + +#: ../eject.c:581 +#, c-format +msgid "%s: unable to exec /bin/umount of `%s': %s\n" +msgstr "%s: `%s' ¤Ë¤Ä¤¤¤Æ /bin/umount ¤¬¼Â¹Ô¤Ç¤­¤Þ¤»¤ó: %s\n" --- eject-2.0.13deb.orig/po/es_ES.po +++ eject-2.0.13deb/po/es_ES.po @@ -0,0 +1,410 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-10-08 16:59+0200\n" +"PO-Revision-Date: 2005-02-15 18:57GMT\n" +"Last-Translator: Daniel \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../eject.c:136 +#, fuzzy, c-format +msgid "" +"Eject version %s by Jeff Tranter (tranter@pobox.com)\n" +"Usage:\n" +" eject -h\t\t\t\t-- display command usage and exit\n" +" eject -V\t\t\t\t-- display program version and exit\n" +" eject [-vnrsfq] []\t\t-- eject device\n" +" eject [-vn] -d\t\t\t-- display default device\n" +" eject [-vn] -a on|off|1|0 []\t-- turn auto-eject feature on or off\n" +" eject [-vn] -c []\t-- switch discs on a CD-ROM changer\n" +" eject [-vn] -t []\t\t-- close tray\n" +" eject [-vn] -x []\t-- set CD-ROM max speed\n" +"Options:\n" +" -v\t-- enable verbose output\n" +" -n\t-- don't eject, just show device found\n" +" -r\t-- eject CD-ROM\n" +" -s\t-- eject SCSI device\n" +" -f\t-- eject floppy\n" +" -q\t-- eject tape\n" +" -p\t-- use /proc/mounts instead of /etc/mtab\n" +" -m\t-- do not unmount device even if it is mounted\n" +msgstr "" +"Eject versión %s por Jeff Tranter (tranter@pobox.com)\n" +"Uso:\n" +" eject -h\t\t\t\t-- mostrar modo de uso y salir\n" +" eject -V\t\t\t\t-- mostrar versión del programa y salir\n" +" eject [-vnrsfq] []\t\t-- expulsar el dispositivo\n" +" eject [-vn] -d\t\t\t-- mostrar dispositivo por defecto\n" +" eject [-vn] -a on|off|1|0 []\t-- activar o desactivar " +"autoexplusión\n" +" eject [-vn] -c []\t-- cambiar discos en un cambiador de CD-" +"ROM\n" +" eject [-vn] -t []\t\t-- cerrar la bandeja\n" +" eject [-vn] -x []\t-- establecer velocidad máxima del " +"CD-ROM\n" +"Opciones:\n" +" -v\t-- activar salida prolija\n" +" -n\t-- no expulsar, sólo mostrar dispositivo encontrado\n" +" -r\t-- expulsar el CD-ROM\n" +" -s\t-- expulsar el dispositivo SCSI\n" +" -f\t-- expulsar el disquete\n" +" -q\t-- expulsar la cinta\n" +" -p\t-- usar /proc/mounts en vez de /etc/mtab\n" + +#: ../eject.c:165 +#, c-format +msgid "" +"Long options:\n" +" -h --help -v --verbose -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" +msgstr "" +"Opciones largas:\n" +" -h --help -v --verbose -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" + +#: ../eject.c:183 +#, c-format +msgid "" +"Parameter can be a device file or a mount point.\n" +"If omitted, name defaults to `%s'.\n" +"By default tries -r, -s, -f, and -q in order until success.\n" +msgstr "" +"El parámetro puede ser un fichero de dispositivo o un punto de " +"montaje.\n" +"Si omitido, el nombre por defecto es`%s'.\n" +"Por defecto prueba -r, -s, -f, et -q en orden hasta tener éxito.\n" + +#: ../eject.c:236 +#, c-format +msgid "%s: invalid argument to --auto/-a option\n" +msgstr "%s: argumento invalido para la opción --auto/-a\n" + +#: ../eject.c:248 +#, c-format +msgid "%s: invalid argument to --changerslot/-c option\n" +msgstr "%s: argumento invalido para la opción --changerslot/-c\n" + +#: ../eject.c:260 +#, c-format +msgid "%s: invalid argument to --cdspeed/-x option\n" +msgstr "%s: argumento invalido para la opción --cdspeed/-x\n" + +#: ../eject.c:300 +#, c-format +msgid "eject version %s by Jeff Tranter (tranter@pobox.com)\n" +msgstr "eject versión %s por Jeff Tranter (tranter@pobox.com)\n" + +#: ../eject.c:310 +#, c-format +msgid "%s: too many arguments\n" +msgstr "%s: demasiados argumentos\n" + +#: ../eject.c:365 +#, c-format +msgid "%s: could not allocate memory\n" +msgstr "" + +#: ../eject.c:370 +#, c-format +msgid "%s: FindDevice called too often\n" +msgstr "" + +#: ../eject.c:441 +#, c-format +msgid "%s: CD-ROM auto-eject command failed: %s\n" +msgstr "%s: la orden de autoexpulsión del CD-ROM ha fallado: %s\n" + +#: ../eject.c:458 +#, c-format +msgid "%s: CD-ROM select disc command failed: %s\n" +msgstr "%s: la selección del lector de CD-ROM ha fallado: %s\n" + +#: ../eject.c:464 +#, c-format +msgid "%s: CD-ROM load from slot command failed: %s\n" +msgstr "%s: la inserción desde la bandeja del CD-ROM ha fallado: %s\n" + +#: ../eject.c:468 +#, c-format +msgid "%s: IDE/ATAPI CD-ROM changer not supported by this kernel\n" +msgstr "%s: el cambiador IDE/ATAPI CD-ROM no está soportado poreste kernel\n" + +#: ../eject.c:487 +#, c-format +msgid "%s: CD-ROM tray close command failed: %s\n" +msgstr "%s: la orden de cierre de la bandeja del CD-ROM ha fallado: %s\n" + +#: ../eject.c:491 +#, c-format +msgid "%s: CD-ROM tray close command not supported by this kernel\n" +msgstr "" +"%s: la orden de cierre de la bandeja del CD-ROM no esta soportada poréste " +"kernel\n" + +#: ../eject.c:508 +#, c-format +msgid "%s: CD-ROM select speed command failed: %s\n" +msgstr "%s: la selección de la velocidad del CD-ROM ha fallado: %s\n" + +#: ../eject.c:512 +#, c-format +msgid "%s: CD-ROM select speed command not supported by this kernel\n" +msgstr "" +"%s: la orden de selección de velocidad del CD-ROM no esta soportada " +"poréste kernel\n" + +#: ../eject.c:633 +#, c-format +msgid "%s: unable to exec umount of `%s': %s\n" +msgstr "%s: incapaz de ejecutar umount of `%s': %s\n" + +#: ../eject.c:638 +#, c-format +msgid "%s: unable to fork: %s\n" +msgstr "%s: incapaz de hacer fork: %s\n" + +#: ../eject.c:643 +#, c-format +msgid "%s: unmount of `%s' did not exit normally\n" +msgstr "%s: el desmontaje de `%s' no salió normalmente\n" + +#: ../eject.c:647 +#, c-format +msgid "%s: unmount of `%s' failed\n" +msgstr "%s: el desmontaje de `%s' ha fallado\n" + +#: ../eject.c:660 +#, c-format +msgid "%s: unable to open `%s'\n" +msgstr "%s: incapaz de abrir `%s'\n" + +#: ../eject.c:706 ../eject.c:791 +#, c-format +msgid "unable to open %s: %s\n" +msgstr "incapaz de abrir %s: %s\n" + +#: ../eject.c:751 +#, c-format +msgid "%s: unable to open /etc/fstab: %s\n" +msgstr "%s: incapaz de abrir /etc/fstab: %s\n" + +#: ../eject.c:801 ../eject.c:1055 +#, c-format +msgid "%s: unmounting `%s'\n" +msgstr "%s: desmontando `%s'\n" + +#: ../eject.c:874 +#, c-format +msgid "%s: `%s' is a multipartition device\n" +msgstr "%s: `%s' es un dispositivo con múltiples particiones\n" + +#: ../eject.c:879 +#, c-format +msgid "%s: `%s' is not a multipartition device\n" +msgstr "%s: `%s' no es un dispositivo con múltiples particiones\n" + +#: ../eject.c:892 +#, c-format +msgid "%s: setting CD-ROM speed to auto\n" +msgstr "%s: estableciendo la velocidad del CD-ROM en modo automatico\n" + +#: ../eject.c:894 +#, c-format +msgid "%s: setting CD-ROM speed to %dX\n" +msgstr "%s: estableciendo la velocidad del CD-ROM a %dX\n" + +#: ../eject.c:932 +#, c-format +msgid "%s: default device: `%s'\n" +msgstr "%s: dispositivo por defecto: `%s'\n" + +#: ../eject.c:940 +#, c-format +msgid "%s: using default device `%s'\n" +msgstr "%s: usando el dispositivo por defecto `%s'\n" + +#: ../eject.c:949 +#, c-format +msgid "%s: device name is `%s'\n" +msgstr "%s: el nombre del dispositivo es `%s'\n" + +#: ../eject.c:955 +#, c-format +msgid "%s: unable to find or open device for: `%s'\n" +msgstr "%s: incapaz de encontrar o abrir el dispositivo para: `%s'\n" + +#: ../eject.c:960 +#, c-format +msgid "%s: expanded name is `%s'\n" +msgstr "%s: el nombre extendido es `%s'\n" + +#: ../eject.c:969 +#, c-format +msgid "%s: `%s' is a link to `%s'\n" +msgstr "%s: `%s' es un enlace a `%s'\n" + +#: ../eject.c:980 +#, c-format +msgid "%s: maximum symbolic link depth exceeded: `%s'\n" +msgstr "%s: profundidad de elace máxima excedida: `%s'\n" + +#: ../eject.c:988 +#, c-format +msgid "%s: `%s' is mounted at `%s'\n" +msgstr "%s: `%s' esta montado en `%s'\n" + +#: ../eject.c:991 +#, c-format +msgid "%s: `%s' is not mounted\n" +msgstr "%s: `%s' no está montado\n" + +#: ../eject.c:1003 +#, c-format +msgid "%s: `%s' can be mounted at `%s'\n" +msgstr "%s: `%s' no puede ser montado en `%s'\n" + +#: ../eject.c:1005 +#, c-format +msgid "%s: `%s' is not a mount point\n" +msgstr "%s: `%s' no es un punto de montaje\n" + +#: ../eject.c:1012 +#, c-format +msgid "%s: tried to use `%s' as device name but it is no block device\n" +msgstr "" + +#: ../eject.c:1020 +#, c-format +msgid "%s: device is `%s'\n" +msgstr "%s: el dispositivo es `%s'\n" + +#: ../eject.c:1022 +#, c-format +msgid "%s: exiting due to -n/--noop option\n" +msgstr "%s: saliendo debido a la opción -n/--noop\n" + +#: ../eject.c:1030 +#, c-format +msgid "%s: enabling auto-eject mode for `%s'\n" +msgstr "%s: activando el modo de autoexpulsión para `%s'\n" + +#: ../eject.c:1032 +#, c-format +msgid "%s: disabling auto-eject mode for `%s'\n" +msgstr "%s: desactivando el modo de autoexpulsión para `%s'\n" + +#: ../eject.c:1042 +#, c-format +msgid "%s: closing tray\n" +msgstr "%s: cerrando la bandeja\n" + +#: ../eject.c:1068 +#, c-format +msgid "%s: selecting CD-ROM disc #%d\n" +msgstr "%s: seleccionando disco CD-ROM #%d\n" + +#: ../eject.c:1086 +#, c-format +msgid "%s: trying to eject `%s' using CD-ROM eject command\n" +msgstr "%s: intentando expulsar `%s' usando la orden de expulsión CD-ROM\n" + +#: ../eject.c:1090 +#, c-format +msgid "%s: CD-ROM eject command succeeded\n" +msgstr "%s: la orden de expulsión ha sido exitosa\n" + +#: ../eject.c:1092 +#, c-format +msgid "%s: CD-ROM eject command failed\n" +msgstr "%s: la orden de expulsión del CD-ROM ha fallado\n" + +#: ../eject.c:1099 +#, c-format +msgid "%s: trying to eject `%s' using SCSI commands\n" +msgstr "%s: intentando expulsar `%s' usando la orden de expulsion SCSI\n" + +#: ../eject.c:1103 +#, c-format +msgid "%s: SCSI eject succeeded\n" +msgstr "%s: la orden de expusión SCSI ha sido exitosa\n" + +#: ../eject.c:1105 +#, c-format +msgid "%s: SCSI eject failed\n" +msgstr "%s: la orden de expulsion SCSI ha fallado\n" + +#: ../eject.c:1113 +#, c-format +msgid "%s: trying to eject `%s' using floppy eject command\n" +msgstr "%s: intentando expulsar `%s' usando la orden de ejecucion disquete\n" + +#: ../eject.c:1117 +#, c-format +msgid "%s: floppy eject command succeeded\n" +msgstr "%s: la orden de expulsión del disquete ha sido exitosa\n" + +#: ../eject.c:1119 +#, c-format +msgid "%s: floppy eject command failed\n" +msgstr "%s: la orden de expulsión del disquete falló\n" + +#: ../eject.c:1127 +#, c-format +msgid "%s: trying to eject `%s' using tape offline command\n" +msgstr "%s: intentando expulsar `%s' usando la orden de cinta desconectada\n" + +#: ../eject.c:1131 +#, c-format +msgid "%s: tape offline command succeeded\n" +msgstr "%s: la orden de desconexión de la cinta ha sido exitosa\n" + +#: ../eject.c:1133 +#, c-format +msgid "%s: tape offline command failed\n" +msgstr "%s: la orden de desconexión de la cinta falló\n" + +#: ../eject.c:1139 +#, c-format +msgid "%s: unable to eject, last error: %s\n" +msgstr "%s: incapaz de expulsar, último error: %s\n" + +#: ../volname.c:58 +#, c-format +msgid "usage: volname []\n" +msgstr "uso: volname []\n" + +#: ../volname.c:64 ../volname.c:70 ../volname.c:76 +msgid "volname" +msgstr "volname" + +#: ../eject.c:148 +#, fuzzy +msgid "" +"Long options:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc -m --no-unmount\n" +msgstr "" +"Opciones largas:\n" +" -h --help -v --verbose\t -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi\t -f --floppy\n" +" -q --tape -n --noop\t -V --version\n" +" -p --proc\n" + +#: ../eject.c:581 +#, c-format +msgid "%s: unable to exec /bin/umount of `%s': %s\n" +msgstr "%s: incapaz de ejecutar /bin/unmount of `%s': %s\n" --- eject-2.0.13deb.orig/po/sv_SE.po +++ eject-2.0.13deb/po/sv_SE.po @@ -0,0 +1,386 @@ +# Swedish translation of eject. +# Copyright (C) 2005 Free Software Foundation, Inc. +# Daniel Nylander , 2005. +# +# +msgid "" +msgstr "" +"Project-Id-Version: eject 2.0.13deb-16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-10-08 16:59+0200\n" +"PO-Revision-Date: 2005-10-06 09:49+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../eject.c:136 +#, c-format +msgid "" +"Eject version %s by Jeff Tranter (tranter@pobox.com)\n" +"Usage:\n" +" eject -h\t\t\t\t-- display command usage and exit\n" +" eject -V\t\t\t\t-- display program version and exit\n" +" eject [-vnrsfq] []\t\t-- eject device\n" +" eject [-vn] -d\t\t\t-- display default device\n" +" eject [-vn] -a on|off|1|0 []\t-- turn auto-eject feature on or off\n" +" eject [-vn] -c []\t-- switch discs on a CD-ROM changer\n" +" eject [-vn] -t []\t\t-- close tray\n" +" eject [-vn] -x []\t-- set CD-ROM max speed\n" +"Options:\n" +" -v\t-- enable verbose output\n" +" -n\t-- don't eject, just show device found\n" +" -r\t-- eject CD-ROM\n" +" -s\t-- eject SCSI device\n" +" -f\t-- eject floppy\n" +" -q\t-- eject tape\n" +" -p\t-- use /proc/mounts instead of /etc/mtab\n" +" -m\t-- do not unmount device even if it is mounted\n" +msgstr "" +"Eject version %s av Jeff Tranter (tranter@pobox.com)\n" +"Användning:\n" +" eject -h\t\t\t\t-- visar kommando användning och avslutar\n" +" eject -V\t\t\t\t-- visar programversion och avslutar\n" +" eject [-vnrsfq] []\t\t-- matar ut enhet\n" +" eject [-vn] -d\t\t\t-- visar standardenhet\n" +" eject [-vn] -a on|off|1|0 []\t-- automatisk utmatning (av eller på)\n" +" eject [-vn] -c []\t-- byter skivor på en CD-ROM-växlare\n" +" eject [-vn] -t []\t\t-- stänger luckan\n" +" eject [-vn] -x []\t-- sätter CD-ROM maxhastighet\n" +"Växlar:\n" +" -v\t-- aktivera informativ utskrivning\n" +" -n\t-- mata inte ut, visa bara om enhet hittades\n" +" -r\t-- mata ut CD-ROM\n" +" -s\t-- mata ut SCSI-enhet\n" +" -f\t-- mata ut floppy\n" +" -q\t-- mata ut band\n" +" -p\t-- använd /proc/mounts istället för /etc/mtab\n" +" -m\t-- avmontera inte enhet även om den är monterad\n" + +#: ../eject.c:165 +#, c-format +msgid "" +"Long options:\n" +" -h --help -v --verbose -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" +msgstr "" +"Växlar med fullt namn:\n" +" -h --help -v --verbose -d --default\n" +" -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" +" -r --cdrom -s --scsi -f --floppy -q --tape\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n" + +#: ../eject.c:183 +#, c-format +msgid "" +"Parameter can be a device file or a mount point.\n" +"If omitted, name defaults to `%s'.\n" +"By default tries -r, -s, -f, and -q in order until success.\n" +msgstr "" +"Parametern kan vara en enhetsfil eller en monteringspunkt.\n" +"Om utelämnad sätts namnet till '%s'.\n" +"Som standard provas -r, -s, -f och -q i ordning fram till det lyckas.\n" + +#: ../eject.c:236 +#, c-format +msgid "%s: invalid argument to --auto/-a option\n" +msgstr "%s: ogiltigt argument till --auto/-a växeln\n" + +#: ../eject.c:248 +#, c-format +msgid "%s: invalid argument to --changerslot/-c option\n" +msgstr "%s: ogiltigt argument till --changerslot/-c växeln\n" + +#: ../eject.c:260 +#, c-format +msgid "%s: invalid argument to --cdspeed/-x option\n" +msgstr "%s: ogiltigt argument till --cdspeed/-x växeln\n" + +#: ../eject.c:300 +#, c-format +msgid "eject version %s by Jeff Tranter (tranter@pobox.com)\n" +msgstr "eject version %s av Jeff Tranter (tranter@pobox.com)\n" + +#: ../eject.c:310 +#, c-format +msgid "%s: too many arguments\n" +msgstr "%s: för många argument\n" + +#: ../eject.c:365 +#, c-format +msgid "%s: could not allocate memory\n" +msgstr "%s: kunde inte allokera minne\n" + +#: ../eject.c:370 +#, c-format +msgid "%s: FindDevice called too often\n" +msgstr "" + +#: ../eject.c:441 +#, c-format +msgid "%s: CD-ROM auto-eject command failed: %s\n" +msgstr "%s: CD-ROM kommando för auto-utmatning misslyckades: %s\n" + +#: ../eject.c:458 +#, c-format +msgid "%s: CD-ROM select disc command failed: %s\n" +msgstr "%s: CD-ROM kommando för val av skiva misslyckades: %s\n" + +#: ../eject.c:464 +#, c-format +msgid "%s: CD-ROM load from slot command failed: %s\n" +msgstr "%s: CD-ROM kommando för laddning från fack misslyckades: %s\n" + +#: ../eject.c:468 +#, c-format +msgid "%s: IDE/ATAPI CD-ROM changer not supported by this kernel\n" +msgstr "%s: IDE/ATAPI CD-ROM-växlare stöds inte av denna kärna\n" + +#: ../eject.c:487 +#, c-format +msgid "%s: CD-ROM tray close command failed: %s\n" +msgstr "%s: CD-ROM kommando för stängning av lucka misslyckades: %s\n" + +#: ../eject.c:491 +#, c-format +msgid "%s: CD-ROM tray close command not supported by this kernel\n" +msgstr "%s: CD-ROM kommando för stängning av lucka stöds inte av denna kärna\n" + +#: ../eject.c:508 +#, c-format +msgid "%s: CD-ROM select speed command failed: %s\n" +msgstr "%s: CD-ROM kommando för val av hastighet misslyckades: %s\n" + +#: ../eject.c:512 +#, c-format +msgid "%s: CD-ROM select speed command not supported by this kernel\n" +msgstr "%s: CD-ROM kommando för val av hastighet stöds inte av denna kärna\n" + +#: ../eject.c:633 +#, c-format +msgid "%s: unable to exec umount of `%s': %s\n" +msgstr "%s: kunde inte starta umount av `%s': %s\n" + +#: ../eject.c:638 +#, c-format +msgid "%s: unable to fork: %s\n" +msgstr "%s: kunde inte dela upp: %s\n" + +#: ../eject.c:643 +#, c-format +msgid "%s: unmount of `%s' did not exit normally\n" +msgstr "%s: avmontering av `%s' avslutades inte normalt\n" + +#: ../eject.c:647 +#, c-format +msgid "%s: unmount of `%s' failed\n" +msgstr "%s: avmontering av `%s' misslyckades\n" + +#: ../eject.c:660 +#, c-format +msgid "%s: unable to open `%s'\n" +msgstr "%s: kunde inte öppna `%s'\n" + +#: ../eject.c:706 ../eject.c:791 +#, c-format +msgid "unable to open %s: %s\n" +msgstr "kunde inte öppna %s: %s\n" + +#: ../eject.c:751 +#, c-format +msgid "%s: unable to open /etc/fstab: %s\n" +msgstr "%s: kunde inte öppna /etc/fstab: %s\n" + +#: ../eject.c:801 ../eject.c:1055 +#, c-format +msgid "%s: unmounting `%s'\n" +msgstr "%s: avmonterar `%s'\n" + +#: ../eject.c:874 +#, c-format +msgid "%s: `%s' is a multipartition device\n" +msgstr "%s: `%s' är en enhet med flera partitioner\n" + +#: ../eject.c:879 +#, c-format +msgid "%s: `%s' is not a multipartition device\n" +msgstr "%s: `%s' är inte en enhet med flera partitioner\n" + +#: ../eject.c:892 +#, c-format +msgid "%s: setting CD-ROM speed to auto\n" +msgstr "%s: sätter CD-ROM-hastighet till auto\n" + +#: ../eject.c:894 +#, c-format +msgid "%s: setting CD-ROM speed to %dX\n" +msgstr "%s: sätter CD-ROM-hastighet till %dX\n" + +#: ../eject.c:932 +#, c-format +msgid "%s: default device: `%s'\n" +msgstr "%s: standardenhet: `%s'\n" + +#: ../eject.c:940 +#, c-format +msgid "%s: using default device `%s'\n" +msgstr "%s: använder standardenheten `%s'\n" + +#: ../eject.c:949 +#, c-format +msgid "%s: device name is `%s'\n" +msgstr "%s: enhetsnamnet är `%s'\n" + +#: ../eject.c:955 +#, c-format +msgid "%s: unable to find or open device for: `%s'\n" +msgstr "%s: kunde inte hitta eller öppna enheten för: `%s'\n" + +#: ../eject.c:960 +#, c-format +msgid "%s: expanded name is `%s'\n" +msgstr "%s: expanderat namn är `%s'\n" + +#: ../eject.c:969 +#, c-format +msgid "%s: `%s' is a link to `%s'\n" +msgstr "%s: `%s' är en länk till `%s'\n" + +#: ../eject.c:980 +#, c-format +msgid "%s: maximum symbolic link depth exceeded: `%s'\n" +msgstr "%s: maxgräns för längd på symbolisk länk överstigen: `%s'\n" + +#: ../eject.c:988 +#, c-format +msgid "%s: `%s' is mounted at `%s'\n" +msgstr "%s: `%s' är monterad på `%s'\n" + +#: ../eject.c:991 +#, c-format +msgid "%s: `%s' is not mounted\n" +msgstr "%s: `%s' är inte monterad\n" + +#: ../eject.c:1003 +#, c-format +msgid "%s: `%s' can be mounted at `%s'\n" +msgstr "%s: `%s' kan monteras på `%s'\n" + +#: ../eject.c:1005 +#, c-format +msgid "%s: `%s' is not a mount point\n" +msgstr "%s: `%s' är inte en monteringspunkt\n" + +#: ../eject.c:1012 +#, c-format +msgid "%s: tried to use `%s' as device name but it is no block device\n" +msgstr "" + +#: ../eject.c:1020 +#, c-format +msgid "%s: device is `%s'\n" +msgstr "%s: enheten är `%s'\n" + +#: ../eject.c:1022 +#, c-format +msgid "%s: exiting due to -n/--noop option\n" +msgstr "%s: avslutar på grund av -n/--noop växeln\n" + +#: ../eject.c:1030 +#, c-format +msgid "%s: enabling auto-eject mode for `%s'\n" +msgstr "%s: aktiverar auto-utmatningsläge för `%s'\n" + +#: ../eject.c:1032 +#, c-format +msgid "%s: disabling auto-eject mode for `%s'\n" +msgstr "%s: avaktiverar auto-utmatningsläge för `%s'\n" + +#: ../eject.c:1042 +#, c-format +msgid "%s: closing tray\n" +msgstr "%s: stänger luckan\n" + +#: ../eject.c:1068 +#, c-format +msgid "%s: selecting CD-ROM disc #%d\n" +msgstr "%s: väljer CD-ROM-skiva #%d\n" + +#: ../eject.c:1086 +#, c-format +msgid "%s: trying to eject `%s' using CD-ROM eject command\n" +msgstr "%s: försöker att mata ut `%s' med CD-ROM kommando för utmatning\n" + +#: ../eject.c:1090 +#, c-format +msgid "%s: CD-ROM eject command succeeded\n" +msgstr "%s: CD-ROM kommando för utmatning lyckades\n" + +#: ../eject.c:1092 +#, c-format +msgid "%s: CD-ROM eject command failed\n" +msgstr "%s: CD-ROM kommando för utmatning misslyckades\n" + +#: ../eject.c:1099 +#, c-format +msgid "%s: trying to eject `%s' using SCSI commands\n" +msgstr "%s: försöker att mata ut `%s' med SCSI-kommandon\n" + +#: ../eject.c:1103 +#, c-format +msgid "%s: SCSI eject succeeded\n" +msgstr "%s: SCSI utmatning lyckades\n" + +#: ../eject.c:1105 +#, c-format +msgid "%s: SCSI eject failed\n" +msgstr "%s: SCSI utmatning misslyckades\n" + +#: ../eject.c:1113 +#, c-format +msgid "%s: trying to eject `%s' using floppy eject command\n" +msgstr "%s: försöker att mata ut `%s' med kommando för utmatning av diskett\n" + +#: ../eject.c:1117 +#, c-format +msgid "%s: floppy eject command succeeded\n" +msgstr "%s: kommando för utmatning av diskett lyckades\n" + +#: ../eject.c:1119 +#, c-format +msgid "%s: floppy eject command failed\n" +msgstr "%s: kommando för utmatning av diskett misslyckades\n" + +#: ../eject.c:1127 +#, c-format +msgid "%s: trying to eject `%s' using tape offline command\n" +msgstr "%s: försöker att mata ut `%s' med kommando för att göra band offline\n" + +#: ../eject.c:1131 +#, c-format +msgid "%s: tape offline command succeeded\n" +msgstr "%s: kommando för att göra band offline lyckades\n" + +#: ../eject.c:1133 +#, c-format +msgid "%s: tape offline command failed\n" +msgstr "%s: kommando för att göra band offline misslyckades\n" + +#: ../eject.c:1139 +#, c-format +msgid "%s: unable to eject, last error: %s\n" +msgstr "%s: kunde inte matas ut, senaste felet: %s\n" + +#: ../volname.c:58 +#, c-format +msgid "usage: volname []\n" +msgstr "använd: volname []\n" + +#: ../volname.c:64 ../volname.c:70 ../volname.c:76 +msgid "volname" +msgstr "volname" --- eject-2.0.13deb.orig/README +++ eject-2.0.13deb/README @@ -43,7 +43,7 @@ media other than CD-ROM or when running Linux on non-Intel machines. Version 2.0 is mostly a rewrite of version 1.5 to clean up the source -and add a number of new features (and take our some useless ones). +and add a number of new features (and take out some useless ones). Many thanks to the beta testers for version 2.0: Andrea Borgia Darius Davis David Wheeler Jochen Stein --- eject-2.0.13deb.orig/eject.1 +++ eject-2.0.13deb/eject.1 @@ -7,21 +7,21 @@ .SH NAME eject \- eject removable media .SH SYNOPSIS -eject -h +eject \-h .br -eject [-vnrsfqp] [] +eject [\-vnrsfqp] [] .br -eject [-vn] -d +eject [\-vn] \-d .br -eject [-vn] -a on|off|1|0 [] +eject [\-vn] \-a on|off|1|0 [] .br -eject [-vn] -c slot [] +eject [\-vn] \-c slot [] .br -eject [-vn] -t [] +eject [\-vn] \-t [] .br -eject [-vn] -x [] +eject [\-vn] \-x [] .br -eject -V +eject \-V .SH DESCRIPTION @@ -34,7 +34,7 @@ The device corresponding to is ejected. The name can be a device file or mount point, either a full path or with the leading -"/dev" or "/mnt" omitted. If no name is specified, the default name +"/dev", "/media" or "/mnt" omitted. If no name is specified, the default name "cdrom" is used. There are four different methods of ejecting, depending on whether the @@ -46,32 +46,32 @@ .PP .SH "COMMAND\-LINE OPTIONS" .TP 0.5i -.B -h +.B \-h This option causes .B eject to display a brief description of the command options. .TP 0.5i -.B -v +.B \-v This makes .B eject run in verbose mode; more information is displayed about what the command is doing. .TP 0.5i -.B -d +.B \-d If invoked with this option, .B eject lists the default device name. .TP 0.5i -.B -a on|1|off|0 +.B \-a on|1|off|0 This option controls the auto-eject mode, supported by some devices. When enabled, the drive automatically ejects when the device is closed. .TP 0.5i -.B -c +.B \-c With this option a CD slot can be selected from an ATAPI/IDE CD-ROM changer. Linux 2.0 or higher is required to use this feature. The CD-ROM drive can not be in use (mounted data CD or playing a music CD) @@ -79,51 +79,58 @@ the changer is referred to as 0, not 1. .TP 0.5i -.B -t +.B \-t With this option the drive is given a CD-ROM tray close command. Not all devices support this command. .TP 0.5i -.B -x +.B \-x With this option the drive is given a CD-ROM select speed command. The speed argument is a number indicating the desired speed (e.g. 8 for 8X speed), or 0 for maximum data rate. Not all devices support this command and you can only specify speeds that the drive is capable of. Every time the media is changed this option is cleared. This -option can be used alone, or with the -t and -c options. +option can be used alone, or with the \-t and \-c options. .TP 0.5i -.B -n +.B \-n With this option the selected device is displayed but no action is performed. .TP 0.5i -.B -r +.B \-r This option specifies that the drive should be ejected using a CDROM eject command. .TP 0.5i -.B -s +.B \-s This option specifies that the drive should be ejected using SCSI commands. .TP 0.5i -.B -f +.B \-f This option specifies that the drive should be ejected using a removable floppy disk eject command. .TP 0.5i -.B -q +.B \-q This option specifies that the drive should be ejected using a tape drive offline command. .TP 0.5i -.B -p +.B \-p This option allow you to use /proc/mounts instead /etc/mtab. It -also passes the -n option to umount(1). +also passes the \-n option to umount(1). .TP 0.5i -.B -V +.B \-m +This option allows eject to work with device drivers which automatically +mount removable media and therefore must be always mount()ed. +The option tells eject to not try to unmount the given device, +even if it is mounted according to /etc/mtab or /proc/mounts. + +.TP 0.5i +.B \-V This option causes .B eject to display the program version and exit. @@ -133,33 +140,35 @@ names can be abbreviated as long as they are unique. .br --h --help +\-h \-\-help +.br +\-v \-\-verbose .br --v --verbose +\-d \-\-default .br --d --default +\-a \-\-auto .br --a --auto +\-c \-\-changerslot .br --c --changerslot +\-t \-\-trayclose .br --t --trayclose +\-x \-\-cdspeed .br --x --cdspeed +\-n \-\-noop .br --n --noop +\-r \-\-cdrom .br --r --cdrom +\-s \-\-scsi .br --s --scsi +\-f \-\-floppy .br --f --floppy +\-q \-\-tape .br --q --tape +\-V \-\-version .br --V --version +\-p \-\-proc .br --p --proc +\-m \-\-no-unmount .br .SH EXAMPLES @@ -192,13 +201,13 @@ .IP eject sda4 .PP -Select 5th disc on mult-disc changer: +Select 5th disc on multi-disc changer: .IP -eject -v -c5 /dev/cdrom +eject \-v \-c4 /dev/cdrom .PP Turn on auto-eject on a SoundBlaster CD-ROM drive: .IP -eject -a on /dev/sbpcd +eject \-a on /dev/sbpcd .SH EXIT STATUS .PP @@ -222,7 +231,7 @@ .B eject program itself. -The -r, -s, -f, and -q options allow controlling which methods are +The \-r, \-s, \-f, and \-q options allow controlling which methods are used to eject. More than one method can be specified. If none of these options are specified, it tries all four (this works fine in most cases). @@ -257,8 +266,9 @@ the name ends in a trailing slash, it is removed (this is to support filenames generated using shell file name completion). If the name starts with '.' or '/', it tries to open it as a device file or mount -point. If that fails, it tries prepending '/dev/', '/mnt/', '/dev/cdroms', -\&'/dev/rdsk/', '/dev/dsk/', and finally './' to the name, until a +point. If that fails, it tries prepending '/dev/', '/media/' ,'/mnt/', +\&'/dev/cdroms', '/dev/rdsk/', '/dev/dsk/', and finally './' to the name, +until a device file or mount point is found that can be opened. The program checks /etc/mtab for mounted devices. If that fails, it also checks /etc/fstab for mount points of currently unmounted devices. @@ -277,7 +287,7 @@ under the conditions of the GNU General Public License. See the file COPYING and notes in the source code for details. -The -x option was added by Nobuyuki Tsuchimura (tutimura@nn.iij4u.or.jp), +The \-x option was added by Nobuyuki Tsuchimura (tutimura@nn.iij4u.or.jp), with thanks to Roland Krivanek (krivanek@fmph.uniba.sk) and his cdrom_speed command. --- eject-2.0.13deb.orig/eject.c +++ eject-2.0.13deb/eject.c @@ -7,6 +7,7 @@ ******************************************************************** * * Copyright (C) 1994-2001 Jeff Tranter (tranter@pobox.com) + * Copyright (C) 2004, 2005 Frank Lichtenheld (djpig@debian.org) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ******************************************************************** * @@ -35,18 +36,14 @@ #error DEFAULTDEVICE not set, check Makefile #endif -#include -/* handy macro found in 2.1 kernels, but not in older ones */ -#ifndef KERNEL_VERSION -#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -#endif - #include #include #include #include #include #include +#include +#include /* makedev() */ #ifdef GETOPTLONG #include @@ -58,17 +55,43 @@ #include #include #include +#include + +#if defined(__linux__) +#include +/* handy macro found in 2.1 kernels, but not in older ones */ +#ifndef KERNEL_VERSION +#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) +#endif #include #include #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) #include #endif #include -#include #include #include #include +#define HAVE_EJECT_SCSI +#define HAVE_EJECT_FLOPPY +#define HAVE_EJECT_TAPE + +#elif defined(__FreeBSD_kernel__) +#include +#endif /* if defined(__linux__) */ + + +#define CLOSE(fd) if (close(fd)==-1) { \ + perror(programName); \ + exit(1); \ +} + +#define FCLOSE(fd) if (fclose(fd)==-1) { \ + perror(programName); \ + exit(1); \ +} + /* Global Variables */ const char *version = VERSION; /* program version */ int a_option = 0; /* command flags and arguments */ @@ -84,6 +107,7 @@ int v_option = 0; int x_option = 0; int p_option = 0; +int m_option = 0; int a_arg = 0; int c_arg = 0; int x_arg = 0; @@ -125,19 +149,37 @@ " -v\t-- enable verbose output\n" " -n\t-- don't eject, just show device found\n" " -r\t-- eject CD-ROM\n" +#ifdef HAVE_EJECT_SCSI " -s\t-- eject SCSI device\n" +#endif +#ifdef HAVE_EJECT_FLOPPY " -f\t-- eject floppy\n" +#endif +#ifdef HAVE_EJECT_TAPE " -q\t-- eject tape\n" -" -p\t-- use /proc/mounts instead of /etc/mtab\n") +#endif +" -p\t-- use /proc/mounts instead of /etc/mtab\n" +" -m\t-- do not unmount device even if it is mounted\n" +) , version); #ifdef GETOPTLONG fprintf(stderr,_( "Long options:\n" -" -h --help -v --verbose -d --default\n" +" -h --help -v --verbose -d --default\n" " -a --auto -c --changerslot -t --trayclose -x --cdspeed\n" -" -r --cdrom -s --scsi -f --floppy\n" -" -q --tape -n --noop -V --version\n" -" -p --proc\n")); +" -r --cdrom" +#ifdef HAVE_EJECT_SCSI +" -s --scsi" +#endif +#ifdef HAVE_EJECT_FLOPPY +" -f --floppy" +#endif +#ifdef HAVE_EJECT_TAPE +" -q --tape" +#endif +"\n" +" -n --noop -V --version\n" +" -p --proc -m --no-unmount\n")); #endif /* GETOPTLONG */ fprintf(stderr,_( "Parameter can be a device file or a mount point.\n" @@ -151,7 +193,7 @@ /* Handle command line options. */ static void parse_args(int argc, char **argv, char **device) { - const char *flags = "a:c:x:dfhnqrstvVp"; + const char *flags = "a:c:x:dfhnqrstvVpm"; #ifdef GETOPTLONG static struct option long_options[] = { @@ -169,6 +211,7 @@ {"tape", no_argument, NULL, 'q'}, {"version", no_argument, NULL, 'V'}, {"proc", no_argument, NULL, 'p'}, + {"no-unmount", no_argument, NULL, 'm'}, {0, 0, 0, 0} }; int option_index; @@ -231,6 +274,9 @@ usage(); exit(0); break; + case 'm': + m_option = 1; + break; case 'n': n_option = 1; break; @@ -273,18 +319,23 @@ /* Return 1 if file/device exists, 0 otherwise. */ -static int FileExists(const char *name) +static int FileExists(const char *name, const int try, int *found) { - /* + if (!found) return -1; + /* * access() uses the UID, not the EUID. This way a normal user * cannot find out if a file (say, /root/fubar) exists or not, even * if eject is SUID root */ if (access (name, F_OK) == 0) { - return 1; - } else { - return 0; + (*found)++; + if (try <= (*found)) + return 1; + else + return 0; + } else { + return 0; } } @@ -294,6 +345,7 @@ * * foo (if foo starts with '.' or '/') * /dev/foo + * /media/foo * /mnt/foo * /dev/cdroms/foo * /dev/cdroms/foo0 @@ -307,51 +359,68 @@ static char *FindDevice(const char *name) { char *buf; + static int try = 0; + int found = 0; buf = (char *) malloc(strlen(name)+14); /* to allow for "/dev/cdroms/ + "0" + null */ + if (buf==NULL) { + fprintf(stderr, _("%s: could not allocate memory\n"), programName); + exit(1); + } + + if (try == INT_MAX) { + fprintf(stderr, _("%s: FindDevice called too often\n"), programName );; + exit(1); + } else + try++; if ((name[0] == '.') || (name[0] == '/')) { strcpy(buf, name); - if (FileExists(buf)) + if (FileExists(buf, try, &found)) return buf; } strcpy(buf, "/dev/"); strcat(buf, name); - if (FileExists(buf)) + if (FileExists(buf, try, &found)) return buf; + strcpy(buf, "/media/"); + strcat(buf, name); + if (FileExists(buf, try, &found)) + return buf; + strcpy(buf, "/mnt/"); strcat(buf, name); - if (FileExists(buf)) + if (FileExists(buf, try, &found)) return buf; /* for devfs under Linux */ strcpy(buf, "/dev/cdroms/"); strcat(buf, name); - if (FileExists(buf)) + if (FileExists(buf, try, &found)) return buf; strcpy(buf, "/dev/cdroms/"); strcat(buf, name); strcat(buf, "0"); - if (FileExists(buf)) + if (FileExists(buf, try, &found)) return buf; /* for devfs under Solaris */ strcpy(buf, "/dev/rdsk/"); strcat(buf, name); - if (FileExists(buf)) + if (FileExists(buf, try, &found)) return buf; strcpy(buf, "/dev/dsk/"); strcat(buf, name); - if (FileExists(buf)) + if (FileExists(buf, try, &found)) return buf; strcpy(buf, "./"); strcat(buf, name); - if (FileExists(buf)) + if (FileExists(buf, try, &found)) return buf; free(buf); @@ -363,9 +432,13 @@ /* Set or clear auto-eject mode. */ static void AutoEject(int fd, int onOff) { - int status; + int status = -1; +#ifdef CDROMEJECT_SW status = ioctl(fd, CDROMEJECT_SW, onOff); +#else + errno = ENOSYS; +#endif if (status != 0) { fprintf(stderr, _("%s: CD-ROM auto-eject command failed: %s\n"), programName, strerror(errno)); exit(1); @@ -406,8 +479,12 @@ { int status; -#ifdef CDROMCLOSETRAY +#if defined(CDROMCLOSETRAY) || defined(CDIOCCLOSE) +#if defined(CDROMCLOSETRAY) status = ioctl(fd, CDROMCLOSETRAY); +#elif defined(CDIOCCLOSE) + status = ioctl(fd, CDIOCCLOSE); +#endif if (status != 0) { fprintf(stderr, _("%s: CD-ROM tray close command failed: %s\n"), programName, strerror(errno)); exit(1); @@ -444,67 +521,72 @@ */ static int EjectCdrom(int fd) { - int status; + int status = -1; +#if defined(CDROMEJECT) status = ioctl(fd, CDROMEJECT); +#elif defined(CDIOCEJECT) + status = ioctl(fd, CDIOCEJECT); +#else +/* Some kernels implement cdrom-eject only, but I don't think any kernel in the + world would implement eject only for non-cdrom drives. Let's die. */ +# error +#endif return (status == 0); } - +#ifdef HAVE_EJECT_SCSI /* - * Eject using SCSI commands. Return 1 if successful, 0 otherwise. + * Eject using SCSI SG_IO commands. Return 1 if successful, 0 otherwise. */ static int EjectScsi(int fd) { - int status; - struct sdata { - int inlen; - int outlen; - char cmd[256]; - } scsi_cmd; - - scsi_cmd.inlen = 0; - scsi_cmd.outlen = 0; - scsi_cmd.cmd[0] = ALLOW_MEDIUM_REMOVAL; - scsi_cmd.cmd[1] = 0; - scsi_cmd.cmd[2] = 0; - scsi_cmd.cmd[3] = 0; - scsi_cmd.cmd[4] = 0; - scsi_cmd.cmd[5] = 0; - status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd); - if (status != 0) + int status, k; + sg_io_hdr_t io_hdr; + unsigned char allowRmBlk[6] = {ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0}; + unsigned char startStop1Blk[6] = {START_STOP, 0, 0, 0, 1, 0}; + unsigned char startStop2Blk[6] = {START_STOP, 0, 0, 0, 2, 0}; + unsigned char inqBuff[2]; + unsigned char sense_buffer[32]; + + if ((ioctl(fd, SG_GET_VERSION_NUM, &k) < 0) || (k < 30000)) { + printf("not an sg device, or old sg driver\n"); + return 0; + } + + memset(&io_hdr, 0, sizeof(sg_io_hdr_t)); + io_hdr.interface_id = 'S'; + io_hdr.cmd_len = 6; + io_hdr.mx_sb_len = sizeof(sense_buffer); + io_hdr.dxfer_direction = SG_DXFER_NONE; + io_hdr.dxfer_len = 0; + io_hdr.dxferp = inqBuff; + io_hdr.sbp = sense_buffer; + io_hdr.timeout = 2000; + + io_hdr.cmdp = allowRmBlk; + status = ioctl(fd, SG_IO, (void *)&io_hdr); + if (status < 0) return 0; - scsi_cmd.inlen = 0; - scsi_cmd.outlen = 0; - scsi_cmd.cmd[0] = START_STOP; - scsi_cmd.cmd[1] = 0; - scsi_cmd.cmd[2] = 0; - scsi_cmd.cmd[3] = 0; - scsi_cmd.cmd[4] = 1; - scsi_cmd.cmd[5] = 0; - status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd); - if (status != 0) + io_hdr.cmdp = startStop1Blk; + status = ioctl(fd, SG_IO, (void *)&io_hdr); + if (status < 0) return 0; - scsi_cmd.inlen = 0; - scsi_cmd.outlen = 0; - scsi_cmd.cmd[0] = START_STOP; - scsi_cmd.cmd[1] = 0; - scsi_cmd.cmd[2] = 0; - scsi_cmd.cmd[3] = 0; - scsi_cmd.cmd[4] = 2; - scsi_cmd.cmd[5] = 0; - status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd); - if (status != 0) + io_hdr.cmdp = startStop2Blk; + status = ioctl(fd, SG_IO, (void *)&io_hdr); + if (status < 0) return 0; /* force kernel to reread partition table when new disc inserted */ status = ioctl(fd, BLKRRPART); - return (status == 0); + return 1; } +#endif +#ifdef HAVE_EJECT_FLOPPY /* * Eject using FDEJECT ioctl. Return 1 if successful, 0 otherwise. */ @@ -513,10 +595,12 @@ int status; status = ioctl(fd, FDEJECT); - return (status == 0); + return (status >= 0); } +#endif +#ifdef HAVE_EJECT_TAPE /* * Eject using tape ioctl. Return 1 if successful, 0 otherwise. */ @@ -528,8 +612,9 @@ op.mt_op = MTOFFL; /* rewind and eject */ op.mt_count = 0; /* not used */ status = ioctl(fd, MTIOCTOP, &op); - return (status == 0); + return (status >= 0); } +#endif /* Unmount a device. */ @@ -539,12 +624,15 @@ switch (fork()) { case 0: /* child */ - seteuid(getuid()); /* reduce likelyhood of security holes when running setuid */ - if(p_option) - execl("/bin/umount", "/bin/umount", fullName, "-n", NULL); - else - execl("/bin/umount", "/bin/umount", fullName, NULL); - fprintf(stderr, _("%s: unable to exec /bin/umount of `%s': %s\n"), + setuid(getuid()); /* reduce likelyhood of security holes when running setuid */ + if(p_option) { + execlp("pumount", "pumount", fullName, "-n", NULL); + execlp("umount", "umount", fullName, "-n", NULL); + } else { + execlp("pumount", "pumount", fullName, NULL); + execlp("umount", "umount", fullName, NULL); + } + fprintf(stderr, _("%s: unable to exec umount of `%s': %s\n"), programName, fullName, strerror(errno)); exit(1); break; @@ -569,7 +657,15 @@ /* Open a device file. */ static int OpenDevice(const char *fullName) { - int fd = open(fullName, O_RDONLY|O_NONBLOCK); + int flags = O_NONBLOCK; + int fd; + + if (s_option) + flags |= O_RDWR; + else + flags |= O_RDONLY; + + fd = open(fullName, flags); if (fd == -1) { fprintf(stderr, _("%s: unable to open `%s'\n"), programName, fullName); exit(1); @@ -585,13 +681,14 @@ static int GetMajorMinor(const char *name, int *maj, int *min) { struct stat sstat; - *maj = *min = -1; + if (maj) *maj = -1; + if (min) *min = -1; if (stat(name, &sstat) == -1) return -1; - if (! S_ISBLK(sstat.st_mode)) + if (! S_ISBLK(sstat.st_mode) && ! S_ISCHR(sstat.st_mode)) return -1; - *maj = major(sstat.st_rdev); - *min = minor(sstat.st_rdev); + if (maj) *maj = major(sstat.st_rdev); + if (min) *min = minor(sstat.st_rdev); return 0; } @@ -627,7 +724,7 @@ GetMajorMinor(s1, &mtabmaj, &mtabmin); if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) || ((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) { - fclose(fp); + FCLOSE(fp); *deviceName = strdup(s1); *mountName = strdup(s2); return 1; @@ -636,7 +733,7 @@ } *deviceName = 0; *mountName = 0; - fclose(fp); + FCLOSE(fp); return 0; } @@ -656,23 +753,82 @@ fp = fopen("/etc/fstab", "r"); if (fp == NULL) { - fprintf(stderr, _("%s: unable to open /etc/fstab: %s\n"), programName, strerror(errno)); - exit(1); + /* + * /etc/fstab may be unreadable in some situations due to passwords + * in the file. + */ + if (v_option) { + printf( _("%s: unable to open /etc/fstab: %s\n"), programName, strerror(errno)); + } + return -1; } while (fgets(line, sizeof(line), fp) != 0) { rc = sscanf(line, "%1023s %1023s", s1, s2); if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) { - fclose(fp); + FCLOSE(fp); *deviceName = strdup(s1); *mountName = strdup(s2); return 1; } } - fclose(fp); + FCLOSE(fp); return 0; } +/* + * Find device name with the given major and minor number. Returns NULL if not + * found. The returned pointer points to static area and must not be free()'d. + */ +char* FindDeviceMajorMinor(int major, int minor) +{ + DIR* d = opendir("/dev"); + struct dirent *entry; + struct stat st; + dev_t dev = makedev(major, minor); + static char path[270]; + + if (!d) + return NULL; + while ((entry = readdir(d)) != 0) { + snprintf(path, sizeof(path), "/dev/%s", entry->d_name); + if (stat(path, &st) != 0) + continue; + if (S_ISBLK (st.st_mode) && st.st_rdev == dev) + return path; + } + return NULL; +} + +/* + * Check whether dev is an encrypted device handled by devmapper. If so, return + * the underlying physical device name (pointer to static area, do not free()). + * If not, or an error occurs, return NULL. + * This uses the /usr/lib/eject/dmcrypt-get-device helper. + */ +const char* GetDevmapperDevice (const char* dev) +{ + char cmd[1024]; + char output[100]; + int major, minor; + + const char* devmapper = "/dev/mapper/"; + if (strncmp (dev, devmapper, strlen(devmapper))) + return NULL; + + if (strchr (dev, '\'')) + return NULL; + snprintf (cmd, sizeof(cmd), "/usr/lib/eject/dmcrypt-get-device '%s'", dev); + FILE* f = popen (cmd, "r"); + fread (output, 1, sizeof(output), f); + if (pclose(f)) + return NULL; + + if (sscanf(output, "%i:%i", &major, &minor) == 2) + return FindDeviceMajorMinor (major, minor); + else + return NULL; +} /* * Step through mount table and unmount all devices that match a regular @@ -687,7 +843,10 @@ char line[1024]; int status; - regcomp(&preg, pattern, REG_EXTENDED); + if (regcomp(&preg, pattern, REG_EXTENDED)!=0) { + perror(programName); + exit(1); + } fp = fopen((p_option ? "/proc/mounts" : "/etc/mtab"), "r"); if (fp == NULL) @@ -699,16 +858,25 @@ while (fgets(line, sizeof(line), fp) != 0) { status = sscanf(line, "%1023s %1023s", s1, s2); if (status >= 2) { - status = regexec(&preg, s1, 0, 0, 0); + /* Check if we have a mapped device */ + const char* dev = GetDevmapperDevice (s1); + if (dev) { + if (v_option) + printf(_("%s: %s is encrypted on real device %s\n"), + programName, s1, dev); + } else + dev = s1; + + status = regexec(&preg, dev, 0, 0, 0); if (status == 0) { if (v_option) printf(_("%s: unmounting `%s'\n"), programName, s1); Unmount(s1); - regfree(&preg); } } } - fclose(fp); + FCLOSE(fp); + regfree(&preg); } @@ -761,6 +929,15 @@ char pattern[256]; char *result = 0; + /* Check if we have a mapped device */ + const char* dev = GetDevmapperDevice (name); + if (dev) { + if (v_option) + printf(_("%s: %s is encrypted on real device %s\n"), + programName, name, dev); + name = dev; + } + for (i = 0; partitionDevice[i] != 0; i++) { /* look for ^/dev/foo[a-z]([0-9]?[0-9])?$, e.g. /dev/hda1 */ strcpy(pattern, "^/dev/"); @@ -811,12 +988,14 @@ int worked = 0; /* set to 1 when successfully ejected */ char *device = 0; /* name passed from user */ char *fullName; /* expanded name */ + char *fullNameOrig;/* expanded name (links not resolved) */ char *deviceName; /* name of device */ char *linkName; /* name of device's symbolic link */ char *mountName; /* name of device's mount point */ int fd; /* file descriptor for device */ int mounted = 0; /* true if device is mounted */ int mountable = 0; /* true if device is in /etc/fstab */ + int result = 0; /* store the result of a operation */ char *pattern; /* regex for device if multiple partitions */ int ld = 6; /* symbolic link max depth */ @@ -850,53 +1029,72 @@ if (v_option) printf(_("%s: device name is `%s'\n"), programName, device); - /* figure out full device or mount point name */ - fullName = FindDevice(device); - if (fullName == 0) { - fprintf(stderr, _("%s: unable to find or open device for: `%s'\n"), programName, device); - exit(1); - } - if (v_option) - printf(_("%s: expanded name is `%s'\n"), programName, fullName); + do { + /* figure out full device or mount point name */ + fullName = FindDevice(device); + if (fullName == 0) { + fprintf(stderr, _("%s: unable to find or open device for: `%s'\n"), + programName, device); + exit(1); + } + if (v_option) + printf(_("%s: expanded name is `%s'\n"), programName, fullName); + + /* check for a symbolic link */ + /* /proc/mounts doesn't resolve symbolic links */ + fullNameOrig = strdup(fullName); + linkName = strdup(fullName); /* ensure linkName is initialized */ + if (!p_option) { + while ((linkName = SymLink(fullName)) && (ld > 0)) { + if (v_option) + printf(_("%s: `%s' is a link to `%s'\n"), programName, + fullName, linkName); + free(fullName); + fullName = strdup(linkName); + free(linkName); + linkName = 0; + ld--; + } + } + /* handle max depth exceeded option */ + if (ld <= 0) { + printf(_("%s: maximum symbolic link depth exceeded: `%s'\n"), programName, fullName); + exit(1); + } + + /* if mount point, get device name */ + mounted = MountedDevice(fullName, &mountName, &deviceName); + if (v_option) { + if (mounted) + printf(_("%s: `%s' is mounted at `%s'\n"), programName, + deviceName, mountName); + else + printf(_("%s: `%s' is not mounted\n"), programName, fullName); + } + if (!mounted) { + deviceName = strdup(fullName); + } + + /* if not currently mounted, see if it is a possible mount point */ + if (!mounted) { + mountable = MountableDevice(fullName, &mountName, &deviceName); + /* if return value -1 then fstab could not be read */ + if (v_option && mountable >= 0) { + if (mountable) + printf(_("%s: `%s' can be mounted at `%s'\n"), programName, deviceName, mountName); + else + printf(_("%s: `%s' is not a mount point\n"), programName, fullName); + } + } + + result = GetMajorMinor(deviceName, NULL, NULL); + if (result == -1) { + fprintf(stderr, + _("%s: tried to use `%s' as device name but it is no block device\n"), + programName, deviceName); + } - /* check for a symbolic link */ - while ((linkName = SymLink(fullName)) && (ld > 0)) { - if (v_option) - printf(_("%s: `%s' is a link to `%s'\n"), programName, fullName, linkName); - free(fullName); - fullName = strdup(linkName); - free(linkName); - linkName = 0; - ld--; - } - /* handle max depth exceeded option */ - if (ld <= 0) { - printf(_("%s: maximum symbolic link depth exceeded: `%s'\n"), programName, fullName); - exit(1); - } - - /* if mount point, get device name */ - mounted = MountedDevice(fullName, &mountName, &deviceName); - if (v_option) { - if (mounted) - printf(_("%s: `%s' is mounted at `%s'\n"), programName, deviceName, mountName); - else - printf(_("%s: `%s' is not mounted\n"), programName, fullName); - } - if (!mounted) { - deviceName = strdup(fullName); - } - - /* if not currently mounted, see if it is a possible mount point */ - if (!mounted) { - mountable = MountableDevice(fullName, &mountName, &deviceName); - if (v_option) { - if (mountable) - printf(_("%s: `%s' can be mounted at `%s'\n"), programName, deviceName, mountName); - else - printf(_("%s: `%s' is not a mount point\n"), programName, fullName); - } - } + } while (result == -1); /* handle -n option */ if (n_option) { @@ -933,16 +1131,16 @@ if (!c_option) HandleXOption(deviceName); /* unmount device if mounted */ - if (mounted) { + if ((m_option != 1) && mounted) { if (v_option) - printf(_("%s: unmounting `%s'\n"), programName, deviceName); - Unmount(deviceName); + printf(_("%s: unmounting `%s'\n"), programName, mountName); + Unmount(mountName); } /* if it is a multipartition device, unmount any other partitions on the device */ pattern = MultiplePartitions(deviceName); - if (pattern != 0) + if ((m_option != 1) && (pattern != 0)) UnmountDevices(pattern); /* handle -c option */ @@ -976,6 +1174,7 @@ } } +#ifdef HAVE_EJECT_SCSI if (s_option && !worked) { if (v_option) printf(_("%s: trying to eject `%s' using SCSI commands\n"), programName, deviceName); @@ -987,7 +1186,9 @@ printf(_("%s: SCSI eject failed\n"), programName); } } +#endif +#ifdef HAVE_EJECT_FLOPPY if (f_option && !worked) { if (v_option) printf(_("%s: trying to eject `%s' using floppy eject command\n"), programName, deviceName); @@ -999,7 +1200,9 @@ printf(_("%s: floppy eject command failed\n"), programName); } } +#endif +#ifdef HAVE_EJECT_TAPE if (q_option && !worked) { if (v_option) printf(_("%s: trying to eject `%s' using tape offline command\n"), programName, deviceName); @@ -1011,6 +1214,7 @@ printf(_("%s: tape offline command failed\n"), programName); } } +#endif if (!worked) { fprintf(stderr, _("%s: unable to eject, last error: %s\n"), programName, strerror(errno)); @@ -1018,10 +1222,11 @@ } /* cleanup */ - close(fd); + CLOSE(fd); free(device); free(deviceName); free(fullName); + free(fullNameOrig); free(linkName); free(mountName); free(pattern); --- eject-2.0.13deb.orig/volname.1 +++ eject-2.0.13deb/volname.1 @@ -3,7 +3,7 @@ .\" It may be distributed under the GNU Public License, version 2, or .\" any higher version. See section COPYING of the GNU Public license .\" for conditions under which this file may be redistributed. -.TH VOLNAME 1 "5 May 2001" "Linux" "User Commands" +.TH VOLNAME 1 "13 Nov 2004" "Linux" "User Commands" .SH NAME volname \- return volume name .SH SYNOPSIS @@ -13,10 +13,11 @@ .B Volname returns the volume name for a device formatted with an -ISO-9660 file system, typically a CD-ROM. +ISO-9660 file system, typically a CD-ROM. It also works with +normal files that contain a ISO-9660 file system. -The device file name can be specified on the command line. If -omitted, it defaults to /dev/cdrom. +The file name can be specified on the command line. If omitted, +it defaults to /dev/cdrom. .SH AUTHOR .B Volname --- eject-2.0.13deb.orig/volname.c +++ eject-2.0.13deb/volname.c @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ******************************************************************** * @@ -39,6 +39,7 @@ #include #include #include +#include int main(int argc, char *argv[]) { @@ -52,7 +53,7 @@ if (argc == 2) { device = argv[1]; } else if (argc == 1) { - device = DEFAULTDEVICE; + device = "/dev/" DEFAULTDEVICE; } else { fprintf(stderr, _("usage: volname []\n")); exit(1); --- eject-2.0.13deb.orig/debian/po/templates.pot +++ eject-2.0.13deb/debian/po/templates.pot @@ -0,0 +1,31 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "" --- eject-2.0.13deb.orig/debian/po/de.po +++ eject-2.0.13deb/debian/po/de.po @@ -0,0 +1,31 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: eject-udeb 2.0.13deb-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2004-04-11 23:56+0200\n" +"Last-Translator: Frank Lichtenheld \n" +"Language-Team: debian-l10n-german@lists.debian.org\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Eine CD auswerfen" --- eject-2.0.13deb.orig/debian/po/cs.po +++ eject-2.0.13deb/debian/po/cs.po @@ -0,0 +1,30 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: eject\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2004-07-16 11:10+0200\n" +"Last-Translator: Jan Outrata \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Vysuòte CD z mechaniky" --- eject-2.0.13deb.orig/debian/po/el.po +++ eject-2.0.13deb/debian/po/el.po @@ -0,0 +1,28 @@ +# translation of el.po to Greek +# Greek messages for debian-installer. +# Copyright (C) 2003 Software in the Public Interest, Inc. +# This file is distributed under the same license as debian-installer. +# George Papamichelakis , 2004. +# Emmanuel Galatoulas , 2004. +# Konstantinos Margaritis , 2004. +# Greek Translation Team , 2004. +# Kostas Papadimas , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: ubuntu-installer\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2005-04-01 13:17+0300\n" +"Last-Translator: Kostas Papadimas \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Εξαγωγή ενός CD από τον οδηγό" --- eject-2.0.13deb.orig/debian/po/fr.po +++ eject-2.0.13deb/debian/po/fr.po @@ -0,0 +1,30 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: eject 2.0.13deb-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2004-04-23 09:58+0200\n" +"Last-Translator: Frédéric Bothamy \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Éjecter le cédérom du lecteur" --- eject-2.0.13deb.orig/debian/po/id.po +++ eject-2.0.13deb/debian/po/id.po @@ -0,0 +1,31 @@ +# Indonesian messages for debian-installer. +# +# +# Copyright (C) 2003 Software in the Public Interest, Inc. +# This file is distributed under the same license as debian-installer. +# Debian Indonesian L10N Team , 2004. +# Translators: +# * Parlin Imanuel Toh (parlin_i@yahoo.com), 2004. +# * I Gede Wijaya S (gwijayas@yahoo.com), 2004. +# * Arief S F (arief@gurame.fisika.ui.ac.id), 2004. +# * Setyo Nugroho (setyo@gmx.net), 2004. +# * Yoppy Hidayanto , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: debian-installer\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2005-03-27 11:46+0700\n" +"Last-Translator: Yoppy Hidayanto \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Keluarkan CD dari penggerak CD." --- eject-2.0.13deb.orig/debian/po/hu.po +++ eject-2.0.13deb/debian/po/hu.po @@ -0,0 +1,24 @@ +# Hungarian messages for debian-installer. +# Copyright (C) 2003 Software in the Public Interest, Inc. +# This file is distributed under the same license as debian-installer. +# Gabor Burjan , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: debian-installer\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2005-03-27 15:26+0200\n" +"Last-Translator: Gabor Burjan \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" +"Plural-Forms: nplurals=2; plural=n>1;\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "CD kidobása a meghajtóból" --- eject-2.0.13deb.orig/debian/po/ja.po +++ eject-2.0.13deb/debian/po/ja.po @@ -0,0 +1,31 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: eject 2.0.13deb-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2004-05-23 00:02+0900\n" +"Last-Translator: Hideki Yamane \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "¥É¥é¥¤¥Ö¤«¤é CD ¤ò¼è¤ê½Ð¤·" --- eject-2.0.13deb.orig/debian/po/it.po +++ eject-2.0.13deb/debian/po/it.po @@ -0,0 +1,22 @@ +# Traduzione italiana di partman-auto +# Copyright (C) 2004 Free Software Foundation, Inc. +# +# Stefano Melchior , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: eject 2.0.13deb-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2004-10-31 00:48+0100\n" +"Last-Translator: Stefano Melchior \n" +"Language-Team: Italian Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Espellere il CD dal drive" --- eject-2.0.13deb.orig/debian/po/nb.po +++ eject-2.0.13deb/debian/po/nb.po @@ -0,0 +1,28 @@ +# translation of debian-installer.po to Norwegian bokmÃ¥l +# Norwegian Bokmal messages for debian-installer. +# Copyright (C) 2003 Software in the Public Interest, Inc. +# This file is distributed under the same license as debian-installer. +# Knut Yrvin , 2004. +# Klaus Ade Johnstad , 2004. +# Axel Bojer , 2004. +# Bjorn Steensrud , 2004. +# Hans Fredrik Nordhaug , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: debian-installer\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2005-04-04 21:08+0200\n" +"Last-Translator: Terance Edward Sola \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Løs ut en CD" --- eject-2.0.13deb.orig/debian/po/nl.po +++ eject-2.0.13deb/debian/po/nl.po @@ -0,0 +1,30 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: eject 2.0.13deb-2\n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2004-05-20 10:26+0100\n" +"Last-Translator: Luk Claes \n" +"Language-Team: Debian l10n Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Een CD uitwerpen" + --- eject-2.0.13deb.orig/debian/po/pl.po +++ eject-2.0.13deb/debian/po/pl.po @@ -0,0 +1,22 @@ +# Polish messages for debian-installer. +# Copyright (C) 2003 Software in the Public Interest, Inc. +# This file is distributed under the same license as debian-installer. +# Copyright (C) 2004 Bartosz Feñski +# +msgid "" +msgstr "" +"Project-Id-Version: debian-installer\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2005-03-26 23:54+0100\n" +"Last-Translator: Dominik Zablotny \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Wysuñ p³ytê z napêdu" --- eject-2.0.13deb.orig/debian/po/ro.po +++ eject-2.0.13deb/debian/po/ro.po @@ -0,0 +1,33 @@ +# Romanian translation +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# Eddy Petrisor , 2004, 2005. +# Eddy Petrisor , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: debian-installer\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2005-03-30 22:10-0500\n" +"Last-Translator: Ovidiu Damian \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Scoate CD-ul din unitate (drive)" --- eject-2.0.13deb.orig/debian/po/ru.po +++ eject-2.0.13deb/debian/po/ru.po @@ -0,0 +1,30 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: eject 2.0.13\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2005-03-22 23:01+0600\n" +"Last-Translator: Basil Shubin \n" +"Language-Team: Russian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=KOI8-R\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "÷ÙÄ×ÉÎÕÔØ ÄÉÓË ÉÚ ÐÒÉ×ÏÄÁ ËÏÍÐÁËÔ-ÄÉÓËÏ×" --- eject-2.0.13deb.orig/debian/po/sv.po +++ eject-2.0.13deb/debian/po/sv.po @@ -0,0 +1,30 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: eject 2.0.13deb-16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2005-10-04 04:01+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Mata ut CD-skiva från enheten" + --- eject-2.0.13deb.orig/debian/po/vi.po +++ eject-2.0.13deb/debian/po/vi.po @@ -0,0 +1,22 @@ +# Vietnamese Translation for eject. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: eject 2.0.13deb-11\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2005-06-02 19:34+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Äẩy Ä‘Ä©a CD ra ổ" --- eject-2.0.13deb.orig/debian/po/POTFILES.in +++ eject-2.0.13deb/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] eject-udeb.templates --- eject-2.0.13deb.orig/debian/po/output +++ eject-2.0.13deb/debian/po/output @@ -0,0 +1 @@ +2 utf8 --- eject-2.0.13deb.orig/debian/po/pt_BR.po +++ eject-2.0.13deb/debian/po/pt_BR.po @@ -0,0 +1,30 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: eject\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-11 23:40+0200\n" +"PO-Revision-Date: 2004-05-12 22:05-0300\n" +"Last-Translator: André Luís Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. description +#: ../eject-udeb.templates:3 +msgid "Eject a CD from the drive" +msgstr "Ejetar um CD do leitor" --- eject-2.0.13deb.orig/debian/control +++ eject-2.0.13deb/debian/control @@ -0,0 +1,28 @@ +Source: eject +Section: utils +Priority: optional +Build-Depends: gettext, debhelper (>= 4.2), dpkg-dev (>= 1.13.2), libdevmapper-dev +Maintainer: Frank Lichtenheld +Standards-Version: 3.6.2 + +Package: eject +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: cdtool, setcd +Description: ejects CDs and operates CD-Changers under Linux + This little program will eject CD-ROMs (assuming your drive supports + the CDROMEJECT ioctl). It also allows setting the autoeject feature. + . + On supported ATAPI/IDE multi-disc CD-ROM changers, it allows changing + the active disc. + . + You can also use eject to properly disconnect external mass-storage + devices like digital cameras or portable music players. + +Package: eject-udeb +Section: debian-installer +XC-Package-Type: udeb +XB-Installer-Menu-Item: 960 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: ejects CDs from d-i menu --- eject-2.0.13deb.orig/debian/rules +++ eject-2.0.13deb/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f +# debian/rules build file for eject copyright Martin Mitchell 2001. +# this file is placed under the GNU GPL. +# debhelperized by Frank Lichtenheld 2004 +#export DH_VERBOSE=1 + +package=eject + +CFLAGS = -Wall -g +INSTALL = install +INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 +INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 + +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +ifeq ($(DEB_HOST_ARCH_CPU),m68k) +CFLAGS += -Os +else +CFLAGS += -Os -fomit-frame-pointer +endif +endif + +ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) +cdrom = --enable-default-device=acd0 +endif + +deb_dir = debian/eject +udeb_dir = debian/eject-udeb +build_dirs = $(deb_dir) $(udeb_dir) + +build: + dh_testdir + ./configure --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(cdrom) + $(MAKE) AM_CFLAGS= CFLAGS="$(CFLAGS)" + gcc $(CFLAGS) dmcrypt-get-device.c -o dmcrypt-get-device -ldevmapper + touch build + +clean: + dh_testdir + dh_testroot + -rm -f build dmcrypt-get-device + + -$(MAKE) distclean + + dh_clean + +binary-indep: build +# There are no architecture-independent files to be uploaded +# generated by this package. If there were any they would be +# made here. + +binary-arch: build + dh_testdir + dh_testroot + dh_clean -k -a + dh_installdirs -a + + make install mandir=/usr/share/man DESTDIR=$(CURDIR)/$(deb_dir) + cp -a $(deb_dir)/usr $(udeb_dir)/ + rm -fr $(udeb_dir)/usr/share/man + install -D -m 4755 dmcrypt-get-device $(deb_dir)/usr/lib/eject/dmcrypt-get-device + + dh_installchangelogs ChangeLog + dh_installdocs README NEWS AUTHORS TODO + dh_installdebconf -peject-udeb + + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a -Xdmcrypt-get-device + + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums + dh_builddeb -a + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean checkroot --- eject-2.0.13deb.orig/debian/watch +++ eject-2.0.13deb/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.ibiblio.org/pub/Linux/utils/disk-management/eject-(.*)\.tar\.gz --- eject-2.0.13deb.orig/debian/changelog +++ eject-2.0.13deb/debian/changelog @@ -0,0 +1,480 @@ +eject (2.0.13deb-18ubuntu2) dapper; urgency=low + + * #21295: Apply patch to fix eject -s for non-root. + + -- Ben Collins Mon, 19 Dec 2005 16:40:35 -0500 + +eject (2.0.13deb-18ubuntu1) dapper; urgency=low + + * Resynchronise with Debian, resolve minor merge conflicts. + + -- Martin Pitt Thu, 10 Nov 2005 12:25:57 -0500 + +eject (2.0.13deb-18) unstable; urgency=low + + * Update upstream .pot file and unfuzzy translations where possible. + Thanks to Daniel Nylander for noticing. + + -- Frank Lichtenheld Sat, 8 Oct 2005 18:30:30 +0200 + +eject (2.0.13deb-17) unstable; urgency=low + + * Christopher Martin suggested that it might be a good idea + to merge the pmount patch from Ubuntu. I'm still not convinced + that this is a particulary good hack but lets do it nevertheless + in absence of better ideas. (Closes: #331276) + * debian/po/sv.po: Added translation by Daniel Nylander + (Closes: #331340) + * po/sv_SE.po: Added translation by Daniel Nylander (Closes: #332226) + * Reword the Description a bit. Remove long sentence about auto-eject + feature and add one about the other uses of eject than CD-ROMs. + + -- Frank Lichtenheld Wed, 5 Oct 2005 12:31:03 +0200 + +eject (2.0.13deb-16) unstable; urgency=medium + + * Fix a segfault when unmounting more than one partition of + a multi partition device (double regfree). Why has never anyone + hit this bug in so many years? + * Update FSF Address in debian/copyright + * Since I've added me to the copyright statement in eject.c + some time ago, make this in debian/copyright, too + + -- Frank Lichtenheld Tue, 20 Sep 2005 01:34:54 +0200 + +eject (2.0.13deb-15) unstable; urgency=low + + * Drop -fomit-frame-pointers on m68k since gcc 4.0 produces + an ICE with it. Seems to be already fixed in gcc-snapshot + so hopefully this is only needed temporarily + * Add build dependency to a dpkg-dev which supports + DEB_HOST_ARCH_CPU + + -- Frank Lichtenheld Thu, 8 Sep 2005 17:16:24 +0200 + +eject (2.0.13deb-14) unstable; urgency=low + + * Apply patch by Robert Millan for GNU/kFreeBSD support + (Closes: #324569) + + -- Frank Lichtenheld Sat, 27 Aug 2005 14:30:51 +0200 + +eject (2.0.13deb-13ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Martin Pitt Thu, 21 Jul 2005 18:03:53 +0200 + +eject (2.0.13deb-13) unstable; urgency=low + + * Build with -Os -fomit-frame-pointer on request of + Joey Hess (this reduces the size of the binary and + thereby of the udeb) (Closes: #314362) + * Bump Standards-Version to 3.6.2 (no changes) + + -- Frank Lichtenheld Fri, 1 Jul 2005 17:01:21 +0200 + +eject (2.0.13deb-12) unstable; urgency=low + + * The Ubuntu translations were partly mangled, + clean-up: + - debian/po/pl.po: use corrected file + - debian/po/{nb,hu}.po: convert back to utf-8 + Thanks to Colin Watson for the help + (again Closes: #303252) + * debian/po/vi.po: Added translation by Clytie Siddall + (Closes: #311626) + + -- Frank Lichtenheld Mon, 9 May 2005 13:46:07 +0200 + +eject (2.0.13deb-11ubuntu3) breezy; urgency=low + + * Removed debian/eject.postinst again and instead chmod dmcrypt-get-device + directly in debian/rules. + + -- Martin Pitt Fri, 17 Jun 2005 12:27:13 +0200 + +eject (2.0.13deb-11ubuntu2) breezy; urgency=low + + * Added support for encrypted partitions mounted by cryptsetup. This also + enables proper eject support Gnome. + * Added dmcrypt-get-device.c: setuid root helper program which maps a + device-mapper device to the underlying physical device number. + * debian/rules: Build dmcrypt-get-device.c and install it into + /usr/lib/eject. + * debian/control: Build depend on libdevmapper-dev. + * Added debian/eject.postinst: Make dmcrypt-get-device setuid root. + * eject.c: + - Added GetDevmapperDevice() which calls dmcrypt-get-device. + - UnmountDevices(): Use GetDevmapperDevice() to additionally unmount all + encrypted partitions which are on the same physical device as the device + to be ejected. + - MultiplePartitions(): Use GetDevmapperDevice() to translate an encrypted + mapped partition to the real partition to recognize those as being + multi-partition. + + -- Martin Pitt Thu, 16 Jun 2005 17:56:18 +0200 + +eject (2.0.13deb-11ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + * Fix Polish translation. + * Fix call to pumount when using -p. + + -- Colin Watson Mon, 9 May 2005 11:48:40 +0100 + +eject (2.0.13deb-11) unstable; urgency=low + + * Upload to unstable as d-i development is now + in unstable, too. + * debian/po/ru.po: Added translation by Basilius + (Closes: #300918) + * Translations from Ubuntu, provided by Colin Watson: + (Closes: #303252) + - debian/po/el.po by Kostas Papadimas + - debian/po/hu.po by Gabor Burjan + - debian/po/id.po by Yoppy Hidayanto + - debian/po/nb.po by Terance Edward Sola + - debian/po/pl.po by Dominik Zablotny + - debian/po/ro.po by Ovidiu Damian + + -- Frank Lichtenheld Wed, 23 Mar 2005 14:26:32 +0100 + +eject (2.0.13deb-10) experimental; urgency=low + + * eject.c: don't try to send ioctls to directories or + files. If we end up with them (because they exists, but + can not be mapped to a device by fstab) we try the next + possibility (Closes: #291422) + * po/es.po: Added translation of packages' gettext strings + by Daniel Franganillo (Closes: #295743) + + -- Frank Lichtenheld Fri, 4 Mar 2005 15:43:47 -0800 + +eject (2.0.13deb-9) experimental; urgency=low + + * debian/po/it.po: Added translation by Stefano Melchior + (Closes: #279014) + * volname.1: Document the fact that volname works on normal files, too. + * eject.c: + + Use newer SG_IO ioctl interface (Closes: #279568) + + Unmount by mountpoint, not by device name (Closes: #276657) + + Don't try to resolve symlinks when called with -p as + /proc/mounts doesn't resolve symlinks either (unlike /etc/mtab) + + Ignore errors that occour in ScsiEject at the BLKRRPART + ioctl(), there are just too many situations where this isn't + a valid action (e.g. when ejecting USB/IEEE1394 storage devices). + * README: Fix a typo + + -- Frank Lichtenheld Sun, 31 Oct 2004 17:48:07 +0100 + +eject (2.0.13deb-8sarge2) unstable; urgency=low + + * po/es.po: Added translation of packages' gettext strings + by Daniel Franganillo (Closes: #295743) + + -- Frank Lichtenheld Sun, 27 Feb 2005 00:55:42 +0100 + +eject (2.0.13deb-8sarge1) unstable; urgency=low + + * debian/po/it.po: Added translation by Stefano Melchior + (Closes: #279014) + * volname.1: Document the fact that volname works on normal files, too + * README: Fix a typo + + -- Frank Lichtenheld Tue, 25 Jan 2005 16:48:12 +0100 + +eject (2.0.13deb-8ubuntu3) hoary; urgency=low + + * Add Greek translation (thanks, Giorgos Logiotatidis). + * Add Romanian translation (thanks, Ovidiu Damian). + * Add Norwegian BokmÃ¥l translation (thanks, Terance Edward Sola). + + -- Colin Watson Tue, 5 Apr 2005 17:17:17 +0100 + +eject (2.0.13deb-8ubuntu2) hoary; urgency=low + + * Add Indonesian translation (thanks, Yoppy Hidayanto). + * Add Hungarian translation (thanks, Gabor Burjan). + * Add Polish translation (thanks, Dominik ZabÅ‚otny). + + -- Colin Watson Mon, 28 Mar 2005 20:29:27 +0100 + +eject (2.0.13deb-8ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Wed, 27 Oct 2004 10:47:55 +0100 + +eject (2.0.13deb-8) unstable; urgency=low + + * eject.c: Don't try to eject /cdrom anymore, this location is + deprecated (support for /media was already added in -4) + * eject.1: Forgot to mention /media at one place in man page + * Both changes together should avoid any unexpected and undocumented + behaviour (Closes: #271527), thanx to Helge Kreutzmann for + alerting me to the problem + + -- Frank Lichtenheld Sun, 10 Oct 2004 20:13:29 +0200 + +eject (2.0.13deb-7) unstable; urgency=low + + * debian/po/cs.po: Added translation by + Jan Outrata (Closes: #260378) + * debian/control: Add other console based CD-ROM drive control + programs to Suggests: cdtool and setcd (Closes: #252372) + Thanks to Jari Aalto for the suggestion. + + -- Frank Lichtenheld Tue, 20 Jul 2004 21:10:26 +0200 + +eject (2.0.13deb-6ubuntu2) warty; urgency=low + + * Remove dependency on pmount from eject-udeb + * Fall back to mount if pmount exec fails + * Drop root privileges properly (setuid rather than seteuid) + + -- Matt Zimmerman Thu, 2 Sep 2004 12:43:57 -0700 + +eject (2.0.13deb-6ubuntu1) warty; urgency=low + + * eject.c: replaced calls to mount with calls to pmount + + -- Nathaniel McCallum Fri, 27 Aug 2004 22:05:36 -0400 + +eject (2.0.13deb-6) unstable; urgency=low + + * Acknowledge NMU. + * debian/po/ja.po: Added translation by Hideki Yamane + (Closes: #251465) + + -- Frank Lichtenheld Fri, 28 May 2004 21:15:47 +0200 + +eject (2.0.13deb-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Encode udeb templates in UTF-8 (closes: #251203). + + -- Colin Watson Thu, 27 May 2004 08:46:48 -0300 + +eject (2.0.13deb-5) unstable; urgency=low + + * debian/po/fr.po: Added translation by Christian Perrier + (Closes: #249238) + * debian/po/nl.po: Added translation by Luk Claes + (Closes: #250662) + * eject.1: Correct minus/hyphens in --no-unmount patch + + -- Frank Lichtenheld Sun, 16 May 2004 13:54:32 +0200 + +eject (2.0.13deb-4) unstable; urgency=low + + * eject.c: + + Add patch by Bastian Kleineidam + to check return values of malloc, regcomp, close and fclose + (Closes: #214705) + + also try /media/, order is now /dev/, /media/, /mnt/ + + fix fstab patch that lost the gettextization of a string + * eject.1: document /media/ change + * po/eject.pot,po/de_DE.po: Update pot files and German translation + * debian/watch: add watch file + * debian/copyright: remove superfluous colon from upstream URL + * debian/po/pt_BR.po: Added translation by Andre Luis Lopes + (Closes: #248779) + + -- Frank Lichtenheld Thu, 13 May 2004 13:35:37 +0200 + +eject (2.0.13deb-3) unstable; urgency=low + + * debian/control: Change section of eject-udeb to debian-installer. + * eject.1: Fix hyphen vs. minus mistakes. + * eject.c, eject.1: Add patch by Bastian Kleineidam + for a new -m, --no-unmount option (Closes: #227348) + + -- Frank Lichtenheld Tue, 27 Apr 2004 21:37:32 +0200 + +eject (2.0.13deb-2) unstable; urgency=low + + * debian/rules,debian/control,debhelper/compat: debhelperize + * debian/control,debian/rules: add eject-udeb package on + request of Sven Luther (Closes: #243166) + * debian/rules: install more docs (AUTHORS, NEWS, TODO) + + -- Frank Lichtenheld Sun, 11 Apr 2004 21:46:59 +0200 + +eject (2.0.13deb-1) unstable; urgency=low + + * New orig tarball without debian/ directory + to get rid of debian/files and debian/substvars + * Also delete debian/dirs as we don't need it, too + + -- Frank Lichtenheld Wed, 17 Mar 2004 16:27:40 +0100 + +eject (2.0.13-5) unstable; urgency=low + + * debian/copyright: Improve the copyright file a lot + * eject.c, volname.c: Update the FSF address + + -- Frank Lichtenheld Mon, 1 Mar 2004 02:20:47 +0100 + +eject (2.0.13-4) unstable; urgency=low + + * New maintainer (closes: #227776) + * Acknowledge NMU (closes: #214044, #214558) + * eject.1: Fix typos in manpage (closes: #221299) + * debian/rules: change the /cdrom patch to let + eject and volname behave as documented + + volname.c: add prefix "/dev/" to DEVICEDEFAULT since + the manpage claims that it should do that (closes: #219735) + + eject.c: also try "/cdrom" if device is "cdrom" to + cover /cdrom (I'm not so convinced about supporting this at + all, perhaps I will restore the upstream behaviour) + * debian/rules: Clean up. Support DEB_BUILD_OPTS. + * debian/control: Bump Standards-Version to 3.6.1 + + -- Frank Lichtenheld Tue, 20 Jan 2004 22:07:43 +0100 + +eject (2.0.13-3.1) unstable; urgency=low + + * NMU + * Fix gettext build dependency. (closes: #214044) + * Add #include to volname.c. + + -- Lukas Geyer Wed, 8 Oct 2003 02:09:28 -0400 + +eject (2.0.13-3) unstable; urgency=low + + * Declare gettext build dependency. (closes: #214044) + + -- Martin Mitchell Sat, 4 Oct 2003 17:57:11 +1000 + +eject (2.0.13-2) unstable; urgency=low + + * Update to standards version 3.6.1. (closes: #102448) + * Enable /cdrom as the default device. (closes: #173419) + * Apply patch to install gettext catalog files. (closes: #192829) + * Undo NMU breakage and apply patch to skip errors if /etc/fstab + is unreadable. Thanks to Lukas Geyer. (closes: #128597,#213359) + + -- Martin Mitchell Sat, 4 Oct 2003 13:23:07 +1000 + +eject (2.0.13-1.1) unstable; urgency=low + + * Non-maintainer Upload. + * Use /cdrom as the default device. (Closes: #173419) + * Only consult /etc/fstab when the information is + needed. (Closes: #128597) + + -- Petter Reinholdtsen Wed, 24 Sep 2003 10:22:14 +0200 + +eject (2.0.13-1) unstable; urgency=low + + * New upstream release. + * Update to standards version 3.5.8. + + -- Martin Mitchell Mon, 23 Dec 2002 01:30:19 +1100 + +eject (2.0.12-1) unstable; urgency=low + + * New upstream release. (closes: #155172, #114148) + * Update copyright file. (closes: #133493) + * Update to standards version 3.5.7. + + -- Martin Mitchell Sat, 7 Sep 2002 01:13:13 +1000 + +eject (2.0.3-1) unstable; urgency=low + + * New upstream release, with kernel 2.4 support. (closes: #88379) + * Correct manpage syntax. (closes: #90283) + + -- Martin Mitchell Wed, 25 Apr 2001 12:07:56 +1000 + +eject (2.0.2-2) unstable; urgency=low + + * Update copyright information. + * Update to standards version 3.2.1. (closes: #80747, #82132, #82215) + * Patch to ignore commented fstab lines. (closes: #66810) + * Test with recent kernels to confirm behavior. (closes: #65755) + * Change to section utils. (closes: #74465) + * Support multiple symlinks. (closes: #80596) + + -- Martin Mitchell Sun, 28 Jan 2001 12:55:17 +1100 + +eject (2.0.2-1) unstable; urgency=low + + * New upstream release. (closes: #34477) + * Fix already open behaviour. (closes: #34021) + * New code for cd changers. (closes: #18280) + + -- Martin Mitchell Wed, 17 Mar 1999 00:38:31 +1100 + +eject (1.5-8) unstable; urgency=low + + * Minor source changes for powerpc compilation. + + -- Martin Mitchell Thu, 3 Sep 1998 01:56:40 +1000 + +eject (1.5-7) unstable; urgency=low + + * Fix ejecting for /dev/scd devices. (#22706) + + -- Martin Mitchell Sun, 14 Jun 1998 17:50:50 +1000 + +eject (1.5-6) frozen unstable; urgency=low + + * Fix -u option for unmounting before ejecting. (#18234) + * Update to standards version 2.4.1. + + -- Martin Mitchell Tue, 12 May 1998 05:33:40 +1000 + +eject (1.5-5) unstable; urgency=low + + * Fix -u option when device was mounted as a symlink. (#12078) + + -- Martin Mitchell Wed, 10 Dec 1997 05:08:42 +1100 + +eject (1.5-4) unstable; urgency=low + + * Update to standards version 2.3.0.1. + + -- Martin Mitchell Wed, 26 Nov 1997 17:18:30 +1100 + +eject (1.5-3) unstable; urgency=low + + * New maintainer. + + -- Martin Mitchell Wed, 26 Nov 1997 17:05:32 +1100 + +eject (1.5-2.1) unstable; urgency=low + + * Non-maintainer release. + * Libc6 compile. + + -- Martin Mitchell Sat, 15 Nov 1997 01:56:15 +1100 + +eject (1.5-2) unstable; urgency=low + + * Change of maintainer + + -- Benedikt Eric Heinen Mon, 9 Jun 1997 06:39:57 +0200 + +eject (1.5-1) unstable; urgency=low + + * New upstream release + * debmake + + -- Christoph Lameter Sat, 8 Feb 1997 19:47:17 -0800 + +eject (1.4-2) unstable; urgency=low + + * Missing newline at the end of debian/control + + -- Christoph Lameter Sun, 15 Sep 1996 14:51:46 +0800 + +eject (1.4-1) unstable; urgency=low + + * Initial Release + + -- Christoph Lameter Sun, 15 Sep 1996 14:51:46 +0800 + + + --- eject-2.0.13deb.orig/debian/compat +++ eject-2.0.13deb/debian/compat @@ -0,0 +1 @@ +4 --- eject-2.0.13deb.orig/debian/eject-udeb.postinst +++ eject-2.0.13deb/debian/eject-udeb.postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule + +eject --- eject-2.0.13deb.orig/debian/eject-udeb.templates +++ eject-2.0.13deb/debian/eject-udeb.templates @@ -0,0 +1,3 @@ +Template: debian-installer/eject-udeb/title +Type: text +_description: Eject a CD from the drive --- eject-2.0.13deb.orig/debian/copyright +++ eject-2.0.13deb/debian/copyright @@ -0,0 +1,32 @@ +The original source code for this package was downloaded from +http://www.ibiblio.org/pub/Linux/utils/disk-management + +Additional locations where you might find information about +this software: +http://members.rogers.com/jefftranter/eject.html +http://sourceforge.net/projects/eject + +This package was originaly maintained by +Martin Mitchell , who added the various debian/* files. + +It is now maintained by Frank Lichtenheld . + +Copyright (C) 1994-2001 Jeff Tranter (tranter@pobox.com) +Copyright (C) 2004, 2005 Frank Lichtenheld (djpig@debian.org) + + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems the full text of the GNU General Public Licence, +version 2, can be found at /usr/share/common-licenses/GPL-2. --- eject-2.0.13deb.orig/dmcrypt-get-device.c +++ eject-2.0.13deb/dmcrypt-get-device.c @@ -0,0 +1,83 @@ +/** + * dmcrypt-get-device.c + * (c) 2005 Canonical Ltd. + * Author: Martin Pitt + * License: GNU General Public License (http://www.gnu.org/copyleft/gpl.html) + * + * Given a dmcrypt device name, this program queries the underlying physical + * device, prints "major:minor" to the standard output and exits with 0. If an + * error occurs or the device is not a dmcrypt mapped one, nothing is printed + * and the program exits with 1. + * + * Opening /dev/mapper/control requires root privileges, therefore this + * program needs to be installed setuid root. Root privileges are dropped + * immediately after querying the information from the device mapper. The + * parsing is done with normal user privileges afterwards. + */ + +#include +#include +#include +#include + +int +main (int argc, char** argv) +{ + struct dm_task *dmt = NULL; + struct dm_info dmi; + char *target_type = NULL, *params = NULL; + uint64_t start, length; + void *next = NULL; + struct stat st; + unsigned major, minor; + + if (argc != 2) { + fputs ("Usage: dmcrypt-get-device \n", stderr); + return 1; + } + + /* Check that argument has the form /dev/mapper/ */ + const char* devmapdir = "/dev/mapper/"; + const int devmapdirlen = strlen (devmapdir); + if (strncmp (argv[1], devmapdir, devmapdirlen)) + return 1; + if (strchr (argv[1] + devmapdirlen, '/')) + return 1; + + /* Check that argument is a block device */ + if (stat (argv[1], &st) || !S_ISBLK(st.st_mode)) + return 1; + + /* Request device info */ + if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) + return 1; + if (!dm_task_set_name(dmt, argv[1])) + return 1; + if (!dm_task_run(dmt)) + return 1; + + /* Drop all privileges */ + setgid(getgid()); + setuid(getuid()); + + if (!dm_task_get_info(dmt, &dmi)) + return 1; + + /* Get underlying physical device */ + next = dm_get_next_target(dmt, next, &start, &length, + &target_type, ¶ms); + + /* verify validity and that it is a dmcrypt device */ + if (!target_type || strcmp(target_type, "crypt") || next) + return 1; + + /* params has the format: cipher key offset major:minor */ + length = sscanf(params, "%*s %*s %*s %u:%u %*s", &major, &minor); + if (length != 2) + return 1; + + /* Success */ + printf ("%u:%u\n", major, minor); + + return 0; +}